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 226e26c0da39594886fb8b125511ae7a9c90aa67..d4ea7b365e52624967b8adad11d534acf6ad9897 100644 (file)
--- 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_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_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();
     }
 
     wxFrameBase::DetachMenuBar();


@@ -567,7 +567,7 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
         m_frameMenuBar->Show( TRUE );
     }
 
         m_frameMenuBar->Show( TRUE );
     }
 

-    /* resize window in OnInternalIdle */
+    // resize window in OnInternalIdle

     m_sizeSet = FALSE;
 }
 
     m_sizeSet = FALSE;
 }
 


@@ -596,7 +596,7 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
 
     if (m_frameToolBar)
     {
 
     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))
         {
         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 226e26c0da39594886fb8b125511ae7a9c90aa67..d4ea7b365e52624967b8adad11d534acf6ad9897 100644 (file)
--- 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_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_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();
     }
 
     wxFrameBase::DetachMenuBar();


@@ -567,7 +567,7 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
         m_frameMenuBar->Show( TRUE );
     }
 
         m_frameMenuBar->Show( TRUE );
     }
 

-    /* resize window in OnInternalIdle */
+    // resize window in OnInternalIdle

     m_sizeSet = FALSE;
 }
 
     m_sizeSet = FALSE;
 }
 


@@ -596,7 +596,7 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
 
     if (m_frameToolBar)
     {
 
     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))
         {
         if ((m_frameToolBar->m_widget->parent) &&
             (m_frameToolBar->m_widget->parent != m_mainWidget))
         {