remove some extraneous semicolons

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

diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index 9a6688dd4e26f11ed9d555d9732e10ca0362b45f..ceee633abfb8dc1478b376dd086031fb86c504ec 100644 (file)
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -202,7 +202,7 @@ void wxTopLevelWindowBase::GetRectForTopLevelChildren(int *x, int *y, int *w, in
 wxSize wxTopLevelWindowBase::GetDefaultSize()
 {
     wxSize size = wxGetClientDisplayRect().GetSize();
-
+#ifndef __WXOSX_IPHONE__
     // create proportionally bigger windows on small screens
     if ( size.x >= 1024 )
         size.x = 400;
@@ -218,7 +218,7 @@ wxSize wxTopLevelWindowBase::GetDefaultSize()
         size.y *= 2;
         size.y /= 3;
     }
-
+#endif
     return size;
 }
 
@@ -226,7 +226,10 @@ void wxTopLevelWindowBase::DoCentre(int dir)
 {
     // on some platforms centering top level windows is impossible
     // because they are always maximized by guidelines or limitations
-    if(IsAlwaysMaximized())
+    //
+    // and centering a maximized window doesn't make sense as its position
+    // can't change
+    if ( IsAlwaysMaximized() || IsMaximized() )
         return;
 
     // we need the display rect anyhow so store it first: notice that we should
@@ -248,25 +251,19 @@ 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.Contains(rectParent.GetTopLeft()) &&
-                !rectParent.Contains(rectParent.GetBottomRight()) )
+        if ( !rectParent.Intersects(rectDisplay) )
         {
-            // this is enough to make IsEmpty() test below pass
-            rectParent.width = 0;
+            // just centre on screen then
+            rectParent = rectDisplay;
         }
     }
-
-    if ( rectParent.IsEmpty() )
+    else
     {
         // 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;
     }
 
-    // centering maximized window on screen is no-op
-    if((rectParent == rectDisplay) && IsMaximized())
-        return;
-
     if ( !(dir & wxBOTH) )
         dir |= wxBOTH; // if neither is specified, center in both directions