Updated list of subprojects.

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

diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index 60376d3ebcb84e678230fd2e034a8efdb00a881e..aa07d2f096b5195985daed11ea0a20243d885e8f 100644 (file)
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -210,8 +210,8 @@ void wxTopLevelWindowBase::DoCentre(int dir)
         // parent frame under Mac but could happen elsewhere too if the frame
         // was hidden/moved away for some reason), don't use it as otherwise
         // this window wouldn't be visible at all
-        if ( !rectDisplay.Inside(rectParent.GetTopLeft()) &&
-                !rectParent.Inside(rectParent.GetBottomRight()) )
+        if ( !rectDisplay.Contains(rectParent.GetTopLeft()) &&
+                !rectParent.Contains(rectParent.GetBottomRight()) )
         {
             // this is enough to make IsEmpty() test below pass
             rectParent.width = 0;
@@ -235,9 +235,9 @@ void wxTopLevelWindowBase::DoCentre(int dir)
     // we don't want to place the window off screen if Centre() is called as
     // this is (almost?) never wanted and it would be very difficult to prevent
     // it from happening from the user code if we didn't check for it here
-    if ( rectDisplay.Inside(rect.GetTopLeft()) )
+    if ( rectDisplay.Contains(rect.GetTopLeft()) )
     {
-        if ( !rectDisplay.Inside(rect.GetBottomRight()) )
+        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
@@ -350,12 +350,18 @@ void wxTopLevelWindowBase::DoLayout()
             // for whatever reasons, wxGTK wants to have a small offset - it
             // probably looks better with it?
 #ifdef __WXGTK__
-            static const int ofs = 1;
+            const int ofs = 1;
+            clientW -= 2 * ofs;
+            clientH -= 2 * ofs;
+            if (clientW < 0)
+                clientW = 0;
+            if (clientH < 0)
+                clientH = 0;
 #else
-            static const int ofs = 0;
+            const int ofs = 0;
 #endif
 
-            child->SetSize(ofs, ofs, clientW - 2*ofs, clientH - 2*ofs);
+            child->SetSize(ofs, ofs, clientW, clientH);
         }
     }
 }