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 7dfaf63fc638d88ab9b7f79591d45f08f041b5d7..f5df0290d1d32cdb6aaf0a9dc09ddbfec4ab4206 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -68,6 +68,7 @@ public:
 
     bool Show(bool show);
 
 
     bool Show(bool show);
 

+    void DetachMenuBar();

     // Set menu bar
     void SetMenuBar(wxMenuBar *menu_bar);
     virtual wxMenuBar *GetMenuBar() const;
     // 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 1f463ef76a1db304357b7dfc0a6f0053ee96b8d0..a5765f0fa08bbbfbeac3a3e41db23c675c9c0e5b 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -418,12 +418,20 @@ void wxFrame::PositionStatusBar()
 }
 #endif // wxUSE_STATUSBAR
 
 }
 #endif // wxUSE_STATUSBAR
 

+void wxFrame::DetachMenuBar()
+{
+    if (m_frameMenuBar)
+    {
+        m_frameMenuBar->Detach();
+        m_frameMenuBar = NULL;
+    }
+}
+

 void wxFrame::SetMenuBar(wxMenuBar *menu_bar)
 {
     if (!menu_bar)
     {
 void wxFrame::SetMenuBar(wxMenuBar *menu_bar)
 {
     if (!menu_bar)
     {

-        delete m_frameMenuBar;
-        m_frameMenuBar = NULL;
+        DetachMenuBar();

         return;
     }
 
         return;
     }