Fix for crash when the child has no menu

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/mdi.cpp b/src/gtk/mdi.cpp
index 131cee85cb10060bb0bc628b18544113e2b7acb0..99c278b2d53534c3830f47d8d1cb49b8ae095156 100644 (file)
--- a/src/gtk/mdi.cpp
+++ b/src/gtk/mdi.cpp
@@ -168,15 +168,18 @@ void wxMDIParentFrame::OnInternalIdle()
         GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
         gtk_notebook_set_page( notebook, g_list_length( notebook->children ) - 1 );
 
-    /* need to set the menubar of the child */
+        /* need to set the menubar of the child */
         wxMDIChildFrame *active_child_frame = GetActiveChild();
         wxMenuBar *menu_bar = active_child_frame->m_menuBar;
-        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);
+        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;

diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp
index 131cee85cb10060bb0bc628b18544113e2b7acb0..99c278b2d53534c3830f47d8d1cb49b8ae095156 100644 (file)
--- a/src/gtk1/mdi.cpp
+++ b/src/gtk1/mdi.cpp
@@ -168,15 +168,18 @@ void wxMDIParentFrame::OnInternalIdle()
         GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
         gtk_notebook_set_page( notebook, g_list_length( notebook->children ) - 1 );
 
-    /* need to set the menubar of the child */
+        /* need to set the menubar of the child */
         wxMDIChildFrame *active_child_frame = GetActiveChild();
         wxMenuBar *menu_bar = active_child_frame->m_menuBar;
-        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);
+        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;