always delete the menus, even if the menu is attached (at the very least this fixes...

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

diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index a6956295e2dcab2610ae3cda67df7397d2ab1ef6..27ccbc0fb8d453cb0ee84a7f0f0e66a954908b47 100644 (file)
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -261,15 +261,9 @@ void wxMenu::Init()
 // The wxWindow destructor will take care of deleting the submenus.
 wxMenu::~wxMenu()
 {
-    // we should free Windows resources only if Windows doesn't do it for us
-    // which happens if we're attached to a menubar or a submenu of another
-    // menu
-    if ( !IsAttached() && !GetParent() )
+    if ( !::DestroyMenu(GetHmenu()) )
     {
-        if ( !::DestroyMenu(GetHmenu()) )
-        {
-            wxLogLastError(wxT("DestroyMenu"));
-        }
+        wxLogLastError(wxT("DestroyMenu"));
     }
 
 #if wxUSE_ACCEL
@@ -880,9 +874,8 @@ wxMenuBar::~wxMenuBar()
             toolMenuBar->SetMenuBar(NULL);
     }
 #else
-    // we should free Windows resources only if Windows doesn't do it for us
-    // which happens if we're attached to a frame
-    if (m_hMenu && !IsAttached())
+
+    if ( m_hMenu )
     {
 #if defined(WINCE_WITH_COMMANDBAR)
         ::DestroyWindow((HWND) m_commandBar);