From ea9a4296a23fa5b1441e9d3abca357fe7cb412b5 Mon Sep 17 00:00:00 2001 From: "Unknown (MT)" Date: Mon, 13 Sep 1999 07:16:18 +0000 Subject: [PATCH] Add detachmenu git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/frame.h | 1 + src/msw/frame.cpp | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) 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; } -- 2.47.2