From: Unknown (MT) <nobody@localhost>
Date: Mon, 13 Sep 1999 07:16:18 +0000 (+0000)
Subject: Add detachmenu
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ea9a4296a23fa5b1441e9d3abca357fe7cb412b5

Add detachmenu


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

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 7dfaf63fc6..f5df0290d1 100644
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -68,6 +68,7 @@ public:
 
     bool Show(bool show);
 
+    void DetachMenuBar();
     // Set menu bar
     void SetMenuBar(wxMenuBar *menu_bar);
     virtual wxMenuBar *GetMenuBar() const;
diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 1f463ef76a..a5765f0fa0 100644
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -418,12 +418,20 @@ void wxFrame::PositionStatusBar()
 }
 #endif // wxUSE_STATUSBAR
 
+void wxFrame::DetachMenuBar()
+{
+    if (m_frameMenuBar)
+    {
+        m_frameMenuBar->Detach();
+        m_frameMenuBar = NULL;
+    }
+}
+
 void wxFrame::SetMenuBar(wxMenuBar *menu_bar)
 {
     if (!menu_bar)
     {
-        delete m_frameMenuBar;
-        m_frameMenuBar = NULL;
+        DetachMenuBar();
         return;
     }