A fix for attribrute sorting, but it's still broken if there are

[wxWidgets.git] / include / wx / msw / frame.h

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 9b76f8b8c0d4ab4596e6dc50e7cad78c138d74b2..22509da92084c554c1400ef5ea989e4bf64bac04 100644 (file)
--- 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 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; };
     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);
 
 
     virtual void DoSetClientSize(int width, int height);
 

-    // helper
-    void DetachMenuBar();
-

 #if wxUSE_MENUS_NATIVE
 #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();
     // a plug in for MDI frame classes which need to do something special when
     // the menubar is set
     virtual void InternalSetMenuBar();