From 024f89f972a6787e82d77fc5e5dac302a56abbb0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Thu, 30 Sep 2004 16:33:36 +0000
Subject: [PATCH] moved wxWindow::GetBestSize implementation into DoGetBestSize
 to make it easier to support both prototypes in derived classes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/wincmn.cpp      |  6 +++---
 src/mac/carbon/slider.cpp  | 10 +++++-----
 src/mac/classic/slider.cpp | 10 +++++-----
 src/motif/mdi.cpp          |  2 +-
 src/motif/toplevel.cpp     |  8 ++++----
 src/x11/window.cpp         |  2 +-
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 44fdda3991..8e82472590 100644
--- 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
-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
diff --git a/src/mac/carbon/slider.cpp b/src/mac/carbon/slider.cpp
index 1d66db39e0..3d24705a4d 100644
--- 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 */
-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) {
-        wxWindow::SetSizeHints(size.x, minH, size.x, maxH, incW, incH);
+        wxWindow::DoSetSizeHints(size.x, minH, size.x, maxH, incW, incH);
     }
     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 ec5b2de314..45aeee3c8a 100644
--- 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 */
-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) {
-        wxWindow::SetSizeHints(size.x, minH, size.x, maxH, incW, incH);
+        wxWindow::DoSetSizeHints(size.x, minH, size.x, maxH, incW, incH);
     }
     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 0c8811888b..3bd7ac45c2 100644
--- a/src/motif/mdi.cpp
+++ b/src/motif/mdi.cpp
@@ -618,7 +618,7 @@ void wxMDIChildFrame::Lower(void)
     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 7555346227..40b9fc446b 100644
--- a/src/motif/toplevel.cpp
+++ b/src/motif/toplevel.cpp
@@ -336,11 +336,11 @@ bool wxTopLevelWindowMotif::IsMaximized() const
     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];
diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index deccc1ef5b..675d1a8b2f 100644
--- 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
 }
 
-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;
-- 
2.47.2