X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..8db6ac55e6cf1423f354af57c125722535fdccb9:/include/wx/msw/frame.h

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index e8a0981bae..abd5752e93 100644
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -45,12 +45,12 @@ public:
     virtual ~wxFrameMSW();
 
     // implement base class pure virtuals
+    virtual void Raise();
     virtual void Maximize(bool maximize = TRUE);
     virtual bool IsMaximized() const;
     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 +134,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 +186,6 @@ private:
     WXHWND                m_hwndToolTip;
 #endif // tooltips
 
-    DECLARE_DYNAMIC_CLASS(wxFrameMSW)
     DECLARE_EVENT_TABLE()
 };