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

fixed menu destruction if it was removed from menubar with Remove

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-10-03 21:00:45 +00:00
parent e25c7537ff
commit a761df69a3
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gtk/menu.cpp
View File

@@ -982,8 +982,12 @@ wxMenu::~wxMenu()
if ( GTK_IS_WIDGET( m_menu )) if ( GTK_IS_WIDGET( m_menu ))
{ {
gtk_widget_unref( m_menu ); // see wxMenu::Init // see wxMenu::Init
gtk_widget_destroy( m_menu ); gtk_widget_unref( m_menu );
// if the menu is inserted in another menu at this time, there was
// one more reference to it:
if ( m_owner )
gtk_widget_destroy( m_menu );
} }
} }

8
src/gtk1/menu.cpp
View File

@@ -982,8 +982,12 @@ wxMenu::~wxMenu()
if ( GTK_IS_WIDGET( m_menu )) if ( GTK_IS_WIDGET( m_menu ))
{ {
gtk_widget_unref( m_menu ); // see wxMenu::Init // see wxMenu::Init
gtk_widget_destroy( m_menu ); gtk_widget_unref( m_menu );
// if the menu is inserted in another menu at this time, there was
// one more reference to it:
if ( m_owner )
gtk_widget_destroy( m_menu );
} }
} }