OS/2 fixes for this week.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 17:42:49 +00:00
parent 2e57a9efc5
commit 893758d507
11 changed files with 498 additions and 237 deletions
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -617,6 +617,43 @@ void wxFrameOS2::SetMenuBar(
    }
 } // end of wxFrameOS2::SetMenuBar

+void wxFrameOS2::AttachMenuBar(
+  wxMenuBar*                        pMenubar
+)
+{
+    m_frameMenuBar = pMenubar;
+
+    if (!pMenubar)
+    {
+        //
+        // Actually remove the menu from the frame
+        //
+        m_hMenu = (WXHMENU)0;
+        InternalSetMenuBar();
+    }
+    else // Set new non NULL menu bar
+    {
+        //
+        // Can set a menubar several times.
+        //
+        if (pMenubar->GetHMenu())
+        {
+            m_hMenu = pMenubar->GetHMenu();
+        }
+        else
+        {
+            if (pMenubar->IsAttached())
+                pMenubar->Detach();
+
+            m_hMenu = pMenubar->Create();
+
+            if (!m_hMenu)
+                return;
+        }
+        InternalSetMenuBar();
+    }
+} // end of wxFrameOS2::AttachMenuBar
+
 void wxFrameOS2::InternalSetMenuBar()
 {
    ERRORID                         vError;