Added Mac OS X resource file handling:

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

diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp
index e0b6d4aecaf70bc824a5a0d292d0e3325f4d8b8f..cb80b42cedc97daa0840f0f2f08e0631a77998bb 100644 (file)
--- a/src/gtk1/mdi.cpp
+++ b/src/gtk1/mdi.cpp
@@ -12,20 +12,30 @@
 #endif
 
 #include "wx/mdi.h"
 #endif
 
 #include "wx/mdi.h"

+
+#if wxUSE_MDI_ARCHITECTURE
+

 #include "wx/dialog.h"
 #include "wx/menu.h"
 #include "wx/dialog.h"
 #include "wx/menu.h"

-#include <wx/intl.h>
+#include "wx/intl.h"

 
 

-#include "glib.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <glib.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 
 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 

-const int wxMENU_HEIGHT    = 27;
+const int wxMENU_HEIGHT = 27;
+
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;

 
 //-----------------------------------------------------------------------------
 // globals
 
 //-----------------------------------------------------------------------------
 // globals


@@ -34,45 +44,54 @@ const int wxMENU_HEIGHT    = 27;
 extern wxList wxPendingDelete;
 
 //-----------------------------------------------------------------------------
 extern wxList wxPendingDelete;
 
 //-----------------------------------------------------------------------------

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

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

-static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
+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))
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    // send deactivate event to old child
+
+    wxMDIChildFrame *child = parent->GetActiveChild();
+    if (child)

     {
     {

-        return;
+        wxActivateEvent event1( wxEVT_ACTIVATE, FALSE, child->GetId() );
+        event1.SetEventObject( child);
+        child->GetEventHandler()->ProcessEvent( event1 );

     }
 
     }
 

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

 
 

-//-----------------------------------------------------------------------------
-// "switch_page"
-//-----------------------------------------------------------------------------
+    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();
+    child = (wxMDIChildFrame*) NULL;
+
+    wxNode *node = client_window->GetChildren().First();

     while (node)
     {
         wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
         if (child_frame->m_page == page)
         {
     while (node)
     {
         wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
         if (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->Next();
     }

+
+    if (!child)
+         return;
+
+    wxActivateEvent event2( wxEVT_ACTIVATE, TRUE, child->GetId() );
+    event2.SetEventObject( child);
+    child->GetEventHandler()->ProcessEvent( event2 );

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


@@ -81,35 +100,23 @@ 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_justInserted = FALSE;

     m_clientWindow = (wxMDIClientWindow *) NULL;
     m_clientWindow = (wxMDIClientWindow *) NULL;

-    m_currentChild = (wxMDIChildFrame *) NULL;
-    m_parentFrameActive = TRUE;

 }
 
 }
 

-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 )
+bool wxMDIParentFrame::Create(wxWindow *parent,
+                              wxWindowID id,
+                              const wxString& title,
+                              const wxPoint& pos,
+                              const wxSize& size,
+                              long style,
+                              const wxString& name )

 {
     wxFrame::Create( parent, id, title, pos, size, style, name );
 
 {
     wxFrame::Create( parent, id, title, pos, size, style, name );
 


@@ -122,81 +129,159 @@ void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
 {
     wxFrame::GtkOnSize( x, y, width, height );
 
 {
     wxFrame::GtkOnSize( x, y, width, height );
 

-    if (m_mdiMenuBar)
-    {
-        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 = GetActiveChild();
+    if (!child_frame) return;
+
+    wxMenuBar *menu_bar = child_frame->m_menuBar;
+    if (!menu_bar) return;
+    if (!menu_bar->m_widget) return;
+
+    menu_bar->m_x = 0;
+    menu_bar->m_y = 0;
+    menu_bar->m_width = m_width;
+    menu_bar->m_height = wxMENU_HEIGHT;
+    gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
+                          menu_bar->m_widget,
+                          0, 0, m_width, wxMENU_HEIGHT );

 }
 
 }
 

-void wxMDIParentFrame::SetMDIMenuBar( wxMenuBar *menu_bar )
+void wxMDIParentFrame::OnInternalIdle()

 {
 {

-    /* hide old child menu bar */
-    if (m_mdiMenuBar) m_mdiMenuBar->Show( FALSE );
+    /* 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 */

 
 

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

 
 

-    /* show and resize new menu child menu bar */
-    if (m_mdiMenuBar)
+        m_justInserted = FALSE;
+        return;
+    }
+
+    wxFrame::OnInternalIdle();
+
+    wxMDIChildFrame *active_child_frame = GetActiveChild();
+    bool visible_child_menu = FALSE;
+
+    wxNode *node = m_clientWindow->GetChildren().First();
+    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 );
-        m_mdiMenuBar->Show( TRUE );
+        wxObject *child = node->Data();
+        wxMDIChildFrame *child_frame = wxDynamicCast(child, 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->m_width = m_width;
+                        menu_bar->m_height = wxMENU_HEIGHT;
+                        gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
+                                            menu_bar->m_widget,
+                                            0, 0, m_width, wxMENU_HEIGHT );
+                        menu_bar->SetInvokingWindow( child_frame );
+                    }
+                    visible_child_menu = TRUE;
+                }
+                else
+                {
+                    if (menu_bar->Show(FALSE))
+                    {
+                        menu_bar->UnsetInvokingWindow( child_frame );
+                    }
+                }
+            }
+        }
+
+        node = node->Next();

     }
 
     /* show/hide parent menu bar as required */
     }
 
     /* show/hide parent menu bar as required */

