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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 4304b09fee2993aef573134ec569be0e4f704d1d..ee461db1be228615cb670c846405b1998a39c7ab 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -139,15 +139,6 @@ bool wxFrameMSW::Create(wxWindow *parent,
 {
   SetName(name);
   m_windowStyle = style;
 {
   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));
 
 
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
 


@@ -490,6 +481,8 @@ void wxFrameMSW::PositionStatusBar()
 
 void wxFrameMSW::AttachMenuBar(wxMenuBar *menubar)
 {
 
 void wxFrameMSW::AttachMenuBar(wxMenuBar *menubar)
 {

+    m_frameMenuBar = menubar;
+

     if ( !menubar )
     {
         // actually remove the menu from the frame
     if ( !menubar )
     {
         // actually remove the menu from the frame