moved wxWindow::GetBestSize implementation into DoGetBestSize

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

diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h
index b686a423822a50e0327d65aa161cb6fbbc6bb1c7..243a7c575f9a1296ff1a2600f8dff4a5f675cb6d 100644 (file)
--- a/include/wx/generic/mdig.h
+++ b/include/wx/generic/mdig.h
@@ -158,7 +158,7 @@ public:
 #endif
 
     // no size hints
-    virtual void SetSizeHints( int WXUNUSED(minW),
+    virtual void DoSetSizeHints( int WXUNUSED(minW),
                                int WXUNUSED(minH),
                                int WXUNUSED(maxW) = wxDefaultCoord,
                                int WXUNUSED(maxH) = wxDefaultCoord,

diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h
index 69104769f2ce0a949a086a162e36100d5493dc11..b6e054b6482fff347586b8a3a98a625e78388f52 100644 (file)
--- a/include/wx/gtk/mdi.h
+++ b/include/wx/gtk/mdi.h
@@ -144,7 +144,7 @@ public:
 #endif
 
     // no size hints
-    virtual void SetSizeHints( int WXUNUSED(minW),
+    virtual void DoSetSizeHints( int WXUNUSED(minW),
                                int WXUNUSED(minH),
                                int WXUNUSED(maxW) = -1,
                                int WXUNUSED(maxH) = -1,

diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index 69104769f2ce0a949a086a162e36100d5493dc11..b6e054b6482fff347586b8a3a98a625e78388f52 100644 (file)
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -144,7 +144,7 @@ public:
 #endif
 
     // no size hints
-    virtual void SetSizeHints( int WXUNUSED(minW),
+    virtual void DoSetSizeHints( int WXUNUSED(minW),
                                int WXUNUSED(minH),
                                int WXUNUSED(maxW) = -1,
                                int WXUNUSED(maxH) = -1,

diff --git a/include/wx/mac/carbon/slider.h b/include/wx/mac/carbon/slider.h
index b0f65bd36b22b6ddc040a545f5bcfdb7ae0181a6..98f82ab467c6f6fa94f1e2290d2ecfc7c77a0086 100644 (file)
--- a/include/wx/mac/carbon/slider.h
+++ b/include/wx/mac/carbon/slider.h
@@ -80,7 +80,7 @@ public:
 
  
      // set min/max size of the slider
-     virtual void SetSizeHints( int minW, int minH,
+     virtual void DoSetSizeHints( int minW, int minH,
                                 int maxW = -1, int maxH = -1,
                                 int incW = -1, int incH = -1 );
  

diff --git a/include/wx/mac/classic/slider.h b/include/wx/mac/classic/slider.h
index 9599a60c10ba14943c24b1dbaa80e195e144490b..3cd2ddc219a517501fe2db27dad91291eb1e8f4a 100644 (file)
--- a/include/wx/mac/classic/slider.h
+++ b/include/wx/mac/classic/slider.h
@@ -80,7 +80,7 @@ public:
 
  
      // set min/max size of the slider
-     virtual void SetSizeHints( int minW, int minH,
+     virtual void DoSetSizeHints( int minW, int minH,
                                 int maxW = -1, int maxH = -1,
                                 int incW = -1, int incH = -1 );
  

diff --git a/include/wx/motif/mdi.h b/include/wx/motif/mdi.h
index 91106240ee25c836707d862363551946ab0930eb..e0a5eba9428306375a95420be4f466889e210077 100644 (file)
--- a/include/wx/motif/mdi.h
+++ b/include/wx/motif/mdi.h
@@ -156,7 +156,7 @@ public:
     void ReleaseMouse();
     void Raise();
     void Lower(void);
-    void SetSizeHints(int minW = -1, int minH = -1, int maxW = -1, int maxH = -1, int incW = -1, int incH = -1);
+    void DoSetSizeHints(int minW = -1, int minH = -1, int maxW = -1, int maxH = -1, int incW = -1, int incH = -1);
     
     // MDI operations
     virtual void Maximize();

diff --git a/include/wx/window.h b/include/wx/window.h
index 3c9e9a89063988615299ec4c378b9941de5d2ee6..1b88bc156cba9cdef9189c41290d76bd5add4443 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -364,15 +364,23 @@ public:
         // set min/max size of the window
     virtual void SetSizeHints( int minW, int minH,
                                int maxW = wxDefaultCoord, int maxH = wxDefaultCoord,
-                               int incW = wxDefaultCoord, int incH = wxDefaultCoord );
+                               int incW = wxDefaultCoord, int incH = wxDefaultCoord )
+    {
+        DoSetSizeHints(minW, minH, maxW, maxH, incW, incH);
+    }
+    
     void SetSizeHints( const wxSize& minSize,
                        const wxSize& maxSize=wxDefaultSize,
                        const wxSize& incSize=wxDefaultSize)
     {
-        SetSizeHints(minSize.x, minSize.y,
-                     maxSize.x, maxSize.y,
-                     incSize.x, incSize.y);
+        DoSetSizeHints(minSize.x, minSize.y,
+                       maxSize.x, maxSize.y,
+                       incSize.x, incSize.y);
     }
+    
+    virtual void DoSetSizeHints(int minW, int minH,
+                                int maxW = wxDefaultCoord, int maxH = wxDefaultCoord,
+                               int incW = wxDefaultCoord, int incH = wxDefaultCoord );
 
     virtual void SetVirtualSizeHints( int minW, int minH,
                                       int maxW = wxDefaultCoord, int maxH = wxDefaultCoord );

diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h
index 057961575f1037f5ef5b8d12bdd0ca17a5c36bb6..669e17cd803738e14ee19c7f06250656e7a5ae64 100644 (file)
--- a/include/wx/x11/window.h
+++ b/include/wx/x11/window.h
@@ -82,13 +82,10 @@ public:
     virtual void ScrollWindow( int dx, int dy,
         const wxRect* rect = (wxRect *) NULL );
     
-    virtual void SetSizeHints(int minW, int minH,
+    virtual void DoSetSizeHints(int minW, int minH,
         int maxW = -1, int maxH = -1,
         int incW = -1, int incH = -1);
-    void SetSizeHints( const wxSize& minSize,
-                       const wxSize& maxSize=wxDefaultSize,
-                       const wxSize& incSize=wxDefaultSize)
-        { wxWindowBase::SetSizeHints(minSize, maxSize, incSize); }
+
 #if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget( wxDropTarget *dropTarget );
 #endif // wxUSE_DRAG_AND_DROP