Avoid outputting the assert message twice in non-GUI code.

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

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index edfdec564143420682eec53ae1560a36883f72fb..9778056ad3ee2f618731026e425025176e88ca3f 100644 (file)
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mdi.cpp
+// Name:        src/gtk/mdi.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,72 +7,72 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "mdi.h"
-#endif
-
-#include "wx/mdi.h"
-#include "wx/dialog.h"
-#include "wx/menu.h"
-#include <wx/intl.h>
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

-#include "glib.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "wx/gtk/win_gtk.h"
+#if wxUSE_MDI

 
 

-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
-
-const int wxMENU_HEIGHT    = 27;
+#include "wx/mdi.h"

 
 

-//-----------------------------------------------------------------------------
-// globals
-//-----------------------------------------------------------------------------
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/menu.h"
+#endif

 
 

-extern wxList wxPendingDelete;
+#include "wx/gtk/private.h"

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// "size_allocate"
+// "switch_page"

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
+extern "C" {
+static void
+gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
+                              GtkNotebookPage *page,
+                              gint WXUNUSED(page_num),
+                              wxMDIParentFrame *parent )

 {
 {

-    if ((win->m_x == alloc->x) &&
-        (win->m_y == alloc->y) &&
-        (win->m_width == alloc->width) &&
-        (win->m_height == alloc->height) &&
-        (win->m_sizeSet))
+    // send deactivate event to old child
+
+    wxMDIChildFrame *child = parent->GetActiveChild();
+    if (child)

     {
     {

-        return;
+        wxActivateEvent event1( wxEVT_ACTIVATE, false, child->GetId() );
+        event1.SetEventObject( child);
+        child->HandleWindowEvent( event1 );

     }
 
     }
 

-    win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
-}
+    // send activate event to new child

 
 

-//-----------------------------------------------------------------------------
-// "switch_page"
-//-----------------------------------------------------------------------------
+    wxMDIClientWindowBase *client_window = parent->GetClientWindow();
+    if ( !client_window )
+        return;

 
 

-static void gtk_page_change_callback( GtkNotebook *WXUNUSED(widget),
-                                      GtkNotebookPage *page,
-                                      gint WXUNUSED(nPage),
-                                      wxMDIClientWindow *client_win )
-{
-    wxNode *node = client_win->m_children.First();
-    while (node)
+    child = NULL;
+
+    wxWindowList::compatibility_iterator node = client_window->GetChildren().GetFirst();
+    while ( node )

     {
     {

-        wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
-        if (child_frame->m_page == page)
+        wxMDIChildFrame *child_frame = wxDynamicCast( node->GetData(), wxMDIChildFrame );
+
+        // child_frame can be NULL when this is called from dtor, probably
+        // because g_signal_connect (m_widget, "switch_page", (see below)
+        // isn't deleted early enough
+        if ( child_frame && child_frame->m_page == page )

         {
         {

-            wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)client_win->m_parent;
-            mdi_frame->m_currentChild = child_frame;
-            mdi_frame->SetMDIMenuBar( child_frame->m_menuBar );
-            return;
+            child = child_frame;
+            break;

         }
         }

-        node = node->Next();
+        node = node->GetNext();

     }
     }

+
+    if (!child)
+         return;
+
+    wxActivateEvent event2( wxEVT_ACTIVATE, true, child->GetId() );
+    event2.SetEventObject( child);
+    child->HandleWindowEvent( event2 );
+}

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -81,220 +81,241 @@ static void gtk_page_change_callback( GtkNotebook *WXUNUSED(widget),
 
 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame,wxFrame)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame,wxFrame)
 

-BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
-END_EVENT_TABLE()
-
-wxMDIParentFrame::wxMDIParentFrame(void)
+void wxMDIParentFrame::Init()

 {
 {

-    m_clientWindow = (wxMDIClientWindow *) NULL;
-    m_currentChild = (wxMDIChildFrame *) NULL;
-    m_parentFrameActive = TRUE;
+    m_justInserted = false;

 }
 
 }
 

