Fixed compile problem and warning

[wxWidgets.git] / src / common / toplvcmn.cpp

diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index 9e0d6357e52640fd698c44ff51d7a6376aee71bd..f090433b4019f7464c55b80bafa3a5ffaf3688eb 100644 (file)
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -140,6 +140,16 @@ bool wxTopLevelWindowBase::IsLastBeforeExit() const
 // wxTopLevelWindow geometry
 // ----------------------------------------------------------------------------
 
+void wxTopLevelWindowBase::SetMinSize(const wxSize& minSize)
+{
+    SetSizeHints( minSize.x, minSize.y, GetMaxWidth(), GetMaxHeight() );    
+}
+
+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,
@@ -163,22 +173,6 @@ void wxTopLevelWindowBase::GetRectForTopLevelChildren(int *x, int *y, int *w, in
     GetSize(w,h);
 }
 
-wxSize wxTopLevelWindowBase::GetMaxSize() const
-{
-    wxSize size = wxWindow::GetMaxSize();
-
-    int w, h;
-    wxClientDisplayRect(NULL, NULL, &w, &h );
-
-    if ( size.GetWidth() == wxDefaultCoord )
-        size.SetWidth(w);
-
-    if ( size.GetHeight() == wxDefaultCoord )
-        size.SetHeight(h);
-
-    return size;
-}
-
 /* static */
 wxSize wxTopLevelWindowBase::GetDefaultSize()
 {
@@ -237,7 +231,7 @@ void wxTopLevelWindowBase::DoCentre(int dir)
 
     if ( rectParent.IsEmpty() )
     {
-        // we were explicitely asked to centre this window on the entire screen
+        // we were explicitly asked to centre this window on the entire screen
         // or if we have no parent anyhow and so can't centre on it
         rectParent = rectDisplay;
     }
@@ -256,11 +250,11 @@ void wxTopLevelWindowBase::DoCentre(int dir)
     {
         if ( !rectDisplay.Contains(rect.GetBottomRight()) )
         {
-            // check if we can move the window so that the bottom right corner
-            // is visible without hiding the top left one
+            // move the window just enough for the bottom right corner to
+            // become visible
             int dx = rectDisplay.GetRight() - rect.GetRight();
             int dy = rectDisplay.GetBottom() - rect.GetBottom();
-            rect.Offset(dx, dy);
+            rect.Offset(dx < 0 ? dx : 0, dy < 0 ? dy : 0);
         }
         //else: the window top left and bottom right corner are both visible,
         //      although the window might still be not entirely on screen (with
@@ -364,21 +358,7 @@ void wxTopLevelWindowBase::DoLayout()
             int clientW, clientH;
             DoGetClientSize(&clientW, &clientH);
 
-            // for whatever reasons, wxGTK wants to have a small offset - it
-            // probably looks better with it?
-#ifdef __WXGTK__
-            const int ofs = 1;
-            clientW -= 2 * ofs;
-            clientH -= 2 * ofs;
-            if (clientW < 0)
-                clientW = 0;
-            if (clientH < 0)
-                clientH = 0;
-#else
-            const int ofs = 0;
-#endif
-
-            child->SetSize(ofs, ofs, clientW, clientH);
+            child->SetSize(0, 0, clientW, clientH);
         }
     }
 }