moved wxWindow::GetBestSize implementation into DoGetBestSize to make it easier to...

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

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 44fdda39918ffc7baca970864cae586e8411b7c3..8e8247259029d19a29346bbe4762f58416b877b6 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -674,9 +674,9 @@ wxPoint wxWindowBase::GetClientAreaOrigin() const
 }
 
 // set the min/max size of the window
 }
 
 // set the min/max size of the window

-void wxWindowBase::SetSizeHints(int minW, int minH,
-                                int maxW, int maxH,
-                                int WXUNUSED(incW), int WXUNUSED(incH))
+void wxWindowBase::DoSetSizeHints(int minW, int minH,
+                                  int maxW, int maxH,
+                                  int WXUNUSED(incW), int WXUNUSED(incH))

 {
     // setting min width greater than max width leads to infinite loops under
     // X11 and generally doesn't make any sense, so don't allow it
 {
     // setting min width greater than max width leads to infinite loops under
     // X11 and generally doesn't make any sense, so don't allow it

diff --git a/src/mac/carbon/slider.cpp b/src/mac/carbon/slider.cpp
index 1d66db39e0fa44be37107384c42ae1b7d9a1c24f..3d24705a4dc8ab17be584ef387d8f4a54a0cd68a 100644 (file)
--- a/src/mac/carbon/slider.cpp
+++ b/src/mac/carbon/slider.cpp
@@ -291,17 +291,17 @@ wxInt32 wxSlider::MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent )
 
 /* This is overloaded in wxSlider so that the proper width/height will always be used
 * for the slider different values would cause redrawing and mouse detection problems */
 
 /* This is overloaded in wxSlider so that the proper width/height will always be used
 * for the slider different values would cause redrawing and mouse detection problems */

-void wxSlider::SetSizeHints( int minW, int minH,
-                            int maxW , int maxH ,
-                            int incW , int incH )
+void wxSlider::DoSetSizeHints( int minW, int minH,
+                               int maxW , int maxH ,
+                               int incW , int incH )

 {
     wxSize size = GetBestSize();
 
     if(GetWindowStyle() & wxSL_VERTICAL) {
 {
     wxSize size = GetBestSize();
 
     if(GetWindowStyle() & wxSL_VERTICAL) {

-        wxWindow::SetSizeHints(size.x, minH, size.x, maxH, incW, incH);
+        wxWindow::DoSetSizeHints(size.x, minH, size.x, maxH, incW, incH);

     }
     else {
     }
     else {

-        wxWindow::SetSizeHints(minW, size.y, maxW, size.y, incW, incH);
+        wxWindow::DoSetSizeHints(minW, size.y, maxW, size.y, incW, incH);

     }
 }
 
     }
 }
 

diff --git a/src/mac/classic/slider.cpp b/src/mac/classic/slider.cpp
index ec5b2de31476359947e4808d7c89365f5c480abc..45aeee3c8af5aa3f12c6c5abcace28cebfdbbf09 100644 (file)
--- a/src/mac/classic/slider.cpp
+++ b/src/mac/classic/slider.cpp
@@ -272,17 +272,17 @@ void wxSlider::MacHandleControlClick( WXWidget control , wxInt16 controlpart, bo
 
 /* This is overloaded in wxSlider so that the proper width/height will always be used
 * for the slider different values would cause redrawing and mouse detection problems */
 
 /* This is overloaded in wxSlider so that the proper width/height will always be used
 * for the slider different values would cause redrawing and mouse detection problems */

-void wxSlider::SetSizeHints( int minW, int minH,
-                            int maxW , int maxH ,
-                            int incW , int incH )
+void wxSlider::DoSetSizeHints( int minW, int minH,
+                               int maxW , int maxH ,
+                               int incW , int incH )

 {
     wxSize size = GetBestSize();
 
     if(GetWindowStyle() & wxSL_VERTICAL) {
 {
     wxSize size = GetBestSize();
 
     if(GetWindowStyle() & wxSL_VERTICAL) {

-        wxWindow::SetSizeHints(size.x, minH, size.x, maxH, incW, incH);
+        wxWindow::DoSetSizeHints(size.x, minH, size.x, maxH, incW, incH);

     }
     else {
     }
     else {

-        wxWindow::SetSizeHints(minW, size.y, maxW, size.y, incW, incH);
+        wxWindow::DoSetSizeHints(minW, size.y, maxW, size.y, incW, incH);

     }
 }
 
     }
 }
 

diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp
index 0c8811888b2e65f6e6b796f187549b7d68402762..3bd7ac45c2ef0c28c42bdbd1055cbdea881a51dd 100644 (file)
--- a/src/motif/mdi.cpp
+++ b/src/motif/mdi.cpp
@@ -618,7 +618,7 @@ void wxMDIChildFrame::Lower(void)
     wxWindow::Raise();
 }
 
     wxWindow::Raise();
 }
 

-void wxMDIChildFrame::SetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW), int WXUNUSED(maxH), int WXUNUSED(incW), int WXUNUSED(incH))
+void wxMDIChildFrame::DoSetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW), int WXUNUSED(maxH), int WXUNUSED(incW), int WXUNUSED(incH))

 {
 }
 
 {
 }
 

diff --git a/src/motif/toplevel.cpp b/src/motif/toplevel.cpp
index 7555346227a0c6cf23faa9865fd9e0306daa589f..40b9fc446bab1174a037e8141d1744a9a8beab58 100644 (file)
--- a/src/motif/toplevel.cpp
+++ b/src/motif/toplevel.cpp
@@ -336,11 +336,11 @@ bool wxTopLevelWindowMotif::IsMaximized() const
     return FALSE;
 }
 
     return FALSE;
 }
 

-void wxTopLevelWindowMotif::SetSizeHints( int minW, int minH,
-                                          int maxW, int maxH,
-                                          int incW, int incH )
+void wxTopLevelWindowMotif::DoSetSizeHints( int minW, int minH,
+                                            int maxW, int maxH,
+                                            int incW, int incH )

 {
 {

-    wxTopLevelWindowBase::SetSizeHints( minW, minH, maxW, maxH, incW, incH );
+    wxTopLevelWindowBase::DoSetSizeHints( minW, minH, maxW, maxH, incW, incH );

 
     int count = 0;
     Arg args[6];
 
     int count = 0;
     Arg args[6];

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index deccc1ef5b51af41619d2ea1262a6f3722189141..675d1a8b2fc1e17e6c3f4e6d2787fdab9f48672d 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -940,7 +940,7 @@ void wxWindowX11::DoMoveWindow(int x, int y, int width, int height)
 #endif
 }
 
 #endif
 }
 

-void wxWindowX11::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)
+void wxWindowX11::DoSetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)

 {
     m_minWidth = minW;
     m_minHeight = minH;
 {
     m_minWidth = minW;
     m_minHeight = minH;