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

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index 5df3bbfd17..766d11f20a 100644
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -27,6 +27,13 @@
 
 const int wxMENU_HEIGHT = 27;
 
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
 //-----------------------------------------------------------------------------
 // globals
 //-----------------------------------------------------------------------------
@@ -89,8 +96,9 @@ 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;
-    gtk_myfixed_move( GTK_MYFIXED(m_mainWidget), menu_bar->m_widget, 0, 0 );
-    gtk_widget_set_usize( menu_bar->m_widget, m_width, wxMENU_HEIGHT );
+    gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), 
+                          menu_bar->m_widget, 
+                          0, 0, m_width, wxMENU_HEIGHT );
 }
 
 void wxMDIParentFrame::OnInternalIdle()
@@ -112,15 +120,19 @@ void wxMDIParentFrame::OnInternalIdle()
     wxFrame::OnInternalIdle();
 
     wxMDIChildFrame *active_child_frame = GetActiveChild();
+    bool visible_child_menu = FALSE;
 
-    wxNode *node = m_clientWindow->m_children.First();
+    wxNode *node = m_clientWindow->GetChildren().First();
     while (node)
     {
         wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
         if (child_frame->m_menuBar)
         {
             if (child_frame == active_child_frame)
+            {
                gtk_widget_show( child_frame->m_menuBar->m_widget );
+               visible_child_menu = TRUE;
+            }
             else
                gtk_widget_hide( child_frame->m_menuBar->m_widget );
         }
@@ -128,7 +140,7 @@ void wxMDIParentFrame::OnInternalIdle()
     }
 
     /* show/hide parent menu bar as required */
-    if (m_frameMenuBar) m_frameMenuBar->Show( (active_child_frame == NULL) );
+    if (m_frameMenuBar) m_frameMenuBar->Show( !visible_child_menu );
 }
 
 void wxMDIParentFrame::GetClientSize(int *width, int *height ) const
@@ -153,7 +165,7 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
     GtkNotebookPage* page = (GtkNotebookPage*) (g_list_nth(notebook->children,i)->data);
     if (!page) return (wxMDIChildFrame*) NULL;
 
-    wxNode *node = m_clientWindow->m_children.First();
+    wxNode *node = m_clientWindow->GetChildren().First();
     while (node)
     {
         wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data();
@@ -267,9 +279,9 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *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)
+       if (m_menuBar->GetParent() != this)
        {
             wxNode *node = m_menuBar->GetMenus().First();
             while (node)
@@ -279,15 +291,16 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
                 node = node->Next();
             }
 
-            m_menuBar->m_parent = mdi_frame;
+            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 );
 
         /* insert the invisible menu bar into the _parent_ mdi frame */
-        gtk_myfixed_put( GTK_MYFIXED(mdi_frame->m_mainWidget), m_menuBar->m_widget, 0, 0 );
-        gtk_widget_set_usize( menu_bar->m_widget, mdi_frame->m_width, wxMENU_HEIGHT );
+        gtk_myfixed_put( GTK_MYFIXED(mdi_frame->m_mainWidget), 
+                         m_menuBar->m_widget, 
+                         0, 0,  mdi_frame->m_width, wxMENU_HEIGHT );
     }
 }
 
@@ -298,6 +311,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) )
@@ -310,6 +334,8 @@ void wxMDIChildFrame::OnActivate( wxActivateEvent &WXUNUSED(event) )
 
 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) &&
@@ -331,7 +357,7 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil
     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",
@@ -343,7 +369,7 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil
 
     child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
 
-    wxMDIParentFrame *parent_frame = (wxMDIParentFrame*) parent->m_parent;
+    wxMDIParentFrame *parent_frame = (wxMDIParentFrame*) parent->GetParent();
     parent_frame->m_justInserted = TRUE;
 }
 
@@ -378,9 +404,7 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
 
     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();
 
@@ -389,5 +413,3 @@ bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style )
     return TRUE;
 }
 
-
-