final pre-release OS/2 updates.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-16 18:34:27 +00:00
parent 63e0edead7
commit 63c1d521d4
9 changed files with 408 additions and 244 deletions
--- a/src/os2/menu.cpp
+++ b/src/os2/menu.cpp
@@ -750,6 +750,15 @@ wxMenuBar::wxMenuBar(

 wxMenuBar::~wxMenuBar()
 {
+    //
+    // We should free PM's resources only if PM doesn't do it for us
+    // which happens if we're attached to a frame
+    //
+    if (m_hMenu && !IsAttached())
+    {
+        ::WinDestroyWindow((HMENU)m_hMenu);
+        m_hMenu = (WXHMENU)NULL;
+    }
 } // end of wxMenuBar::~wxMenuBar

 // ---------------------------------------------------------------------------