moved wxWindow::m_hMenu to wxFrame, it is not needed in the base class

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

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 7decd43e5c82708b5ace52b90be2cad9a8022a04..c7fb8ed76cfd1435ad3bd5d8083fd83337e6df3d 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -83,7 +83,9 @@ public:
         { return m_useNativeStatusBar; };
 #endif // wxUSE_STATUSBAR
 
         { return m_useNativeStatusBar; };
 #endif // wxUSE_STATUSBAR
 

+#if wxUSE_MENUS

     WXHMENU GetWinMenu() const { return m_hMenu; }
     WXHMENU GetWinMenu() const { return m_hMenu; }

+#endif // wxUSE_MENUS

 
     // event handlers
     bool HandlePaint();
 
     // event handlers
     bool HandlePaint();


@@ -142,6 +144,11 @@ protected:
     static bool           m_useNativeStatusBar;
 #endif // wxUSE_STATUSBAR
 
     static bool           m_useNativeStatusBar;
 #endif // wxUSE_STATUSBAR
 

+#if wxUSE_MENUS
+    // frame menu, NULL if none
+    WXHMENU m_hMenu;
+#endif // wxUSE_MENUS
+

 private:
 #if wxUSE_TOOLTIPS
     WXHWND                m_hwndToolTip;
 private:
 #if wxUSE_TOOLTIPS
     WXHWND                m_hwndToolTip;

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 4469b413f485240f1cd649161e722cb7210c2c3e..a4ce110bc61517b06b9fc6b1095a81a203336965 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -437,8 +437,6 @@ protected:
     int                   m_lastMouseEvent;
 #endif // wxUSE_MOUSEEVENT_HACK
 
     int                   m_lastMouseEvent;
 #endif // wxUSE_MOUSEEVENT_HACK
 

-    WXHMENU               m_hMenu; // Menu, if any
-

     // implement the base class pure virtuals
     virtual void DoClientToScreen( int *x, int *y ) const;
     virtual void DoScreenToClient( int *x, int *y ) const;
     // implement the base class pure virtuals
     virtual void DoClientToScreen( int *x, int *y ) const;
     virtual void DoScreenToClient( int *x, int *y ) const;

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 06e51b1f688e4bd11f4a7211d0ed031eba36e3b1..395a6602e1768716c9bd4b9a16c2f102bbc665ca 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -169,6 +169,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
 
 void wxFrame::Init()
 {
 
 void wxFrame::Init()
 {

+#if wxUSE_MENUS
+    m_hMenu = NULL;
+#endif // wxUSE_MENUS
+

 #if wxUSE_TOOLTIPS
     m_hwndToolTip = 0;
 #endif
 #if wxUSE_TOOLTIPS
     m_hwndToolTip = 0;
 #endif

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 90fffdc037e0d41e3a46b2d0ca887d63126f0620..554055c2469479e3f4730f9263eb2a6dc73d1c45 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -436,9 +436,6 @@ void wxWindowMSW::Init()
     m_childrenDisabled = NULL;
     m_frozenness = 0;
 
     m_childrenDisabled = NULL;
     m_frozenness = 0;
 

-    // wxWnd
-    m_hMenu = 0;
-

     m_hWnd = 0;
 
     m_xThumbSize = 0;
     m_hWnd = 0;
 
     m_xThumbSize = 0;


@@ -4066,7 +4063,7 @@ WXHBRUSH wxWindowMSW::MSWGetBgBrush(WXHDC hDC)
 
         // background is not inherited beyond the windows which have their own
         // fixed background such as top level windows and notebooks
 
         // background is not inherited beyond the windows which have their own
         // fixed background such as top level windows and notebooks

-        if ( win->IsTopLevel() /* ProvidesBackground() */ )
+        if ( win->ProvidesBackground() )

             break;
     }
 
             break;
     }