fixing overrelease and out-of-bounds write, fixes #13725

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

diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index 9a6688dd4e26f11ed9d555d9732e10ca0362b45f..e93cdc024f329c6186c16be7993f1f81c1065d0b 100644 (file)
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -39,11 +39,8 @@
 BEGIN_EVENT_TABLE(wxTopLevelWindowBase, wxWindow)
     EVT_CLOSE(wxTopLevelWindowBase::OnCloseWindow)
     EVT_SIZE(wxTopLevelWindowBase::OnSize)
 BEGIN_EVENT_TABLE(wxTopLevelWindowBase, wxWindow)
     EVT_CLOSE(wxTopLevelWindowBase::OnCloseWindow)
     EVT_SIZE(wxTopLevelWindowBase::OnSize)

-    WX_EVENT_TABLE_CONTROL_CONTAINER(wxTopLevelWindowBase)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-WX_DELEGATE_TO_CONTROL_CONTAINER(wxTopLevelWindowBase, wxWindow)
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -58,8 +55,6 @@ wxTopLevelWindowBase::wxTopLevelWindowBase()
 {
     // Unlike windows, top level windows are created hidden by default.
     m_isShown = false;
 {
     // Unlike windows, top level windows are created hidden by default.
     m_isShown = false;

-
-    WX_INIT_CONTROL_CONTAINER();

 }
 
 wxTopLevelWindowBase::~wxTopLevelWindowBase()
 }
 
 wxTopLevelWindowBase::~wxTopLevelWindowBase()


@@ -202,7 +197,7 @@ void wxTopLevelWindowBase::GetRectForTopLevelChildren(int *x, int *y, int *w, in
 wxSize wxTopLevelWindowBase::GetDefaultSize()
 {
     wxSize size = wxGetClientDisplayRect().GetSize();
 wxSize wxTopLevelWindowBase::GetDefaultSize()
 {
     wxSize size = wxGetClientDisplayRect().GetSize();

-
+#ifndef __WXOSX_IPHONE__

     // create proportionally bigger windows on small screens
     if ( size.x >= 1024 )
         size.x = 400;
     // create proportionally bigger windows on small screens
     if ( size.x >= 1024 )
         size.x = 400;


@@ -218,7 +213,7 @@ wxSize wxTopLevelWindowBase::GetDefaultSize()
         size.y *= 2;
         size.y /= 3;
     }
         size.y *= 2;
         size.y /= 3;
     }

-
+#endif

     return size;
 }
 
     return size;
 }
 


@@ -226,7 +221,10 @@ void wxTopLevelWindowBase::DoCentre(int dir)
 {
     // on some platforms centering top level windows is impossible
     // because they are always maximized by guidelines or limitations
 {
     // 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
         return;
 
     // we need the display rect anyhow so store it first: notice that we should


@@ -248,25 +246,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
         // 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;
     }
 
     {
         // 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
 
     if ( !(dir & wxBOTH) )
         dir |= wxBOTH; // if neither is specified, center in both directions
 


@@ -355,7 +347,7 @@ void wxTopLevelWindowBase::SetIcon(const wxIcon& icon)
     // passing wxNullIcon to SetIcon() is possible (it means that we shouldn't
     // have any icon), but adding an invalid icon to wxIconBundle is not
     wxIconBundle icons;
     // passing wxNullIcon to SetIcon() is possible (it means that we shouldn't
     // have any icon), but adding an invalid icon to wxIconBundle is not
     wxIconBundle icons;

-    if ( icon.Ok() )
+    if ( icon.IsOk() )

         icons.AddIcon(icon);
 
     SetIcons(icons);
         icons.AddIcon(icon);
 
     SetIcons(icons);


@@ -369,6 +361,14 @@ void wxTopLevelWindowBase::SetIcon(const wxIcon& icon)
 // whole client area
 void wxTopLevelWindowBase::DoLayout()
 {
 // whole client area
 void wxTopLevelWindowBase::DoLayout()
 {

+    // We are called during the window destruction several times, e.g. as
+    // wxFrame tries to adjust to its tool/status bars disappearing. But
+    // actually doing the layout is pretty useless in this case as the window
+    // will disappear anyhow -- so just don't bother.
+    if ( IsBeingDeleted() )
+        return;
+
+

     // if we're using constraints or sizers - do use them
     if ( GetAutoLayout() )
     {
     // if we're using constraints or sizers - do use them
     if ( GetAutoLayout() )
     {