-    if (m_frameMenuBar) m_frameMenuBar->Show( (m_mdiMenuBar == NULL) );
+    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 );
+
+            m_frameMenuBar->m_width = m_width;
+            m_frameMenuBar->m_height = wxMENU_HEIGHT;
+            gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
+                                m_frameMenuBar->m_widget,
+                                0, 0, m_width, wxMENU_HEIGHT );
+        }
+    }

 }
 
 }
 

-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
+wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const

 {
 {

-    return m_currentChild;
+    if (!m_clientWindow) return (wxMDIChildFrame*) NULL;
+
+    GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
+    if (!notebook) return (wxMDIChildFrame*) NULL;
+
+#if (GTK_MINOR_VERSION > 0)
+    gint i = gtk_notebook_get_current_page( notebook );
+#else
+    gint i = gtk_notebook_current_page( notebook );
+#endif
+    if (i < 0) return (wxMDIChildFrame*) NULL;
+
+    GtkNotebookPage* page = (GtkNotebookPage*) (g_list_nth(notebook->children,i)->data);
+    if (!page) return (wxMDIChildFrame*) NULL;
+
+    wxNode *node = m_clientWindow->GetChildren().First();
+    while (node)
+    {
+        wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
+        if (child_frame->m_page == page)
+            return child_frame;
+        node = node->Next();
+    }
+
+    return (wxMDIChildFrame*) NULL;

 }
 
 }
 

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

 {
     return m_clientWindow;
 }
 
 {
     return m_clientWindow;
 }
 

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

 {
     m_clientWindow = new wxMDIClientWindow( this );
     return m_clientWindow;
 }
 
 {
     m_clientWindow = new wxMDIClientWindow( this );
     return m_clientWindow;
 }
 

-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
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------


@@ -205,12 +290,14 @@ 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)
+wxMDIChildFrame::wxMDIChildFrame()

 {
     m_menuBar = (wxMenuBar *) NULL;
     m_page = (GtkNotebookPage *) NULL;
 {
     m_menuBar = (wxMenuBar *) NULL;
     m_page = (GtkNotebookPage *) NULL;

+    m_isFrame = FALSE;

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


@@ -220,21 +307,14 @@ wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent,
 {
     m_menuBar = (wxMenuBar *) NULL;
     m_page = (GtkNotebookPage *) NULL;
 {
     m_menuBar = (wxMenuBar *) NULL;
     m_page = (GtkNotebookPage *) NULL;

+    m_isFrame = FALSE;

     Create( parent, id, title, wxDefaultPosition, size, style, name );
 }
 
     Create( parent, id, title, wxDefaultPosition, size, style, name );
 }
 

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

 {
     if (m_menuBar)
 {
     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;
         delete m_menuBar;

-    }

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


@@ -247,54 +327,32 @@ bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
     return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name );
 }
 
     return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name );
 }
 

