X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/383144c756be2e3aa7b58a3db1d8789584763708..4f2511d706e5274a34e1521e11c1b95fed735b42:/include/wx/gtk/frame.h diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h index b93964dd5f..c24937ec95 100644 --- a/include/wx/gtk/frame.h +++ b/include/wx/gtk/frame.h @@ -10,17 +10,6 @@ #ifndef _WX_GTK_FRAME_H_ #define _WX_GTK_FRAME_H_ -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -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 //----------------------------------------------------------------------------- @@ -64,17 +53,17 @@ public: virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); } +#if wxUSE_LIBHILDON + // in Hildon environment all frames are always shown maximized + virtual bool IsMaximized() const { return true; } +#endif // wxUSE_LIBHILDON + // implementation from now on // -------------------------- // GTK callbacks - virtual void GtkOnSize(); virtual void OnInternalIdle(); - bool m_menuBarDetached; - int m_menuBarHeight; - bool m_toolBarDetached; - protected: // common part of all ctors void Init(); @@ -85,13 +74,6 @@ protected: #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: