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

remove redundant WX_CLEAR_LIST, it's done by base dtor

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2008-01-24 18:13:12 +00:00
parent 0f35e441b0
commit 3fd7b18a61
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/menucmn.cpp
View File

@@ -152,8 +152,6 @@ void wxMenuBase::Init(long style)
wxMenuBase::~wxMenuBase() wxMenuBase::~wxMenuBase()
{ {
WX_CLEAR_LIST(wxMenuItemList, m_items); WX_CLEAR_LIST(wxMenuItemList, m_items);
// Actually, in GTK, the submenus have to get deleted first.
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

7
src/gtk/menu.cpp
View File

@@ -1009,13 +1009,6 @@ wxMenu::~wxMenu()
if ( m_owner ) if ( m_owner )
gtk_widget_destroy( m_menu ); gtk_widget_destroy( m_menu );
} }
// This must come after we release GTK resources above. Otherwise, GTK will
// give warnings/errors when attempting to free accelerator resources from
// child items that just were destroyed (the m_menu widget can contain
// references to accelerators in child items. Problem detected when removing
// a menu from a wxMenuBar, and the removed menu had submenus with accelerators.)
WX_CLEAR_LIST(wxMenuItemList, m_items);
} }
void wxMenu::SetLayoutDirection(const wxLayoutDirection dir) void wxMenu::SetLayoutDirection(const wxLayoutDirection dir)