-wxMDIParentFrame::wxMDIParentFrame( wxWindow *parent,
-      wxWindowID id, const wxString& title,
-      const wxPoint& pos, const wxSize& size,
-      long style, const wxString& name )
+bool wxMDIParentFrame::Create(wxWindow *parent,
+                              wxWindowID id,
+                              const wxString& title,
+                              const wxPoint& pos,
+                              const wxSize& size,
+                              long style,
+                              const wxString& name )

 {
 {

-    m_clientWindow = (wxMDIClientWindow *) NULL;
-    m_currentChild = (wxMDIChildFrame *) NULL;
-    m_parentFrameActive = TRUE;
-    Create( parent, id, title, pos, size, style, name );
-}
+    if ( !wxFrame::Create( parent, id, title, pos, size, style, name ) )
+        return false;

 
 

-wxMDIParentFrame::~wxMDIParentFrame(void)
-{
+    m_clientWindow = OnCreateClient();
+    if ( !m_clientWindow->CreateClient(this, GetWindowStyleFlag()) )
+        return false;
+
+    return true;

 }
 
 }
 

-bool wxMDIParentFrame::Create( wxWindow *parent,
-      wxWindowID id, const wxString& title,
-      const wxPoint& pos, const wxSize& size,
-      long style, const wxString& name )
+void wxMDIParentFrame::OnInternalIdle()

 {
 {

-    wxFrame::Create( parent, id, title, pos, size, style, name );
+    /* if a MDI child window has just been inserted
+       it has to be brought to the top in idle time. we
+       simply set the last notebook page active as new
+       pages can only be appended at the end */

 
 

-    OnCreateClient();
+    if (m_justInserted)
+    {
+        GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
+        gtk_notebook_set_current_page( notebook, g_list_length( notebook->children ) - 1 );

 
 

-    return TRUE;
-}
+        /* need to set the menubar of the child */
+        wxMDIChildFrame *active_child_frame = GetActiveChild();
+        if (active_child_frame != NULL)
+        {
+            wxMenuBar *menu_bar = active_child_frame->m_menuBar;
+            if (menu_bar)
+            {
+                menu_bar->SetInvokingWindow(active_child_frame);
+            }
+        }
+        m_justInserted = false;
+        return;
+    }

 
 

-void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
-{
-    wxFrame::GtkOnSize( x, y, width, height );
+    wxFrame::OnInternalIdle();
+
+    wxMDIChildFrame *active_child_frame = GetActiveChild();
+    bool visible_child_menu = false;

 
 

-    if (m_mdiMenuBar)
+    wxWindowList::compatibility_iterator node = m_clientWindow->GetChildren().GetFirst();
+    while (node)

     {
     {

-        m_mdiMenuBar->m_x = 0;  
-        m_mdiMenuBar->m_y = 0;
-        m_mdiMenuBar->m_width = m_width;
-        m_mdiMenuBar->m_height = wxMENU_HEIGHT;
-        gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_mdiMenuBar->m_widget, 0, 0 );
-        gtk_widget_set_usize( m_mdiMenuBar->m_widget, m_width, wxMENU_HEIGHT );
+        wxMDIChildFrame *child_frame = wxDynamicCast( node->GetData(), wxMDIChildFrame );
+
+        if ( child_frame )
+        {
+            wxMenuBar *menu_bar = child_frame->m_menuBar;
+            if ( menu_bar )
+            {
+                if (child_frame == active_child_frame)
+                {
+                    if (menu_bar->Show(true))
+                    {
+                        menu_bar->SetInvokingWindow( child_frame );
+                    }
+                    visible_child_menu = true;
+                }
+                else
+                {
+                    if (menu_bar->Show(false))
+                    {
+                        menu_bar->UnsetInvokingWindow( child_frame );
+                    }
+                }
+            }
+        }
+
+        node = node->GetNext();

     }
     }

-}

 
 

