removed unneeded duplication of DoSetSizeHints() in wxTLWBase (as wxWindow version...

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

diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index 268ecbd4ad121a04f5c3501f4c59c0f3b375e4fb..92fcc6b37f8f96ecc16d346839731792a5d3dab1 100644 (file)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -252,11 +252,6 @@ public:
     virtual void SetMinSize(const wxSize& minSize);
     virtual void SetMaxSize(const wxSize& maxSize);
 
-    // set size hints for "window manager"
-    virtual void DoSetSizeHints( int minW, int minH,
-                                 int maxW = wxDefaultCoord, int maxH = wxDefaultCoord,
-                                 int incW = wxDefaultCoord, int incH = wxDefaultCoord );
-
 protected:
     // the frame client to screen translation should take account of the
     // toolbar which may shift the origin of the client area

diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index 428c54dac5bd9660486cfa6b1d9e97c19e8ed623..e72953cf7edefb692cce71dbf65d863429670d4d 100644 (file)
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -143,29 +143,12 @@ bool wxTopLevelWindowBase::IsLastBeforeExit() const
 
 void wxTopLevelWindowBase::SetMinSize(const wxSize& minSize)
 {
-    SetSizeHints( minSize.x, minSize.y, GetMaxWidth(), GetMaxHeight() );    
+    SetSizeHints(minSize, GetMaxSize());
 }
 
 void wxTopLevelWindowBase::SetMaxSize(const wxSize& maxSize)
 {
-    SetSizeHints( GetMinWidth(), GetMinHeight(), maxSize.x, maxSize.y );
-}
-
-// set the min/max size of the window
-void wxTopLevelWindowBase::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
-    wxCHECK_RET( (minW == wxDefaultCoord || maxW == wxDefaultCoord || minW <= maxW) &&
-                    (minH == wxDefaultCoord || maxH == wxDefaultCoord || minH <= maxH),
-                 _T("min width/height must be less than max width/height!") );
-
-    m_minWidth = minW;
-    m_maxWidth = maxW;
-    m_minHeight = minH;
-    m_maxHeight = maxH;
+    SetSizeHints(GetMinSize(), maxSize);
 }
 
 void wxTopLevelWindowBase::GetRectForTopLevelChildren(int *x, int *y, int *w, int *h)