-void wxMDIChildFrame::GetClientSize( int *width, int *height ) const
-{
-    wxWindow::GetClientSize( width, height );
-}
-
-void wxMDIChildFrame::AddChild( wxWindow *child )
+void wxMDIChildFrame::DoGetClientSize( int *width, int *height ) const

 {
 {

-    wxWindow::AddChild( child );
+    wxWindow::DoGetClientSize( width, height );

 }
 
 }
 

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

 {
 {

-    menu->SetInvokingWindow( win );
-    wxNode *node = menu->GetItems().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 )
 {

+    wxASSERT_MSG( m_menuBar == NULL, wxT("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;
+        wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->GetParent();

 
 

-       if (m_menuBar->m_parent != this)
-       {
-            wxNode *node = m_menuBar->GetMenus().First();
-            while (node)
-            {
-                wxMenu *menu = (wxMenu*)node->Data();
-                SetInvokingWindow( menu, this );
-                node = node->Next();
-            }
+        m_menuBar->SetParent( mdi_frame );

 
 

-            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 );
+        /* insert the invisible menu bar into the _parent_ mdi frame */
+        gtk_pizza_put( GTK_PIZZA(mdi_frame->m_mainWidget),
+                         m_menuBar->m_widget,
+                         0, 0,  mdi_frame->m_width, wxMENU_HEIGHT );

     }
 }
 
     }
 }
 


@@ -303,12 +361,68 @@ wxMenuBar *wxMDIChildFrame::GetMenuBar() const
     return m_menuBar;
 }
 
     return m_menuBar;
 }
 

-void wxMDIChildFrame::Activate(void)
+void wxMDIChildFrame::Activate()
+{
+#if (GTK_MINOR_VERSION > 0)
+    wxMDIParentFrame* parent = (wxMDIParentFrame*) GetParent();
+    GtkNotebook* notebook = GTK_NOTEBOOK(parent->m_widget);
+    gint pageno = gtk_notebook_page_num( notebook, m_page->child );
+    gtk_notebook_set_page( notebook, pageno );
+#else
+    // the only way I can see to do this under gtk+ 1.0.X would
+    // be to keep track of page numbers, start at first and
+    // do "next" enough times to get to this page number - messy
+    // - J. Russell Smyth
+#endif
+}
+
+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(mdi_frame->GetStatusBar(), 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_page->child, title.mbc_str());
+}
+
+//-----------------------------------------------------------------------------
+// "size_allocate"
+//-----------------------------------------------------------------------------
+
+static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
+{
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    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 );

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


@@ -320,7 +434,7 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil
     wxString s = child->m_title;
     if (s.IsNull()) s = _("MDI child");
 
     wxString s = child->m_title;
     if (s.IsNull()) s = _("MDI child");
 

-    GtkWidget *label_widget = gtk_label_new( s );
+    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_misc_set_alignment( GTK_MISC(label_widget), 0.0, 0.5 );
 
     gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate",


@@ -332,9 +446,8 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil
 
     child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
 
 
     child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
 

-    gtk_notebook_set_page( notebook, parent->m_children.Number()-1 );
-
-    gtk_page_change_callback( (GtkNotebook *) NULL, child->m_page, 0, parent );
+    wxMDIParentFrame *parent_frame = (wxMDIParentFrame*) parent->GetParent();
+    parent_frame->m_justInserted = TRUE;

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


@@ -343,7 +456,7 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil
 
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow,wxWindow)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow,wxWindow)
 

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

 {
 }
 
 {
 }
 


@@ -352,7 +465,7 @@ wxMDIClientWindow::wxMDIClientWindow( wxMDIParentFrame *parent, long style )
     CreateClient( parent, style );
 }
 
     CreateClient( parent, style );
 }
 

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

 {
 }
 
 {
 }
 


@@ -362,18 +475,21 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 
     m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI;
 
 
     m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI;
 

-    PreCreation( parent, -1, wxPoint(10,10), wxSize(100,100), style, "wxMDIClientWindow" );
+    if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
+        !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("wxMDIClientWindow") ))
+    {
+        wxFAIL_MSG( wxT("wxMDIClientWindow creation failed") );
+        return FALSE;
+    }

 
     m_widget = gtk_notebook_new();
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
 
     m_widget = gtk_notebook_new();
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",

-                        GTK_SIGNAL_FUNC(gtk_page_change_callback), (gpointer)this );
+      GTK_SIGNAL_FUNC(gtk_mdi_page_change_callback), (gpointer)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->m_insertCallback)( m_parent, this );
+    m_parent->DoAddChild( this );

 
     PostCreation();
 
 
     PostCreation();
 


@@ -382,5 +498,4 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
     return TRUE;
 }
 
     return TRUE;
 }
 

-
-
+#endif