X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af6c0f1de7b05cc9f85038939efbd79fcd5dc14e..7d7e4ed073fcb6be745f936cb8f19138117ebfcc:/src/gtk/mdi.cpp

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index a15c6a7500..bcbaad2c53 100644
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -10,14 +10,17 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_MDI
+
 #include "wx/mdi.h"
-#include "wx/notebook.h"
 
-#if wxUSE_MDI
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/menu.h"
+    #include "wx/dialog.h"
+#endif
 
-#include "wx/dialog.h"
-#include "wx/menu.h"
-#include "wx/intl.h"
+#include "wx/notebook.h"
 #include "wx/gtk/private.h"
 
 #include <glib.h>
@@ -35,8 +38,6 @@ const int wxMENU_HEIGHT = 27;
 // globals
 //-----------------------------------------------------------------------------
 
-extern wxList wxPendingDelete;
-
 //-----------------------------------------------------------------------------
 // "switch_page"
 //-----------------------------------------------------------------------------
@@ -125,9 +126,9 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
     return true;
 }
 
-void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
+void wxMDIParentFrame::GtkOnSize()
 {
-    wxFrame::GtkOnSize( x, y, width, height );
+    wxFrame::GtkOnSize();
 
     wxMDIChildFrame *child_frame = GetActiveChild();
     if (!child_frame) return;
@@ -240,11 +241,6 @@ void wxMDIParentFrame::OnInternalIdle()
     }
 }
 
-void wxMDIParentFrame::DoGetClientSize(int *width, int *height ) const
-{
-    wxFrame::DoGetClientSize( width, height );
-}
-
 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
 {
     if (!m_clientWindow) return (wxMDIChildFrame*) NULL;
@@ -254,19 +250,24 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
 
     gint i = gtk_notebook_get_current_page( notebook );
     if (i < 0) return (wxMDIChildFrame*) NULL;
-
+    
     GtkNotebookPage* page = (GtkNotebookPage*) (g_list_nth(notebook->children,i)->data);
     if (!page) return (wxMDIChildFrame*) NULL;
 
     wxWindowList::compatibility_iterator node = m_clientWindow->GetChildren().GetFirst();
     while (node)
     {
+        if ( wxPendingDelete.Member(node->GetData()) )
+            return (wxMDIChildFrame*) NULL;
+        
         wxMDIChildFrame *child_frame = wxDynamicCast( node->GetData(), wxMDIChildFrame );
 
-        wxASSERT_MSG( child_frame, _T("child is not a wxMDIChildFrame") );
+        if (!child_frame)
+            return (wxMDIChildFrame*) NULL;
 
         if (child_frame->m_page == page)
             return child_frame;
+            
         node = node->GetNext();
     }
 
@@ -339,6 +340,19 @@ bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
     return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name );
 }
 
+bool wxMDIChildFrame::Destroy()
+{
+    // delayed destruction: the frame will be deleted during
+    // the next idle loop iteration.
+    // I'm not sure if delayed destruction really makes so
+    // much sense for MDI child frames, actually, but hiding
+    // it doesn't make any sense.
+    if ( !wxPendingDelete.Member(this) )
+        wxPendingDelete.Append(this);
+
+    return true;
+}
+
 void wxMDIChildFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
     wxWindow::DoSetSize( x, y, width, height, sizeFlags );