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

…structors
gansm · Jul 16, 2024 · 51ee4d4 · 51ee4d4
1 parent 2c86fc8
commit 51ee4d4
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 20 deletions.
diff --git a/final/dialog/fdialog.cpp b/final/dialog/fdialog.cpp
@@ -136,8 +136,8 @@ void FDialog::setBorder (bool enable)
 void FDialog::resetColors()
 {
   const auto& wc = getColorTheme();
-  setForegroundColor (wc->dialog.fg);
-  setBackgroundColor (wc->dialog.bg);
+  FWidget::setForegroundColor (wc->dialog.fg);
+  FWidget::setBackgroundColor (wc->dialog.bg);
   FWidget::resetColors();
 }
 

diff --git a/final/dialog/fmessagebox.cpp b/final/dialog/fmessagebox.cpp
@@ -429,7 +429,7 @@ void FMessageBox::adjustButtons()
     const auto& root_widget = getRootWidget();
     FDialog::setWidth(btn_width + 5);
     max_width = root_widget ? root_widget->getClientWidth() : 80;
-    setX (int((max_width - getWidth()) / 2));
+    FWindow::setX (int((max_width - getWidth()) / 2));
   }
 
   const auto btn_x = int((getWidth() - btn_width) / 2);

diff --git a/final/menu/fmenu.cpp b/final/menu/fmenu.cpp
@@ -461,8 +461,8 @@ void FMenu::calculateDimensions()
   const int adjust_X = adjustX(getX());
 
   // set widget geometry
-  setGeometry ( FPoint{adjust_X, getY()}
-              , FSize{max_item_width + 2, getCount() + 2} );
+  FWindow::setGeometry ( FPoint{adjust_X, getY()}
+                       , FSize{max_item_width + 2, getCount() + 2} );
 
   // set geometry of all items
   const int item_X = 1;

diff --git a/final/menu/fmenubar.cpp b/final/menu/fmenubar.cpp
@@ -59,8 +59,8 @@ FMenuBar::~FMenuBar()  // destructor
 void FMenuBar::resetColors()
 {
   const auto& wc = getColorTheme();
-  setForegroundColor (wc->menu.fg);
-  setBackgroundColor (wc->menu.bg);
+  FWidget::setForegroundColor (wc->menu.fg);
+  FWidget::setBackgroundColor (wc->menu.bg);
   FWidget::resetColors();
 }
 

diff --git a/final/widget/fbutton.h b/final/widget/fbutton.h
@@ -3,7 +3,7 @@
 *                                                                      *
 * This file is part of the FINAL CUT widget toolkit                    *
 *                                                                      *
-* Copyright 2012-2023 Markus Gans                                      *
+* Copyright 2012-2024 Markus Gans                                      *
 *                                                                      *
 * FINAL CUT is free software; you can redistribute it and/or modify    *
 * it under the terms of the GNU Lesser General Public License as       *
@@ -60,6 +60,9 @@ namespace finalcut
 class FButton : public FWidget
 {
   public:
+    // Using-declaration
+    using FWidget::delAccelerator;
+
     // Constructors
     explicit FButton (FWidget* = nullptr);
     explicit FButton (FString&&, FWidget* = nullptr);

diff --git a/final/widget/flabel.h b/final/widget/flabel.h
@@ -3,7 +3,7 @@
 *                                                                      *
 * This file is part of the FINAL CUT widget toolkit                    *
 *                                                                      *
-* Copyright 2014-2023 Markus Gans                                      *
+* Copyright 2014-2024 Markus Gans                                      *
 *                                                                      *
 * FINAL CUT is free software; you can redistribute it and/or modify    *
 * it under the terms of the GNU Lesser General Public License as       *
@@ -64,6 +64,7 @@ class FLabel : public FWidget
   public:
     // Using-declaration
     using FWidget::setEnable;
+    using FWidget::delAccelerator;
 
     // Constructor
     explicit FLabel (FWidget* = nullptr);

diff --git a/final/widget/flineedit.cpp b/final/widget/flineedit.cpp
@@ -274,19 +274,19 @@ void FLineEdit::resetColors()
   {
     if ( hasFocus() )
     {
-      setForegroundColor (wc->input_field.focus_fg);
-      setBackgroundColor (wc->input_field.focus_bg);
+      FWidget::setForegroundColor (wc->input_field.focus_fg);
+      FWidget::setBackgroundColor (wc->input_field.focus_bg);
     }
     else
     {
-      setForegroundColor (wc->input_field.fg);
-      setBackgroundColor (wc->input_field.bg);
+      FWidget::setForegroundColor (wc->input_field.fg);
+      FWidget::setBackgroundColor (wc->input_field.bg);
     }
   }
   else  // inactive
   {
-    setForegroundColor (wc->input_field.inactive_fg);
-    setBackgroundColor (wc->input_field.inactive_bg);
+    FWidget::setForegroundColor (wc->input_field.inactive_fg);
+    FWidget::setBackgroundColor (wc->input_field.inactive_bg);
   }
 
   FWidget::resetColors();

diff --git a/final/widget/fscrollview.cpp b/final/widget/fscrollview.cpp
@@ -309,8 +309,8 @@ void FScrollView::setViewportPrint (bool enable)
 void FScrollView::resetColors()
 {
   const auto& wc = getColorTheme();
-  setForegroundColor (wc->dialog.fg);
-  setBackgroundColor (wc->dialog.bg);
+  FWidget::setForegroundColor (wc->dialog.fg);
+  FWidget::setBackgroundColor (wc->dialog.bg);
   FWidget::resetColors();
 }
 

diff --git a/final/widget/fscrollview.h b/final/widget/fscrollview.h
@@ -69,6 +69,7 @@ class FScrollView : public FWidget
   public:
     // Using-declaration
     using FWidget::setGeometry;
+    using FWidget::delAccelerator;
     using FWidget::print;
 
     // Constructor

diff --git a/final/widget/fstatusbar.h b/final/widget/fstatusbar.h
@@ -3,7 +3,7 @@
 *                                                                      *
 * This file is part of the FINAL CUT widget toolkit                    *
 *                                                                      *
-* Copyright 2014-2023 Markus Gans                                      *
+* Copyright 2014-2024 Markus Gans                                      *
 *                                                                      *
 * FINAL CUT is free software; you can redistribute it and/or modify    *
 * it under the terms of the GNU Lesser General Public License as       *
@@ -73,6 +73,9 @@ class FStatusBar;
 class FStatusKey : public FWidget
 {
   public:
+    // Using-declaration
+    using FWidget::delAccelerator;
+
     // Constructors
     explicit FStatusKey (FWidget* = nullptr);
     FStatusKey (FKey, FString&&, FWidget* = nullptr);
@@ -184,6 +187,9 @@ inline void FStatusKey::setConnectedStatusbar (FStatusBar* sb)
 class FStatusBar : public FWindow
 {
   public:
+    // Using-declaration
+    using FWidget::delAccelerator;
+
     // Constructor
     explicit FStatusBar (FWidget* = nullptr);
 

diff --git a/final/widget/ftogglebutton.h b/final/widget/ftogglebutton.h
@@ -3,7 +3,7 @@
 *                                                                      *
 * This file is part of the FINAL CUT widget toolkit                    *
 *                                                                      *
-* Copyright 2014-2023 Markus Gans                                      *
+* Copyright 2014-2024 Markus Gans                                      *
 *                                                                      *
 * FINAL CUT is free software; you can redistribute it and/or modify    *
 * it under the terms of the GNU Lesser General Public License as       *
@@ -64,6 +64,7 @@ class FToggleButton : public FWidget
   public:
     // Using-declaration
     using FWidget::setGeometry;
+    using FWidget::delAccelerator;
 
     // Constructors
     explicit FToggleButton (FWidget* = nullptr);

diff --git a/final/widget/ftooltip.cpp b/final/widget/ftooltip.cpp
@@ -160,7 +160,7 @@ void FToolTip::calculateDimensions()
   const auto& r = getRootWidget();
   int x = r ? 1 + int((r->getWidth() - w) / 2) : 1;
   int y = r ? 1 + int((r->getHeight() - h) / 2) : 1;
-  setGeometry (FPoint{x, y}, FSize{w, h});
+  FWidget::setGeometry (FPoint{x, y}, FSize{w, h});
 }
 
 //----------------------------------------------------------------------