X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..159b66c02a8f1c724d1af3c768ad5d90f4c8a0e2:/include/wx/msw/frame.h diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h index e8a0981bae..22509da920 100644 --- a/include/wx/msw/frame.h +++ b/include/wx/msw/frame.h @@ -50,7 +50,6 @@ public: virtual void Iconize(bool iconize = TRUE); virtual bool IsIconized() const; virtual void Restore(); - virtual void SetMenuBar(wxMenuBar *menubar); virtual void SetIcon(const wxIcon& icon); virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); virtual bool IsFullScreen() const { return m_fsIsShowing; }; @@ -134,10 +133,10 @@ protected: virtual void DoSetClientSize(int width, int height); - // helper - void DetachMenuBar(); - #if wxUSE_MENUS_NATIVE + // perform MSW-specific action when menubar is changed + virtual void AttachMenuBar(wxMenuBar *menubar); + // a plug in for MDI frame classes which need to do something special when // the menubar is set virtual void InternalSetMenuBar(); @@ -186,7 +185,6 @@ private: WXHWND m_hwndToolTip; #endif // tooltips - DECLARE_DYNAMIC_CLASS(wxFrameMSW) DECLARE_EVENT_TABLE() };