pure CF code

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

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index 3d8f9cd8e45fd97e402f7ac01ddd31afd8dd6e2f..4a7ddf7c9fe868e798ea233a039ed6e43f5356af 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,68 +7,72 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "mdi.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_MDI

 
 #include "wx/mdi.h"
 
 #include "wx/mdi.h"

-#include "wx/dialog.h"
-#include "wx/menu.h"
-#include "wx/gtk/win_gtk.h"
-#include <wx/intl.h>

 
 

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

 
 

-const int wxMENU_HEIGHT    = 30;
+#include "wx/gtk/private.h"

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

-// globals
+// "switch_page"

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

-extern wxList wxPendingDelete;
+extern "C" {
+static void
+gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
+                              GtkNotebookPage *page,
+                              gint WXUNUSED(page_num),
+                              wxMDIParentFrame *parent )
+{
+    // send deactivate event to old child

 
 

-//-----------------------------------------------------------------------------
-// "size_allocate"
-//-----------------------------------------------------------------------------
+    wxMDIChildFrame *child = parent->GetActiveChild();
+    if (child)
+    {
+        wxActivateEvent event1( wxEVT_ACTIVATE, false, child->GetId() );
+        event1.SetEventObject( child);
+        child->HandleWindowEvent( event1 );
+    }

 
 

-static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
-{
-  if ((win->m_x == alloc->x) &&
-      (win->m_y == alloc->y) &&
-      (win->m_width == alloc->width) &&
-      (win->m_height == alloc->height) &&
-      (win->m_sizeSet))
-  {
-    return;
-  }
-
-  win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
-}
+    // send activate event to new child

 
 

-//-----------------------------------------------------------------------------
-// page change callback
-//-----------------------------------------------------------------------------
+    wxMDIClientWindow *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)
-  {
-    wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
-    if (child_frame->m_page == page)
+    child = (wxMDIChildFrame*) NULL;
+
+    wxWindowList::compatibility_iterator node = client_window->GetChildren().GetFirst();
+    while ( node )

     {
     {

-      wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)client_win->m_parent;
-      mdi_frame->m_currentChild = child_frame;
-      mdi_frame->SetMDIMenuBar( child_frame->m_menuBar );
-      return;
+        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 )
+        {
+            child = child_frame;
+            break;
+        }
+        node = node->GetNext();

     }
     }

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

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


@@ -77,113 +81,185 @@ 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;
+    m_clientWindow = (wxMDIClientWindow *) NULL;

 }
 
 }
 

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

 {
 {

-  m_clientWindow = (wxMDIClientWindow *) NULL;
-  m_currentChild = (wxMDIChildFrame *) NULL;
-  m_parentFrameActive = TRUE;
-  Create( parent, id, title, pos, size, style, name );

 }
 
 }
 

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

 {
 {

+    if ( !wxFrame::Create( parent, id, title, pos, size, style, name ) )
+        return false;
+
+    m_clientWindow = OnCreateClient();
+
+    return m_clientWindow != NULL;

 }
 
 }
 

