From 6beb85c0d32d2bca8520feb7e100a6f612720a53 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 12 Jul 2001 00:06:07 +0000 Subject: [PATCH] menu bar wasn't set properly internally after my previous change - fixed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/frame.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index 4304b09fee..ee461db1be 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -139,15 +139,6 @@ bool wxFrameMSW::Create(wxWindow *parent, { SetName(name); m_windowStyle = style; -#if wxUSE_MENUS - m_frameMenuBar = NULL; -#endif // wxUSE_MENUS -#if wxUSE_TOOLBAR - m_frameToolBar = NULL; -#endif // wxUSE_TOOLBAR -#if wxUSE_STATUSBAR - m_frameStatusBar = NULL; -#endif // wxUSE_STATUSBAR SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); @@ -490,6 +481,8 @@ void wxFrameMSW::PositionStatusBar() void wxFrameMSW::AttachMenuBar(wxMenuBar *menubar) { + m_frameMenuBar = menubar; + if ( !menubar ) { // actually remove the menu from the frame -- 2.47.2