X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0dba08dd3987303ff116bf77d5fb877b6d8f32d0..62c9b3d73fdf9a892a311241f1effc12dde0282a:/include/wx/msw/frame.h?ds=sidebyside diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h index 50f8f16064..348853262a 100644 --- a/include/wx/msw/frame.h +++ b/include/wx/msw/frame.h @@ -75,10 +75,6 @@ public: { return m_useNativeStatusBar; } #endif // wxUSE_STATUSBAR -#if wxUSE_MENUS - WXHMENU GetWinMenu() const { return m_hMenu; } -#endif // wxUSE_MENUS - // event handlers bool HandleSize(int x, int y, WXUINT flag); bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control); @@ -92,7 +88,7 @@ public: #endif // tooltips // override the base class function to handle iconized/maximized frames - virtual void SendSizeEvent(); + virtual void SendSizeEvent(int flags = 0); virtual wxPoint GetClientAreaOrigin() const; @@ -107,6 +103,12 @@ public: WXWPARAM wParam, WXLPARAM lParam); +#if wxUSE_MENUS + // get the currently active menu: this is the same as the frame menu for + // normal frames but is overridden by wxMDIParentFrame + virtual WXHMENU MSWGetActiveMenu() const { return m_hMenu; } +#endif // wxUSE_MENUS + protected: // common part of all ctors void Init();