added wxSafeConvertMB2WX/WX2MB() and use them when interfacing with C functions which...

[wxWidgets.git] / src / gtk / mdi.cpp

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index 031eae9e191359f4cb62081105d1b509fd987525..cbc20739afd7cebb51dc75e8bc35afd8d5db6126 100644 (file)
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -257,12 +257,17 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
     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();
     }
 
@@ -335,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 );