Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected wxFrame::SetMenuBar() for repeated calls

Browse Source 
including for NULL.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-01-11 18:06:08 +00:00
parent ca165ce9af
commit f283a57525
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gtk/frame.cpp
View File

@@ -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) && if ((m_frameToolBar->m_widget->parent) &&
(m_frameToolBar->m_widget->parent != m_mainWidget)) (m_frameToolBar->m_widget->parent != m_mainWidget))
{ {

8
src/gtk1/frame.cpp
View File

@@ -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) && if ((m_frameToolBar->m_widget->parent) &&
(m_frameToolBar->m_widget->parent != m_mainWidget)) (m_frameToolBar->m_widget->parent != m_mainWidget))
{ {