-void wxMDIParentFrame::SetMDIMenuBar( wxMenuBar *menu_bar )
-{
-    /* hide old child menu bar */
-    if (m_mdiMenuBar) m_mdiMenuBar->Show( FALSE );
-    
-    m_mdiMenuBar = menu_bar;
-    
-    /* show and resize new menu child menu bar */
-    if (m_mdiMenuBar)
+    /* show/hide parent menu bar as required */
+    if ((m_frameMenuBar) &&
+        (m_frameMenuBar->IsShown() == visible_child_menu))

     {
     {

-        m_mdiMenuBar->m_x = 0;  
-        m_mdiMenuBar->m_y = 0;
-        m_mdiMenuBar->m_width = m_width;
-        m_mdiMenuBar->m_height = wxMENU_HEIGHT;
-        gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_mdiMenuBar->m_widget, 0, 0 );
-        gtk_widget_set_usize( m_mdiMenuBar->m_widget, m_width, wxMENU_HEIGHT );
-        m_mdiMenuBar->Show( TRUE );
+        if (visible_child_menu)
+        {
+            m_frameMenuBar->Show( false );
+            m_frameMenuBar->UnsetInvokingWindow( this );
+        }
+        else
+        {
+            m_frameMenuBar->Show( true );
+            m_frameMenuBar->SetInvokingWindow( this );
+        }

     }
     }

-    
-    /* show/hide parent menu bar as required */
-    if (m_frameMenuBar) m_frameMenuBar->Show( (m_mdiMenuBar == NULL) );

 }
 
 }
 

-void wxMDIParentFrame::GetClientSize(int *width, int *height ) const
+void wxMDIParentFrame::DoGetClientSize(int* width, int* height) const

 {
 {

-    wxFrame::GetClientSize( width, height );
-}
+    wxFrame::DoGetClientSize(width, height);

 
 

-wxMDIChildFrame *wxMDIParentFrame::GetActiveChild(void) const
-{
-    return m_currentChild;
+    if (height)
+    {
+        wxMDIChildFrame* active_child_frame = GetActiveChild();
+        if (active_child_frame)
+        {
+            wxMenuBar* menubar = active_child_frame->m_menuBar;
+            if (menubar && menubar->IsShown())
+            {
+                GtkRequisition req;
+                gtk_widget_size_request(menubar->m_widget, &req);
+                *height -= req.height;
+                if (*height < 0) *height = 0;
+            }
+        }
+    }

 }
 
 }
 

-wxMDIClientWindow *wxMDIParentFrame::GetClientWindow(void) const
+wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const

 {
 {

-    return m_clientWindow;
-}
+    if (!m_clientWindow) return NULL;

 
 

-wxMDIClientWindow *wxMDIParentFrame::OnCreateClient(void)
-{
-    m_clientWindow = new wxMDIClientWindow( this );
-    return m_clientWindow;
+    GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
+    if (!notebook) return NULL;
+
+    gint i = gtk_notebook_get_current_page( notebook );
+    if (i < 0) return NULL;
+
+    GtkNotebookPage* page = (GtkNotebookPage*) (g_list_nth(notebook->children,i)->data);
+    if (!page) return NULL;
+
+    wxWindowList::compatibility_iterator node = m_clientWindow->GetChildren().GetFirst();
+    while (node)
+    {
+        if ( wxPendingDelete.Member(node->GetData()) )
+            return NULL;
+
+        wxMDIChildFrame *child_frame = wxDynamicCast( node->GetData(), wxMDIChildFrame );
+
+        if (!child_frame)
+            return NULL;
+
+        if (child_frame->m_page == page)
+            return child_frame;
+
+        node = node->GetNext();
+    }
+
+    return NULL;

 }
 
 }
 

-void wxMDIParentFrame::ActivateNext(void)
+void wxMDIParentFrame::ActivateNext()

 {
     if (m_clientWindow)
       gtk_notebook_next_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );
 }
 
 {
     if (m_clientWindow)
       gtk_notebook_next_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );
 }
 

