Prevention of any virtual function being called by constructors or de…

…structors
gansm · Jul 20, 2024 · 10082c5 · 10082c5
1 parent 9d21e82
commit 10082c5
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/final/menu/fmenubar.cpp b/final/menu/fmenubar.cpp
@@ -231,9 +231,9 @@ void FMenuBar::init()
   if ( getRootWidget() )
     getRootWidget()->setTopPadding(1, true);
 
-  addAccelerator (FKey::F10);
-  addAccelerator (FKey::Ctrl_space);
-  addAccelerator (FKey::Menu);
+  FMenuBar::addAccelerator (FKey::F10);
+  FMenuBar::addAccelerator (FKey::Ctrl_space);
+  FMenuBar::addAccelerator (FKey::Menu);
   FMenuBar::resetColors();
   unsetFocusable();
 }

diff --git a/final/widget/fbutton.cpp b/final/widget/fbutton.cpp
@@ -54,7 +54,7 @@ FButton::FButton (FString&& txt, FWidget* parent)
 //----------------------------------------------------------------------
 FButton::~FButton()  // destructor
 {
-  FButton::delAccelerator();
+  FButton::delAccelerator(this);
   delOwnTimers();
 }
 
@@ -380,7 +380,7 @@ inline void FButton::detectHotkey()
 {
   if ( isEnabled() )
   {
-    FButton::delAccelerator();
+    FButton::delAccelerator(this);
     setHotkeyAccelerator();
   }
 }

diff --git a/final/widget/flabel.cpp b/final/widget/flabel.cpp
@@ -135,7 +135,7 @@ void FLabel::setText (const FString& txt)
 
   if ( isEnabled() )
   {
-    FWidget::delAccelerator();
+    FWidget::delAccelerator(this);
     setHotkeyAccelerator();
   }
 }

diff --git a/final/widget/flineedit.cpp b/final/widget/flineedit.cpp
@@ -559,9 +559,9 @@ void FLineEdit::init()
   mapKeyFunctions();
 
   if ( isReadOnly() )
-    FLineEdit::unsetVisibleCursor();
+    FLineEdit::setVisibleCursor(false);
   else
-    FLineEdit::setVisibleCursor();
+    FLineEdit::setVisibleCursor(true);
 }
 
 //----------------------------------------------------------------------

diff --git a/final/widget/fscrollview.cpp b/final/widget/fscrollview.cpp
@@ -126,7 +126,7 @@ void FScrollView::setScrollSize (const FSize& size)
     scroll_geometry.setSize (width, height);
     resizeArea (scroll_geometry, viewport.get());
     setColor();
-    clearArea();
+    FScrollView::clearArea();
     addPreprocessingHandler
     (
       F_PREPROC_HANDLER (this, &FScrollView::copy2area)

diff --git a/final/widget/fstatusbar.cpp b/final/widget/fstatusbar.cpp
@@ -57,7 +57,7 @@ FStatusKey::~FStatusKey()  // destructor
   if ( getConnectedStatusbar() )
     getConnectedStatusbar()->remove(this);
 
-  FStatusKey::delAccelerator();
+  FStatusKey::delAccelerator(this);
 }
 
 

diff --git a/final/widget/ftogglebutton.cpp b/final/widget/ftogglebutton.cpp
@@ -72,7 +72,7 @@ FToggleButton::FToggleButton (const FString& txt, FWidget* parent)
 //----------------------------------------------------------------------
 FToggleButton::~FToggleButton()  // destructor
 {
-  FToggleButton::delAccelerator();
+  FToggleButton::delAccelerator(this);
 
   if ( hasGroup() )
     getGroup()->remove(this);
@@ -176,7 +176,7 @@ void FToggleButton::setText (const FString& txt)
 
   if ( isEnabled() )
   {
-    FToggleButton::delAccelerator();
+    FToggleButton::delAccelerator(this);
     setHotkeyAccelerator();
   }
 }