Apply choice patch for proper handling of clearing

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

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index cf32c98a83f3d9f6f3557d23a53a2f2c213be487..c6043a88c68689b771b844149e4137c695d11755 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -24,6 +24,7 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

+#include "wx/frame.h"

 #include "wx/dialog.h"
 #include "wx/control.h"
 #include "wx/app.h"
 #include "wx/dialog.h"
 #include "wx/control.h"
 #include "wx/app.h"


@@ -607,13 +608,13 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
 
 void wxFrame::UpdateMenuBarSize()
 {
 
 void wxFrame::UpdateMenuBarSize()
 {

-    wxASSERT_MSG( m_frameMenuBar, _T("Updating non existant menubar?") );
-

     GtkRequisition  req;
 
     req.width = 2;
     req.height = 2;
     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 );
 
     (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_frameMenuBar->m_widget) )->size_request )
         (m_frameMenuBar->m_widget, &req );
 


@@ -694,7 +695,7 @@ void wxFrame::SetStatusBar(wxStatusBar *statbar)
     
     wxFrameBase::SetStatusBar(statbar);
     
     
     wxFrameBase::SetStatusBar(statbar);
     

-    if (hadStatBar && !m_frameToolBar) 
+    if (hadStatBar && !m_frameStatusBar) 

         GtkUpdateSize();
 }
 
         GtkUpdateSize();
 }