Fox around a bug in GTK's GtkNotebook

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

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index 82f5e1c2601d7202f9cb8a0f2caa77c2e3085897..064376b54c6a12a25c3692ab6a811bcf4a011cb8 100644 (file)
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -25,7 +25,14 @@
 // constants
 //-----------------------------------------------------------------------------
 
-const int wxMENU_HEIGHT    = 27;
+const int wxMENU_HEIGHT = 27;
+
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
 
 //-----------------------------------------------------------------------------
 // globals
@@ -77,14 +84,14 @@ bool wxMDIParentFrame::Create( wxWindow *parent,
 void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
 {
     wxFrame::GtkOnSize( x, y, width, 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;
@@ -103,32 +110,36 @@ void wxMDIParentFrame::OnInternalIdle()
     if (m_justInserted)
     {
         GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
-       gtk_notebook_set_page( notebook, g_list_length( notebook->children ) - 1 );
-       
-       m_justInserted = FALSE;
-       return;
+        gtk_notebook_set_page( notebook, g_list_length( notebook->children ) - 1 );
+
+        m_justInserted = FALSE;
+        return;
     }
-       
+
     wxFrame::OnInternalIdle();
 
     wxMDIChildFrame *active_child_frame = GetActiveChild();
-    
+    bool visible_child_menu = FALSE;
+
     wxNode *node = m_clientWindow->m_children.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 );
-           else
-              gtk_widget_hide( child_frame->m_menuBar->m_widget );
-       }
+        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 );
+        }
         node = node->Next();
     }
-    
+
     /* 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
@@ -139,16 +150,20 @@ void wxMDIParentFrame::GetClientSize(int *width, int *height ) const
 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
 {
     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->m_children.First();
     while (node)
     {
@@ -157,7 +172,7 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
             return child_frame;
         node = node->Next();
     }
-    
+
     return (wxMDIChildFrame*) NULL;
 }
 
@@ -279,7 +294,7 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
         }
 
         /* the menu bar of the child window is shown in idle time as needed */
-       gtk_widget_hide( m_menuBar->m_widget );
+        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 );
@@ -306,6 +321,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) &&
@@ -327,7 +344,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",
@@ -338,7 +355,7 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil
     gtk_notebook_append_page( notebook, child->m_widget, label_widget );
 
     child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
-    
+
     wxMDIParentFrame *parent_frame = (wxMDIParentFrame*) parent->m_parent;
     parent_frame->m_justInserted = TRUE;
 }