-void wxMDIParentFrame::ActivatePrevious(void)
+void wxMDIParentFrame::ActivatePrevious()

 {
     if (m_clientWindow)
       gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );
 }
 
 {
     if (m_clientWindow)
       gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );
 }
 

-void wxMDIParentFrame::OnActivate( wxActivateEvent& WXUNUSED(event) )
-{
-}
-
-void wxMDIParentFrame::OnSysColourChanged( wxSysColourChangedEvent& WXUNUSED(event) )
-{
-}
-

 //-----------------------------------------------------------------------------
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame,wxFrame)
 //-----------------------------------------------------------------------------
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame,wxFrame)

-  
+

 BEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame)
     EVT_ACTIVATE(wxMDIChildFrame::OnActivate)
 BEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame)
     EVT_ACTIVATE(wxMDIChildFrame::OnActivate)

+    EVT_MENU_HIGHLIGHT_ALL(wxMDIChildFrame::OnMenuHighlight)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-wxMDIChildFrame::wxMDIChildFrame(void)
-{
-    m_menuBar = (wxMenuBar *) NULL;
-    m_page = (GtkNotebookPage *) NULL;
-}
-
-wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent,
-      wxWindowID id, const wxString& title,
-      const wxPoint& WXUNUSED(pos), const wxSize& size,
-      long style, const wxString& name )
-{
-    m_menuBar = (wxMenuBar *) NULL;
-    m_page = (GtkNotebookPage *) NULL;
-    Create( parent, id, title, wxDefaultPosition, size, style, name );
-}
-
-wxMDIChildFrame::~wxMDIChildFrame(void)
+void wxMDIChildFrame::Init()

 {
 {

-    if (m_menuBar)
-    {
-        wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->m_parent;
-        if (mdi_frame->m_currentChild == this)
-        {
-            mdi_frame->SetMDIMenuBar( (wxMenuBar *) NULL );
-            mdi_frame->m_currentChild = (wxMDIChildFrame *) NULL;
-        }
-        delete m_menuBar;
-    }
+    m_menuBar = NULL;
+    m_page = NULL;

 }
 
 }
 

-bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
-      wxWindowID id, const wxString& title,
-      const wxPoint& WXUNUSED(pos), const wxSize& size,
-      long style, const wxString& name )
+bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
+                             wxWindowID id,
+                             const wxString& title,
+                             const wxPoint& WXUNUSED(pos),
+                             const wxSize& size,
+                             long style,
+                             const wxString& name)

 {
 {

+    m_mdiParent = parent;

     m_title = title;
     m_title = title;

-  
-    return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name );
-}

 
 

-void wxMDIChildFrame::GetClientSize( int *width, int *height ) const
-{
-    wxWindow::GetClientSize( width, height );
+    return wxWindow::Create(parent->GetClientWindow(), id,
+                            wxDefaultPosition, size,
+                            style, name);

 }
 
 }
 

