X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a2053b27b318fe81918a72c838944d1e8cd1524f..6a570331df89d26dfb682bedab0faf13e2c285d8:/src/gtk/mdi.cpp

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index a6e4317bcf..13c558712a 100644
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -12,6 +12,9 @@
 #endif
 
 #include "wx/mdi.h"
+
+#if wxUSE_MDI_ARCHITECTURE
+
 #include "wx/dialog.h"
 #include "wx/menu.h"
 #include <wx/intl.h>
@@ -92,8 +95,10 @@ void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
     if (!menu_bar) return;
     if (!menu_bar->m_widget) return;
 
-    menu_bar->InternalSetPosition(0, 0);
-    menu_bar->InternalSetSize(m_width, wxMENU_HEIGHT);
+    menu_bar->m_x = 0;
+    menu_bar->m_y = 0;
+    menu_bar->m_width = m_width;
+    menu_bar->m_height = wxMENU_HEIGHT;
     gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), 
                           menu_bar->m_widget, 
                           0, 0, m_width, wxMENU_HEIGHT );
@@ -124,21 +129,54 @@ void wxMDIParentFrame::OnInternalIdle()
     while (node)
     {
         wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
+	wxMenuBar *menu_bar = child_frame->m_menuBar;
         if (child_frame->m_menuBar)
         {
             if (child_frame == active_child_frame)
             {
-               gtk_widget_show( child_frame->m_menuBar->m_widget );
-               visible_child_menu = TRUE;
+		if (menu_bar->Show(TRUE))
+		{
+		    menu_bar->m_width = m_width;
+		    menu_bar->m_height = wxMENU_HEIGHT;
+                    gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), 
+		                          menu_bar->m_widget, 
+			                  0, 0, m_width, wxMENU_HEIGHT );
+		    menu_bar->SetInvokingWindow( child_frame );
+		}
+                visible_child_menu = TRUE;
             }
             else
-               gtk_widget_hide( child_frame->m_menuBar->m_widget );
+	    {
+		if (menu_bar->Show(FALSE))
+		{
+		    menu_bar->UnsetInvokingWindow( child_frame );
+		}
+	    }
         }
         node = node->Next();
     }
 
     /* show/hide parent menu bar as required */
-    if (m_frameMenuBar) m_frameMenuBar->Show( !visible_child_menu );
+    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_myfixed_set_size( GTK_MYFIXED(m_mainWidget), 
+	                          m_frameMenuBar->m_widget, 
+			          0, 0, m_width, wxMENU_HEIGHT );
+	}
+    }
 }
 
 void wxMDIParentFrame::GetClientSize(int *width, int *height ) const
@@ -258,42 +296,17 @@ void wxMDIChildFrame::AddChild( wxWindow *child )
     wxWindow::AddChild( child );
 }
 
-static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
-{
-    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();
-    }
-}
-
 void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
 {
+    wxASSERT_MSG( m_menuBar == NULL, _T("Only one menubar allowed") );
+
     m_menuBar = menu_bar;
 
     if (m_menuBar)
     {
         wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->GetParent();
 
-       if (m_menuBar->GetParent() != 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 );
-        }
-
-        /* the menu bar of the child window is shown in idle time as needed */
-        gtk_widget_hide( m_menuBar->m_widget );
+        m_menuBar->SetParent( mdi_frame );
 
         /* insert the invisible menu bar into the _parent_ mdi frame */
         gtk_myfixed_put( GTK_MYFIXED(mdi_frame->m_mainWidget), 
@@ -309,6 +322,17 @@ wxMenuBar *wxMDIChildFrame::GetMenuBar() const
 
 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) )
@@ -400,3 +424,4 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
     return TRUE;
 }
 
+#endif