X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/949ff63e2f81719cd47a6c6b26047ee57c0aa052..01101e2da6f4493ce8cfcf4d9509163b9c264d58:/include/wx/gtk/frame.h diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h index 9265754229..726cce187b 100644 --- a/include/wx/gtk/frame.h +++ b/include/wx/gtk/frame.h @@ -14,12 +14,12 @@ // classes //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxMDIChildFrame; -class WXDLLIMPEXP_CORE wxMDIClientWindow; -class WXDLLIMPEXP_CORE wxMenu; -class WXDLLIMPEXP_CORE wxMenuBar; -class WXDLLIMPEXP_CORE wxToolBar; -class WXDLLIMPEXP_CORE wxStatusBar; +class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; +class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow; +class WXDLLIMPEXP_FWD_CORE wxMenu; +class WXDLLIMPEXP_FWD_CORE wxMenuBar; +class WXDLLIMPEXP_FWD_CORE wxToolBar; +class WXDLLIMPEXP_FWD_CORE wxStatusBar; //----------------------------------------------------------------------------- // wxFrame @@ -58,7 +58,7 @@ public: long style = wxST_SIZEGRIP|wxFULL_REPAINT_ON_RESIZE, wxWindowID id = 0, const wxString& name = wxStatusLineNameStr); - + void SetStatusBar(wxStatusBar *statbar); #endif // wxUSE_STATUSBAR @@ -68,7 +68,8 @@ public: const wxString& name = wxToolBarNameStr); void SetToolBar(wxToolBar *toolbar); #endif // wxUSE_TOOLBAR - + + virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); } // implementation from now on @@ -94,16 +95,20 @@ protected: virtual void DoGetClientSize( int *width, int *height ) const; #if wxUSE_MENUS_NATIVE - virtual void DetachMenuBar(); virtual void AttachMenuBar(wxMenuBar *menubar); + // Whether frame has a menubar showing + // (needed to deal with perverted MDI menubar handling) + virtual bool HasVisibleMenubar() const; public: // Menu size is dynamic now, call this whenever it might change. void UpdateMenuBarSize(); - #endif // wxUSE_MENUS_NATIVE +private: + long m_fsSaveFlag; + DECLARE_DYNAMIC_CLASS(wxFrame) };