-void wxMDIChildFrame::AddChild( wxWindow *child )
+wxMDIChildFrame::~wxMDIChildFrame()

 {
 {

-    wxWindow::AddChild( child );
-}
-  
-static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
-{
-    menu->SetInvokingWindow( win );
-    wxNode *node = menu->m_items.First();
-    while (node)
-    {
-        wxMenuItem *menuitem = (wxMenuItem*)node->Data();
-        if (menuitem->IsSubMenu())
-            SetInvokingWindow( menuitem->GetSubMenu(), win );
-        node = node->Next();
-    }
+    delete m_menuBar;
+
+    // wxMDIClientWindow does not get redrawn properly after last child is removed
+    if (m_parent && m_parent->GetChildren().size() <= 1)
+        gtk_widget_queue_draw(m_parent->m_widget);

 }
 
 void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
 {
 }
 
 void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
 {

+    wxASSERT_MSG( m_menuBar == NULL, "Only one menubar allowed" );
+

     m_menuBar = menu_bar;
 
     if (m_menuBar)
     {
     m_menuBar = menu_bar;
 
     if (m_menuBar)
     {

-        wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->m_parent;
-
-       if (m_menuBar->m_parent != this)
-       {
-            wxNode *node = m_menuBar->m_menus.First();
-            while (node)
-            {
-                wxMenu *menu = (wxMenu*)node->Data();
-                SetInvokingWindow( menu, this );
-                node = node->Next();
-            }
-
-            m_menuBar->m_parent = mdi_frame;
-        }
-       
-        gtk_myfixed_put( GTK_MYFIXED(mdi_frame->m_wxwindow),
-          m_menuBar->m_widget, m_menuBar->m_x, m_menuBar->m_y );
-         
-        mdi_frame->SetMDIMenuBar( m_menuBar );
+        wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->GetParent();
+
+        m_menuBar->SetParent( mdi_frame );
+
+        /* insert the invisible menu bar into the _parent_ mdi frame */
+        m_menuBar->Show(false);
+        gtk_box_pack_start(GTK_BOX(mdi_frame->m_mainWidget), m_menuBar->m_widget, false, false, 0);
+        gtk_box_reorder_child(GTK_BOX(mdi_frame->m_mainWidget), m_menuBar->m_widget, 0);
+
+        gulong handler_id = g_signal_handler_find(
+            m_menuBar->m_widget,
+            GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA),
+            g_signal_lookup("size_request", GTK_TYPE_WIDGET),
+            0, NULL, NULL, m_menuBar);
+        if (handler_id != 0)
+            g_signal_handler_disconnect(m_menuBar->m_widget, handler_id);
+        gtk_widget_set_size_request(m_menuBar->m_widget, -1, -1);

     }
 }
 
     }
 }
 


@@ -303,84 +324,117 @@ wxMenuBar *wxMDIChildFrame::GetMenuBar() const
     return m_menuBar;
 }
 
     return m_menuBar;
 }
 

-void wxMDIChildFrame::Activate(void)
+GtkNotebook *wxMDIChildFrame::GTKGetNotebook() const

 {
 {

+    wxMDIClientWindow * const
+        client = wxStaticCast(GetParent(), wxMDIClientWindow);
+    wxCHECK( client, NULL );
+
+    return GTK_NOTEBOOK(client->m_widget);

 }
 
 }
 

-void wxMDIChildFrame::OnActivate( wxActivateEvent &WXUNUSED(event) )
+void wxMDIChildFrame::Activate()

 {
 {

-}
+    GtkNotebook * const notebook = GTKGetNotebook();
+    wxCHECK_RET( notebook, "no parent notebook?" );

 
 

-//-----------------------------------------------------------------------------
-// InsertChild callback for wxMDIClientWindow
-//-----------------------------------------------------------------------------
+    gint pageno = gtk_notebook_page_num( notebook, m_widget );
+    gtk_notebook_set_current_page( notebook, pageno );
+}

 
 

-static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* child )
+void wxMDIChildFrame::OnActivate( wxActivateEvent& WXUNUSED(event) )

 {
 {

-    wxString s = child->m_title;
-    if (s.IsNull()) s = _("MDI child");
+}

 
 

-    GtkWidget *label_widget = gtk_label_new( s );
-    gtk_misc_set_alignment( GTK_MISC(label_widget), 0.0, 0.5 );
+void wxMDIChildFrame::OnMenuHighlight( wxMenuEvent& event )
+{
+#if wxUSE_STATUSBAR
+    wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->GetParent();
+    if ( !ShowMenuHelp(event.GetMenuId()) )
+    {
+        // we don't have any help text for this item, but may be the MDI frame
+        // does?
+        mdi_frame->OnMenuHighlight(event);
+    }
+#endif // wxUSE_STATUSBAR
+}

 
 

-    gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate",
-      GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child );
-    
-    GtkNotebook *notebook = GTK_NOTEBOOK(parent->m_widget);
-    
-    gtk_notebook_append_page( notebook, child->m_widget, label_widget );
+void wxMDIChildFrame::SetTitle( const wxString &title )
+{
+    if ( title == m_title )
+        return;

 
 

-    child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
+    m_title = title;

 
 

-    gtk_notebook_set_page( notebook, parent->m_children.Number()-1 );
-  
-    gtk_page_change_callback( (GtkNotebook *) NULL, child->m_page, 0, parent );
+    GtkNotebook * const notebook = GTKGetNotebook();
+    wxCHECK_RET( notebook, "no parent notebook?" );
+    gtk_notebook_set_tab_label_text(notebook, m_widget, wxGTK_CONV( title ) );

 }
 
 //-----------------------------------------------------------------------------
 // wxMDIClientWindow
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // wxMDIClientWindow
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow,wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)

 
 

