test for long long directly instead of testing for gcc

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

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index e8a0981bae0c4ef911316ee56b8d7a24363500c2..abd5752e93683a1b31b97acee4a67d4e5a6b5b88 100644 (file)
--- 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 ~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 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; };
     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);
 
 
     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();


@@ -186,7 +186,6 @@ private:
     WXHWND                m_hwndToolTip;
 #endif // tooltips
 
     WXHWND                m_hwndToolTip;
 #endif // tooltips
 

-    DECLARE_DYNAMIC_CLASS(wxFrameMSW)

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };