changed wxFileSelector() etc. functions to use wxString (so that any forms of strings...

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

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index 031eae9e191359f4cb62081105d1b509fd987525..607dc314d73395c4e67508c2db6752d36d804002 100644 (file)
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -23,8 +23,6 @@
 #include "wx/notebook.h"
 #include "wx/gtk/private.h"
 
-#include <glib.h>
-#include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include "wx/gtk/win_gtk.h"
 
@@ -49,9 +47,6 @@ gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
                               gint WXUNUSED(page_num),
                               wxMDIParentFrame *parent )
 {
-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
     // send deactivate event to old child
 
     wxMDIChildFrame *child = parent->GetActiveChild();
@@ -257,12 +252,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,19 +335,22 @@ bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
     return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name );
 }
 
-void wxMDIChildFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
+bool wxMDIChildFrame::Destroy()
 {
-    wxWindow::DoSetSize( x, y, width, height, sizeFlags );
-}
+    // 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);
 
-void wxMDIChildFrame::DoSetClientSize(int width, int height)
-{
-    wxWindow::DoSetClientSize( width, height );
+    return true;
 }
 
-void wxMDIChildFrame::DoGetClientSize( int *width, int *height ) const
+void wxMDIChildFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
-    wxWindow::DoGetClientSize( width, height );
+    wxWindow::DoSetSize( x, y, width, height, sizeFlags );
 }
 
 void wxMDIChildFrame::AddChild( wxWindowBase *child )
@@ -395,7 +398,7 @@ void wxMDIChildFrame::OnMenuHighlight( wxMenuEvent& event )
 {
 #if wxUSE_STATUSBAR
     wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->GetParent();
-    if ( !ShowMenuHelp(mdi_frame->GetStatusBar(), event.GetMenuId()) )
+    if ( !ShowMenuHelp(event.GetMenuId()) )
     {
         // we don't have any help text for this item, but may be the MDI frame
         // does?
@@ -421,10 +424,8 @@ void wxMDIChildFrame::SetTitle( const wxString &title )
 //-----------------------------------------------------------------------------
 
 extern "C" {
-static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
+static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxMDIChildFrame *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
     if ((win->m_x == alloc->x) &&
         (win->m_y == alloc->y) &&
         (win->m_width == alloc->width) &&
@@ -442,9 +443,10 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
 // InsertChild callback for wxMDIClientWindow
 //-----------------------------------------------------------------------------
 
-static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* child )
+static void wxInsertChildInMDI(wxWindow* parent, wxWindow* child)
 {
-    wxString s = child->GetTitle();
+    wxMDIChildFrame* child_frame = wx_static_cast(wxMDIChildFrame*, child);
+    wxString s = child_frame->GetTitle();
     if (s.IsNull()) s = _("MDI child");
 
     GtkWidget *label_widget = gtk_label_new( s.mbc_str() );
@@ -457,9 +459,9 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil
 
     gtk_notebook_append_page( notebook, child->m_widget, label_widget );
 
-    child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
+    child_frame->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
 
-    wxMDIParentFrame *parent_frame = (wxMDIParentFrame*) parent->GetParent();
+    wxMDIParentFrame *parent_frame = wx_static_cast(wxMDIParentFrame*, parent->GetParent());
     parent_frame->m_justInserted = true;
 }
 
@@ -485,9 +487,7 @@ wxMDIClientWindow::~wxMDIClientWindow()
 
 bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 {
-    m_needParent = true;
-
-    m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI;
+    m_insertCallback = wxInsertChildInMDI;
 
     if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
         !CreateBase( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("wxMDIClientWindow") ))
@@ -512,4 +512,4 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
     return true;
 }
 
-#endif
+#endif // wxUSE_MDI