-wxMDIClientWindow::wxMDIClientWindow(void)
+wxMDIClientWindow::~wxMDIClientWindow()

 {
 {

+    // disconnect our handler because our ~wxWindow (which is going to be called
+    // after this dtor) will call DestroyChildren(); in turns our children
+    // ~wxWindow dtors will call wxWindow::Show(false) and this will generate
+    // a call to gtk_mdi_page_change_callback with an invalid parent
+    // (because gtk_mdi_page_change_callback expects a wxMDIClientWindow but
+    //  at that point of the dtor chain we are a simple wxWindow!)
+    g_signal_handlers_disconnect_by_func(m_widget,
+                                         (gpointer)gtk_mdi_page_change_callback,
+                                         GetParent());

 }
 
 }
 

-wxMDIClientWindow::wxMDIClientWindow( wxMDIParentFrame *parent, long style )
+bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)

 {
 {

-    CreateClient( parent, style );
-}
-
-wxMDIClientWindow::~wxMDIClientWindow(void)
-{
-}
-
-bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
-{
-    m_needParent = TRUE;
-  
-    m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI;
-
-    PreCreation( parent, -1, wxPoint(10,10), wxSize(100,100), style, "wxMDIClientWindow" );
+    if ( !PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
+         !CreateBase( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize,
+                       style, wxDefaultValidator, "wxMDIClientWindow" ))
+    {
+        wxFAIL_MSG( "wxMDIClientWindow creation failed" );
+        return false;
+    }

 
     m_widget = gtk_notebook_new();
 
     m_widget = gtk_notebook_new();

+    g_object_ref(m_widget);

 
 

-    gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
-                        GTK_SIGNAL_FUNC(gtk_page_change_callback), (gpointer)this );
+    g_signal_connect (m_widget, "switch_page",
+                      G_CALLBACK (gtk_mdi_page_change_callback), parent);

 
     gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
 
 
     gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 );
 

-    m_parent->AddChild( this );
+    m_parent->DoAddChild( this );

 
 

-    (m_parent->m_insertCallback)( m_parent, this );
-  

     PostCreation();
 
     PostCreation();
 

-    Show( TRUE );
+    Show( true );

 
 

-    return TRUE;
+    return true;

 }
 
 }
 

+void wxMDIClientWindow::AddChildGTK(wxWindowGTK* child)
+{
+    wxMDIChildFrame* child_frame = static_cast<wxMDIChildFrame*>(child);
+    wxString s = child_frame->GetTitle();
+    if ( s.empty() )
+        s = _("MDI child");
+
+    GtkWidget *label_widget = gtk_label_new( s.mbc_str() );
+    gtk_misc_set_alignment( GTK_MISC(label_widget), 0.0, 0.5 );
+
+    GtkNotebook* notebook = GTK_NOTEBOOK(m_widget);

 
 

+    gtk_notebook_append_page( notebook, child->m_widget, label_widget );
+
+    child_frame->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
+
+    wxMDIParentFrame* parent_frame = static_cast<wxMDIParentFrame*>(GetParent());
+    parent_frame->m_justInserted = true;
+}

 
 

+#endif // wxUSE_MDI