-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 an 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 );
+
+        /* 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;
+    }

 
 

-  return TRUE;
-}
+    wxFrame::OnInternalIdle();

 
 

-void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
-{
-  wxFrame::GtkOnSize( x, y, width, height );
-
-  if (m_mdiMenuBar)
-  {
-    m_mdiMenuBar->m_x = 1;  
-    m_mdiMenuBar->m_y = 1;
-    m_mdiMenuBar->m_width = m_width-2;
-    m_mdiMenuBar->m_height = wxMENU_HEIGHT-2;
-    gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_mdiMenuBar->m_widget, 1, 1 );
-    gtk_widget_set_usize( m_mdiMenuBar->m_widget, m_width-2, wxMENU_HEIGHT-2 );
-  }
-}
+    wxMDIChildFrame *active_child_frame = GetActiveChild();
+    bool visible_child_menu = false;

 
 

-void wxMDIParentFrame::SetMDIMenuBar( wxMenuBar *menu_bar )
-{
-  if (m_mdiMenuBar) m_mdiMenuBar->Show( FALSE );
-  m_mdiMenuBar = menu_bar;
-  if (m_mdiMenuBar)
-  {
-    m_mdiMenuBar->m_x = 1;  
-    m_mdiMenuBar->m_y = 1;
-    m_mdiMenuBar->m_width = m_width-2;
-    m_mdiMenuBar->m_height = wxMENU_HEIGHT-2;
-    gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_mdiMenuBar->m_widget, 1, 1 );
-    gtk_widget_set_usize( m_mdiMenuBar->m_widget, m_width-2, wxMENU_HEIGHT-2 );
-    m_mdiMenuBar->Show( TRUE );
-  }
-}
+    wxWindowList::compatibility_iterator node = m_clientWindow->GetChildren().GetFirst();
+    while (node)
+    {
+        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::GetClientSize(int *width, int *height ) const
-{
-  wxFrame::GetClientSize( width, height );
+    /* show/hide parent menu bar as required */
+    if ((m_frameMenuBar) &&
+        (m_frameMenuBar->IsShown() == visible_child_menu))
+    {
+        if (visible_child_menu)
+        {
+            m_frameMenuBar->Show( false );
+            m_frameMenuBar->UnsetInvokingWindow( this );
+        }
+        else
+        {
+            m_frameMenuBar->Show( true );
+            m_frameMenuBar->SetInvokingWindow( this );
+        }
+    }

 }
 
 }
 

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

 {
 {

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

 
 

-wxMDIClientWindow *wxMDIParentFrame::GetClientWindow(void) const
-{
-  return m_clientWindow;
+    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::OnCreateClient(void)
+wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const

 {
 {

-  m_clientWindow = new wxMDIClientWindow( this );
-  return m_clientWindow;
+    if (!m_clientWindow) return (wxMDIChildFrame*) NULL;
+
+    GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
+    if (!notebook) return (wxMDIChildFrame*) NULL;
+
+    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 );
+
+        if (!child_frame)
+            return (wxMDIChildFrame*) NULL;
+
+        if (child_frame->m_page == page)
+            return child_frame;
+
+        node = node->GetNext();
+    }
+
+    return (wxMDIChildFrame*) NULL;

 }
 
 }
 

-void wxMDIParentFrame::ActivateNext(void)
+wxMDIClientWindow *wxMDIParentFrame::GetClientWindow() const

 {
 {

-  if (m_clientWindow)
-    gtk_notebook_next_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );
+    return m_clientWindow;

 }
 
 }
 

-void wxMDIParentFrame::ActivatePrevious(void)
+wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()

 {
 {

-  if (m_clientWindow)
-    gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );
+    return new wxMDIClientWindow( this );

 }
 
 }
 

-void wxMDIParentFrame::OnActivate( wxActivateEvent& WXUNUSED(event) )
+void wxMDIParentFrame::ActivateNext()

 {
 {

+    if (m_clientWindow)
+      gtk_notebook_next_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );

 }
 
 }
 

-void wxMDIParentFrame::OnSysColourChanged( wxSysColourChangedEvent& WXUNUSED(event) )
+void wxMDIParentFrame::ActivatePrevious()

 {
 {

+    if (m_clientWindow)
+      gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );

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


@@ -191,15 +267,16 @@ void wxMDIParentFrame::OnSysColourChanged( wxSysColourChangedEvent& WXUNUSED(eve
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame,wxFrame)
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame,wxFrame)

-  
+

 BEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame)
 BEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame)

-  EVT_ACTIVATE(wxMDIChildFrame::OnActivate)
+    EVT_ACTIVATE(wxMDIChildFrame::OnActivate)
+    EVT_MENU_HIGHLIGHT_ALL(wxMDIChildFrame::OnMenuHighlight)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-wxMDIChildFrame::wxMDIChildFrame(void)
+wxMDIChildFrame::wxMDIChildFrame()

 {
 {

-  m_menuBar = (wxMenuBar *) NULL;
-  m_page = (GtkNotebookPage *) NULL;
+    m_menuBar = (wxMenuBar *) NULL;
+    m_page = (GtkNotebookPage *) NULL;

 }
 
 wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent,
 }
 
 wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent,


@@ -207,23 +284,19 @@ wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent,
       const wxPoint& WXUNUSED(pos), const wxSize& size,
       long style, const wxString& name )
 {
       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 );
+    m_menuBar = (wxMenuBar *) NULL;
+    m_page = (GtkNotebookPage *) NULL;
+    Create( parent, id, title, wxDefaultPosition, size, style, name );

 }
 
 }
 

-wxMDIChildFrame::~wxMDIChildFrame(void)
+wxMDIChildFrame::~wxMDIChildFrame()

 {
 {

-  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;
-  }
+    if (m_menuBar)
+        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);

 }
 
 bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
 }
 
 bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,


@@ -231,98 +304,125 @@ bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
       const wxPoint& WXUNUSED(pos), const wxSize& size,
       long style, const wxString& name )
 {
       const wxPoint& WXUNUSED(pos), const wxSize& size,
       long style, const wxString& name )
 {

-  m_title = title;
-  
-  return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name );
+    m_title = title;
+
+    return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name );

 }
 
 }
 

