fix for gtk/mdi when changing menubars

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

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index afe3ebd900c04a16ac8fcdd97c6af1b42e4b8042..f1f4317e11df3417b03d1f7d9c6e88efcd1ed692 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -607,13 +607,13 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
 
 void wxFrame::UpdateMenuBarSize()
 {
-    wxASSERT_MSG( m_frameMenuBar, _T("Updating non existant menubar?") );
-
     GtkRequisition  req;
 
     req.width = 2;
     req.height = 2;
-
+    
+    // this is called after Remove with a NULL m_frameMenuBar
+    if ( m_frameMenuBar )
     (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_frameMenuBar->m_widget) )->size_request )
         (m_frameMenuBar->m_widget, &req );
 

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index afe3ebd900c04a16ac8fcdd97c6af1b42e4b8042..f1f4317e11df3417b03d1f7d9c6e88efcd1ed692 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -607,13 +607,13 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
 
 void wxFrame::UpdateMenuBarSize()
 {
-    wxASSERT_MSG( m_frameMenuBar, _T("Updating non existant menubar?") );
-
     GtkRequisition  req;
 
     req.width = 2;
     req.height = 2;
-
+    
+    // this is called after Remove with a NULL m_frameMenuBar
+    if ( m_frameMenuBar )
     (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_frameMenuBar->m_widget) )->size_request )
         (m_frameMenuBar->m_widget, &req );