From: Robert Roebling <robert@roebling.de>
Date: Fri, 11 Jan 2002 18:06:08 +0000 (+0000)
Subject:   Corrected wxFrame::SetMenuBar() for repeated calls
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f283a575257064d383885ad9102f6d0d327bcc9d

  Corrected wxFrame::SetMenuBar() for repeated calls
    including for NULL.


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

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 226e26c0da..d4ea7b365e 100644
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -531,9 +531,9 @@ void wxFrame::DetachMenuBar()
                 GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );
         }
 
-        gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget );
         gtk_widget_ref( m_frameMenuBar->m_widget );
-        gtk_widget_unparent( m_frameMenuBar->m_widget );
+
+        gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget );
     }
 
     wxFrameBase::DetachMenuBar();
@@ -567,7 +567,7 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
         m_frameMenuBar->Show( TRUE );
     }
 
-    /* resize window in OnInternalIdle */
+    // resize window in OnInternalIdle
     m_sizeSet = FALSE;
 }
 
@@ -596,7 +596,7 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
 
     if (m_frameToolBar)
     {
-        /* insert into toolbar area if not already there */
+        // insert into toolbar area if not already there
         if ((m_frameToolBar->m_widget->parent) &&
             (m_frameToolBar->m_widget->parent != m_mainWidget))
         {
diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 226e26c0da..d4ea7b365e 100644
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -531,9 +531,9 @@ void wxFrame::DetachMenuBar()
                 GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );
         }
 
-        gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget );
         gtk_widget_ref( m_frameMenuBar->m_widget );
-        gtk_widget_unparent( m_frameMenuBar->m_widget );
+
+        gtk_container_remove( GTK_CONTAINER(m_mainWidget), m_frameMenuBar->m_widget );
     }
 
     wxFrameBase::DetachMenuBar();
@@ -567,7 +567,7 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
         m_frameMenuBar->Show( TRUE );
     }
 
-    /* resize window in OnInternalIdle */
+    // resize window in OnInternalIdle
     m_sizeSet = FALSE;
 }
 
@@ -596,7 +596,7 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
 
     if (m_frameToolBar)
     {
-        /* insert into toolbar area if not already there */
+        // insert into toolbar area if not already there
         if ((m_frameToolBar->m_widget->parent) &&
             (m_frameToolBar->m_widget->parent != m_mainWidget))
         {