X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4edaf5cec7c7d091c98cab741b0e1839de4e63c..4c420a80e0fb11511b235411875ba5d3e0eb8492:/src/gtk/frame.cpp

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index cf32c98a83..f1f4317e11 100644
--- 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 );
 
@@ -694,7 +694,7 @@ void wxFrame::SetStatusBar(wxStatusBar *statbar)
     
     wxFrameBase::SetStatusBar(statbar);
     
-    if (hadStatBar && !m_frameToolBar) 
+    if (hadStatBar && !m_frameStatusBar) 
         GtkUpdateSize();
 }