Add wxRichTextModuleInit

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

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index 8c29530da57164887c71fb0caf8c3b47a0f79815..031eae9e191359f4cb62081105d1b509fd987525 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,17 +7,21 @@
 // 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"
 

-#if wxUSE_MDI_ARCHITECTURE
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/menu.h"
+    #include "wx/dialog.h"
+#endif

 
 

-#include "wx/dialog.h"
-#include "wx/menu.h"
-#include "wx/intl.h"
+#include "wx/notebook.h"
+#include "wx/gtk/private.h"

 
 #include <glib.h>
 #include <gdk/gdk.h>
 
 #include <glib.h>
 #include <gdk/gdk.h>


@@ -30,30 +34,22 @@
 
 const int wxMENU_HEIGHT = 27;
 
 
 const int wxMENU_HEIGHT = 27;
 

-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-

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

-extern wxList wxPendingDelete;
-

 //-----------------------------------------------------------------------------
 // "switch_page"
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // "switch_page"
 //-----------------------------------------------------------------------------
 

-static void 
-gtk_mdi_page_change_callback( GtkNotebook *widget,
+extern "C" {
+static void
+gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),

                               GtkNotebookPage *page,
                               GtkNotebookPage *page,

-                             gint WXUNUSED(page_num),
-                             wxMDIParentFrame *parent )
+                              gint WXUNUSED(page_num),
+                              wxMDIParentFrame *parent )

 {
 {

-    if (g_isIdle) 
+    if (g_isIdle)

         wxapp_install_idle_handler();
 
     // send deactivate event to old child
         wxapp_install_idle_handler();
 
     // send deactivate event to old child


@@ -61,38 +57,43 @@ gtk_mdi_page_change_callback( GtkNotebook *widget,
     wxMDIChildFrame *child = parent->GetActiveChild();
     if (child)
     {
     wxMDIChildFrame *child = parent->GetActiveChild();
     if (child)
     {

-        wxActivateEvent event1( wxEVT_ACTIVATE, FALSE, child->GetId() );
+        wxActivateEvent event1( wxEVT_ACTIVATE, false, child->GetId() );

         event1.SetEventObject( child);
         child->GetEventHandler()->ProcessEvent( event1 );
     }
         event1.SetEventObject( child);
         child->GetEventHandler()->ProcessEvent( event1 );
     }

-    
+

     // send activate event to new child
     // send activate event to new child

-    
+

     wxMDIClientWindow *client_window = parent->GetClientWindow();
     if (!client_window)
         return;
 
     child = (wxMDIChildFrame*) NULL;
 
     wxMDIClientWindow *client_window = parent->GetClientWindow();
     if (!client_window)
         return;
 
     child = (wxMDIChildFrame*) NULL;
 

-    wxNode *node = client_window->GetChildren().First();
-    while (node)
+    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 )
+        {

             child = child_frame;
             child = child_frame;

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

     }
     }

-    
+

     if (!child)
          return;
     if (!child)
          return;

-    
-    wxActivateEvent event2( wxEVT_ACTIVATE, TRUE, child->GetId() );
+
+    wxActivateEvent event2( wxEVT_ACTIVATE, true, child->GetId() );

     event2.SetEventObject( child);
     child->GetEventHandler()->ProcessEvent( event2 );
 }
     event2.SetEventObject( child);
     child->GetEventHandler()->ProcessEvent( event2 );
 }

+}

 
 //-----------------------------------------------------------------------------
 // wxMDIParentFrame
 
 //-----------------------------------------------------------------------------
 // wxMDIParentFrame


@@ -100,44 +101,34 @@ gtk_mdi_page_change_callback( GtkNotebook *widget,
 
 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame,wxFrame)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame,wxFrame)
 

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

 {
 {

-    m_justInserted = FALSE;
+    m_justInserted = false;

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

-wxMDIParentFrame::wxMDIParentFrame( wxWindow *parent,
-      wxWindowID id, const wxString& title,
-      const wxPoint& pos, const wxSize& size,
-      long style, const wxString& name )
-{
-    m_justInserted = FALSE;
-    m_clientWindow = (wxMDIClientWindow *) NULL;
-    Create( parent, id, title, pos, size, style, name );
-}
-

 wxMDIParentFrame::~wxMDIParentFrame()
 {
 }
 
 wxMDIParentFrame::~wxMDIParentFrame()
 {
 }
 

-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 );
 
     OnCreateClient();
 
 {
     wxFrame::Create( parent, id, title, pos, size, style, name );
 
     OnCreateClient();
 

-    return TRUE;
+    return true;

 }
 
 }
 

-void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
+void wxMDIParentFrame::GtkOnSize()

 {
 {

-    wxFrame::GtkOnSize( x, y, width, height );
+    wxFrame::GtkOnSize();

 
     wxMDIChildFrame *child_frame = GetActiveChild();
     if (!child_frame) return;
 
     wxMDIChildFrame *child_frame = GetActiveChild();
     if (!child_frame) return;


@@ -150,8 +141,8 @@ void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
     menu_bar->m_y = 0;
     menu_bar->m_width = m_width;
     menu_bar->m_height = wxMENU_HEIGHT;
     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, 
+    gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
+                          menu_bar->m_widget,

                           0, 0, m_width, wxMENU_HEIGHT );
 }
 
                           0, 0, m_width, wxMENU_HEIGHT );
 }
 


@@ -165,46 +156,66 @@ void wxMDIParentFrame::OnInternalIdle()
     if (m_justInserted)
     {
         GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
     if (m_justInserted)
     {
         GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);

-        gtk_notebook_set_page( notebook, g_list_length( notebook->children ) - 1 );
+        gtk_notebook_set_current_page( notebook, g_list_length( notebook->children ) - 1 );

 
 

-        m_justInserted = FALSE;
+        /* 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->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(active_child_frame);
+            }
+        }
+        m_justInserted = false;

         return;
     }
 
     wxFrame::OnInternalIdle();
 
     wxMDIChildFrame *active_child_frame = GetActiveChild();
         return;
     }
 
     wxFrame::OnInternalIdle();
 
     wxMDIChildFrame *active_child_frame = GetActiveChild();

-    bool visible_child_menu = FALSE;
+    bool visible_child_menu = false;

 
 

-    wxNode *node = m_clientWindow->GetChildren().First();
+    wxWindowList::compatibility_iterator node = m_clientWindow->GetChildren().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
-       wxMenuBar *menu_bar = child_frame->m_menuBar;
-        if (child_frame->m_menuBar)
+        wxMDIChildFrame *child_frame = wxDynamicCast( node->GetData(), wxMDIChildFrame );
+
+        if ( child_frame )

         {
         {

-            if (child_frame == active_child_frame)
+            wxMenuBar *menu_bar = child_frame->m_menuBar;
+            if ( menu_bar )

             {
             {

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

             }
             }

-            else
-           {
-               if (menu_bar->Show(FALSE))
-               {
-                   menu_bar->UnsetInvokingWindow( child_frame );
-               }
-           }

         }
         }

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

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


@@ -212,29 +223,24 @@ void wxMDIParentFrame::OnInternalIdle()
         (m_frameMenuBar->IsShown() == visible_child_menu))
     {
         if (visible_child_menu)
         (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 );
-       }
+        {
+            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
-{
-    wxFrame::GetClientSize( width, height );
-}
-

 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
 {
     if (!m_clientWindow) return (wxMDIChildFrame*) NULL;
 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
 {
     if (!m_clientWindow) return (wxMDIChildFrame*) NULL;


@@ -242,23 +248,22 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
     GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
     if (!notebook) 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 );
     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;
 
     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();
+    wxWindowList::compatibility_iterator node = m_clientWindow->GetChildren().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
+        wxMDIChildFrame *child_frame = wxDynamicCast( node->GetData(), wxMDIChildFrame );
+
+        wxASSERT_MSG( child_frame, _T("child is not a wxMDIChildFrame") );
+

         if (child_frame->m_page == page)
             return child_frame;
         if (child_frame->m_page == page)
             return child_frame;

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

     }
 
     return (wxMDIChildFrame*) NULL;
     }
 
     return (wxMDIChildFrame*) NULL;


@@ -287,14 +292,6 @@ void wxMDIParentFrame::ActivatePrevious()
       gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );
 }
 
       gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );
 }
 

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

 //-----------------------------------------------------------------------------
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------


@@ -303,6 +300,7 @@ 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()
 
 wxMDIChildFrame::wxMDIChildFrame()
 END_EVENT_TABLE()
 
 wxMDIChildFrame::wxMDIChildFrame()


@@ -337,9 +335,19 @@ 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
+void wxMDIChildFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
+{
+    wxWindow::DoSetSize( x, y, width, height, sizeFlags );
+}
+
+void wxMDIChildFrame::DoSetClientSize(int width, int height)
+{
+    wxWindow::DoSetClientSize( width, height );
+}
+
+void wxMDIChildFrame::DoGetClientSize( int *width, int *height ) const

 {
 {

-    wxWindow::GetClientSize( width, height );
+    wxWindow::DoGetClientSize( width, height );

 }
 
 void wxMDIChildFrame::AddChild( wxWindowBase *child )
 }
 
 void wxMDIChildFrame::AddChild( wxWindowBase *child )


@@ -360,8 +368,8 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
         m_menuBar->SetParent( mdi_frame );
 
         /* insert the invisible menu bar into the _parent_ mdi frame */
         m_menuBar->SetParent( mdi_frame );
 
         /* insert the invisible menu bar into the _parent_ mdi frame */

-        gtk_pizza_put( GTK_PIZZA(mdi_frame->m_mainWidget), 
-                         m_menuBar->m_widget, 
+        gtk_pizza_put( GTK_PIZZA(mdi_frame->m_mainWidget),
+                         m_menuBar->m_widget,

                          0, 0,  mdi_frame->m_width, wxMENU_HEIGHT );
     }
 }
                          0, 0,  mdi_frame->m_width, wxMENU_HEIGHT );
     }
 }


@@ -373,27 +381,46 @@ wxMenuBar *wxMDIChildFrame::GetMenuBar() const
 
 void wxMDIChildFrame::Activate()
 {
 
 void wxMDIChildFrame::Activate()
 {

-#if (GTK_MINOR_VERSION > 0)

     wxMDIParentFrame* parent = (wxMDIParentFrame*) GetParent();
     GtkNotebook* notebook = GTK_NOTEBOOK(parent->m_widget);
     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
+    gint pageno = gtk_notebook_page_num( notebook, m_widget );
+    gtk_notebook_set_current_page( notebook, pageno );
+}
+
+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::OnActivate( wxActivateEvent &WXUNUSED(event) )
+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 ) );

 }
 
 //-----------------------------------------------------------------------------
 // "size_allocate"
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // "size_allocate"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();


@@ -409,6 +436,7 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
 
     win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
 }
 
     win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
 }

+}

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


@@ -416,14 +444,14 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
 
 static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* child )
 {
 
 static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* child )
 {

-    wxString s = child->m_title;
+    wxString s = child->GetTitle();

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

 
     GtkNotebook *notebook = GTK_NOTEBOOK(parent->m_widget);
 
 
     GtkNotebook *notebook = GTK_NOTEBOOK(parent->m_widget);
 


@@ -432,7 +460,7 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil
     child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
 
     wxMDIParentFrame *parent_frame = (wxMDIParentFrame*) parent->GetParent();
     child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
 
     wxMDIParentFrame *parent_frame = (wxMDIParentFrame*) parent->GetParent();

-    parent_frame->m_justInserted = TRUE;
+    parent_frame->m_justInserted = true;

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


@@ -452,25 +480,26 @@ wxMDIClientWindow::wxMDIClientWindow( wxMDIParentFrame *parent, long style )
 
 wxMDIClientWindow::~wxMDIClientWindow()
 {
 
 wxMDIClientWindow::~wxMDIClientWindow()
 {

+

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

-    m_needParent = TRUE;
+    m_needParent = true;

 
     m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI;
 
     if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
 
     m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI;
 
     if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||

-        !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("wxMDIClientWindow") ))
+        !CreateBase( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("wxMDIClientWindow") ))

     {
         wxFAIL_MSG( wxT("wxMDIClientWindow creation failed") );
     {
         wxFAIL_MSG( wxT("wxMDIClientWindow creation failed") );

-       return FALSE;
+        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_mdi_page_change_callback), (gpointer)parent );
+    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 );
 


@@ -478,9 +507,9 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 
     PostCreation();
 
 
     PostCreation();
 

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

 
 

-    return TRUE;
+    return true;

 }
 
 #endif
 }
 
 #endif