X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/383144c756be2e3aa7b58a3db1d8789584763708..e9e8b38179b147dd04f5c19af7e56a94342e93a7:/include/wx/gtk/frame.h diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h index b93964dd5f..f65f85ee62 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,16 +53,15 @@ public: virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); } +#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 + // in Hildon environment all frames are always shown maximized + virtual bool IsMaximized() const { return true; } +#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 + // implementation from now on // -------------------------- - // GTK callbacks - virtual void GtkOnSize(); - virtual void OnInternalIdle(); - - bool m_menuBarDetached; - int m_menuBarHeight; - bool m_toolBarDetached; + virtual bool SendIdleEvents(wxIdleEvent& event); protected: // common part of all ctors @@ -85,13 +73,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: