X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fab591c5cceff41c0bedaa89af34cd039e2c44e1..caa2490c0fb8053b1d416117a9619695d75af9e4:/src/gtk1/mdi.cpp?ds=sidebyside

diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp
index 999be74c6e..ddd65e82be 100644
--- a/src/gtk1/mdi.cpp
+++ b/src/gtk1/mdi.cpp
@@ -7,13 +7,17 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "mdi.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/mdi.h"
+#include "wx/notebook.h"
 
-#if wxUSE_MDI_ARCHITECTURE
+#if wxUSE_MDI
 
 #include "wx/dialog.h"
 #include "wx/menu.h"
@@ -48,6 +52,7 @@ extern wxList wxPendingDelete;
 // "switch_page"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void
 gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
                               GtkNotebookPage *page,
@@ -62,7 +67,7 @@ gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
     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 );
     }
@@ -75,25 +80,32 @@ gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
 
     child = (wxMDIChildFrame*) NULL;
 
-    wxNode *node = client_window->GetChildren().First();
+    wxWindowList::compatibility_iterator node = client_window->GetChildren().GetFirst();
     while (node)
     {
-        wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
+        wxMDIChildFrame *child_frame = wxDynamicCast( node->GetData(), wxMDIChildFrame );
+        // CE: we come here in the destructor with a null child_frame - I think because
+        // gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", (see below)
+        // isn't deleted early enough
+        if (!child_frame)
+          return ;
+
         if (child_frame->m_page == page)
         {
             child = child_frame;
             break;
         }
-        node = node->Next();
+        node = node->GetNext();
     }
 
     if (!child)
          return;
 
-    wxActivateEvent event2( wxEVT_ACTIVATE, TRUE, child->GetId() );
+    wxActivateEvent event2( wxEVT_ACTIVATE, true, child->GetId() );
     event2.SetEventObject( child);
     child->GetEventHandler()->ProcessEvent( event2 );
 }
+}
 
 //-----------------------------------------------------------------------------
 // wxMDIParentFrame
@@ -103,7 +115,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame,wxFrame)
 
 void wxMDIParentFrame::Init()
 {
-    m_justInserted = FALSE;
+    m_justInserted = false;
     m_clientWindow = (wxMDIClientWindow *) NULL;
 }
 
@@ -123,7 +135,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
 
     OnCreateClient();
 
-    return TRUE;
+    return true;
 }
 
 void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
@@ -158,20 +170,35 @@ void wxMDIParentFrame::OnInternalIdle()
         GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
         gtk_notebook_set_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();
-    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)
     {
-        wxObject *child = node->Data();
-        wxMDIChildFrame *child_frame = wxDynamicCast(child, wxMDIChildFrame);
+        wxMDIChildFrame *child_frame = wxDynamicCast( node->GetData(), wxMDIChildFrame );
+
         if ( child_frame )
         {
             wxMenuBar *menu_bar = child_frame->m_menuBar;
@@ -179,7 +206,7 @@ void wxMDIParentFrame::OnInternalIdle()
             {
                 if (child_frame == active_child_frame)
                 {
-                    if (menu_bar->Show(TRUE))
+                    if (menu_bar->Show(true))
                     {
                         menu_bar->m_width = m_width;
                         menu_bar->m_height = wxMENU_HEIGHT;
@@ -188,11 +215,11 @@ void wxMDIParentFrame::OnInternalIdle()
                                             0, 0, m_width, wxMENU_HEIGHT );
                         menu_bar->SetInvokingWindow( child_frame );
                     }
-                    visible_child_menu = TRUE;
+                    visible_child_menu = true;
                 }
                 else
                 {
-                    if (menu_bar->Show(FALSE))
+                    if (menu_bar->Show(false))
                     {
                         menu_bar->UnsetInvokingWindow( child_frame );
                     }
@@ -200,7 +227,7 @@ void wxMDIParentFrame::OnInternalIdle()
             }
         }
 
-        node = node->Next();
+        node = node->GetNext();
     }
 
     /* show/hide parent menu bar as required */
@@ -209,12 +236,12 @@ void wxMDIParentFrame::OnInternalIdle()
     {
         if (visible_child_menu)
         {
-            m_frameMenuBar->Show( FALSE );
+            m_frameMenuBar->Show( false );
             m_frameMenuBar->UnsetInvokingWindow( this );
         }
         else
         {
-            m_frameMenuBar->Show( TRUE );
+            m_frameMenuBar->Show( true );
             m_frameMenuBar->SetInvokingWindow( this );
 
             m_frameMenuBar->m_width = m_width;
@@ -244,13 +271,16 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
     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)
     {
-        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;
-        node = node->Next();
+        node = node->GetNext();
     }
 
     return (wxMDIChildFrame*) NULL;
@@ -310,7 +340,7 @@ wxMDIChildFrame::~wxMDIChildFrame()
 {
     if (m_menuBar)
         delete m_menuBar;
-}
+} 
 
 bool wxMDIChildFrame::Create( wxMDIParentFrame *parent,
       wxWindowID id, const wxString& title,
@@ -407,6 +437,7 @@ void wxMDIChildFrame::SetTitle( const wxString &title )
 // "size_allocate"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();
@@ -422,6 +453,7 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
 
     win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
 }
+}
 
 //-----------------------------------------------------------------------------
 // InsertChild callback for wxMDIClientWindow
@@ -445,7 +477,7 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil
     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;
 }
 
 //-----------------------------------------------------------------------------
@@ -465,11 +497,12 @@ wxMDIClientWindow::wxMDIClientWindow( wxMDIParentFrame *parent, long style )
 
 wxMDIClientWindow::~wxMDIClientWindow()
 {
+
 }
 
 bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 {
-    m_needParent = TRUE;
+    m_needParent = true;
 
     m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI;
 
@@ -477,7 +510,7 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
         !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("wxMDIClientWindow") ))
     {
         wxFAIL_MSG( wxT("wxMDIClientWindow creation failed") );
-        return FALSE;
+        return false;
     }
 
     m_widget = gtk_notebook_new();
@@ -491,9 +524,9 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 
     PostCreation();
 
-    Show( TRUE );
+    Show( true );
 
-    return TRUE;
+    return true;
 }
 
 #endif