-void wxMDIChildFrame::GetClientSize( int *width, int *height ) const
+bool wxMDIChildFrame::Destroy()

 {
 {

-  wxWindow::GetClientSize( width, height );
+    // 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::AddChild( wxWindow *child )
+void wxMDIChildFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )

 {
 {

-  wxWindow::AddChild( child );
+    wxWindow::DoSetSize( x, y, width, height, sizeFlags );

 }
 }

-  
-static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
+
+void wxMDIChildFrame::AddChild( wxWindowBase *child )

 {
 {

-  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();
-  }
+    wxWindow::AddChild(child);

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

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

 
 

-  if (m_menuBar)
-  {
-    wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->m_parent;
+    m_menuBar = menu_bar;

 
 

-    if (m_menuBar->m_parent != this)
+    if (m_menuBar)

     {
     {

-      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;
+        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);

     }
     }

-    mdi_frame->SetMDIMenuBar( m_menuBar );
+}

 
 

-    gtk_myfixed_put( GTK_MYFIXED(mdi_frame->m_wxwindow),
-      m_menuBar->m_widget, m_menuBar->m_x, m_menuBar->m_y );
-  }
+wxMenuBar *wxMDIChildFrame::GetMenuBar() const
+{
+    return m_menuBar;

 }
 
 }
 

-wxMenuBar *wxMDIChildFrame::GetMenuBar()
+void wxMDIChildFrame::Activate()

 {
 {

-  return m_menuBar;
+    wxMDIParentFrame* parent = (wxMDIParentFrame*) GetParent();
+    GtkNotebook* notebook = GTK_NOTEBOOK(parent->m_widget);
+    gint pageno = gtk_notebook_page_num( notebook, m_widget );
+    gtk_notebook_set_current_page( notebook, pageno );

 }
 
 }
 

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

 {
 }
 
 {
 }
 

-void wxMDIChildFrame::OnActivate( wxActivateEvent &WXUNUSED(event) )
+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
+}
+
+void wxMDIChildFrame::SetTitle( const wxString &title )
+{
+    if ( title == m_title )
+        return;
+
+    m_title = title;
+
+    wxMDIParentFrame* parent = (wxMDIParentFrame*) GetParent();
+    GtkNotebook* notebook = GTK_NOTEBOOK(parent->m_widget);
+    gtk_notebook_set_tab_label_text(notebook, m_widget, wxGTK_CONV( title ) );

 }
 
 //-----------------------------------------------------------------------------
 // InsertChild callback for wxMDIClientWindow
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // InsertChild callback for wxMDIClientWindow
 //-----------------------------------------------------------------------------
 

-static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* child )
+static void wxInsertChildInMDI(wxWindow* parent, wxWindow* child)

 {
 {

-  wxString s = child->m_title;
-  if (s.IsNull()) s = _("MDI child");
+    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 );
-  gtk_misc_set_alignment( GTK_MISC(label_widget), 0.0, 0.5 );
+    GtkWidget *label_widget = gtk_label_new( s.mbc_str() );
+    gtk_misc_set_alignment( GTK_MISC(label_widget), 0.0, 0.5 );

 
 

-  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 );
+    GtkNotebook *notebook = GTK_NOTEBOOK(parent->m_widget);

 
 

-  child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
+    gtk_notebook_append_page( notebook, child->m_widget, label_widget );

 
 

-  gtk_notebook_set_page( notebook, parent->m_children.Number()-1 );
-  
-  gtk_page_change_callback( (GtkNotebook *) NULL, child->m_page, 0, parent );
+    child_frame->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
+
+    wxMDIParentFrame *parent_frame = wx_static_cast(wxMDIParentFrame*, parent->GetParent());
+    parent_frame->m_justInserted = true;

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


@@ -331,44 +431,45 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil
 
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow,wxWindow)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow,wxWindow)
 

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

 {
 }
 
 wxMDIClientWindow::wxMDIClientWindow( wxMDIParentFrame *parent, long style )
 {
 {
 }
 
 wxMDIClientWindow::wxMDIClientWindow( wxMDIParentFrame *parent, long style )
 {

-  CreateClient( parent, style );
+    CreateClient( parent, style );

 }
 
 }
 

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

 {
 {

+

 }
 
 bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 {
 }
 
 bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 {

-  m_needParent = TRUE;
-  
-  m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI;
+    m_insertCallback = 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, wxT("wxMDIClientWindow") ))
+    {
+        wxFAIL_MSG( wxT("wxMDIClientWindow creation failed") );
+        return false;
+    }

 
 

-  m_widget = gtk_notebook_new();
+    m_widget = gtk_notebook_new();

 
 

-  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;

 }
 
 }
 

-
-
+#endif // wxUSE_MDI