X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3dd9b88ac26caa8dbcc26c7fafc10cd886fc97ac..217099990c2665d18d352c60058106da9a014ab8:/include/wx/gtk1/frame.h diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h index 99aff948e1..23dde5eab4 100644 --- a/include/wx/gtk1/frame.h +++ b/include/wx/gtk1/frame.h @@ -26,24 +26,22 @@ class wxMenuBar; class wxToolBar; class wxStatusBar; -class wxFrame; - //----------------------------------------------------------------------------- -// wxFrame +// wxFrameGTK //----------------------------------------------------------------------------- -class wxFrame : public wxFrameBase +class wxFrameGTK : public wxFrameBase { public: // construction - wxFrame() { Init(); } - wxFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) + wxFrameGTK() { Init(); } + wxFrameGTK(wxWindow *parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDEFAULT_FRAME_STYLE, + const wxString& name = wxFrameNameStr) { Init(); @@ -58,7 +56,7 @@ public: long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr); - virtual ~wxFrame(); + virtual ~wxFrameGTK(); // implement base class pure virtuals virtual void Maximize(bool maximize = TRUE); @@ -72,7 +70,9 @@ public: virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); virtual bool IsFullScreen() const { return m_fsIsShowing; }; +#if wxUSE_MENUS virtual void SetMenuBar( wxMenuBar *menuBar ); +#endif // wxUSE_MENUS #if wxUSE_STATUSBAR virtual void PositionStatusBar(); @@ -138,7 +138,7 @@ protected: bool m_isIconized; private: - DECLARE_DYNAMIC_CLASS(wxFrame) + DECLARE_DYNAMIC_CLASS(wxFrameGTK) }; #endif // __GTKFRAMEH__