Make GetEffectiveMinSize virtual as not being able to override the method, which...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/window.h b/include/wx/window.h
index ba5f596d78f350b1dcc0bae56bbef8d72fff674f..4a7c051835e9fd76f55d37fa1198dae42893923f 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -402,7 +402,7 @@ public:
         // This function will merge the window's best size into the window's
         // minimum size, giving priority to the min size components, and
         // returns the results.
-    wxSize GetEffectiveMinSize() const;
+    virtual wxSize GetEffectiveMinSize() const;
     wxDEPRECATED( wxSize GetBestFittingSize() const );  // replaced by GetEffectiveMinSize
     wxDEPRECATED( wxSize GetAdjustedMinSize() const );  // replaced by GetEffectiveMinSize
 

diff --git a/interface/wx/window.h b/interface/wx/window.h
index 8323298572b355724f69ed4177cd4f16ec2cec72..f54958c3120d0b2c51664ee94f1a8f881bfe0463 100644 (file)
--- a/interface/wx/window.h
+++ b/interface/wx/window.h
@@ -708,10 +708,13 @@ public:
         Merges the window's best size into the min size and returns the result.
         This is the value used by sizers to determine the appropriate
         ammount of space to allocate for the widget.
+        
+        This is the method called by any wxSizer when they query the size
+        of a certain window or control.
 
         @see GetBestSize(), SetInitialSize(), @ref overview_windowsizing
     */
-    wxSize GetEffectiveMinSize() const;
+    virtual wxSize GetEffectiveMinSize() const;
 
     /**
         Returns the maximum size of window's client area.