X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5e31cc8e2c4e5399548a637e3b9705d37a19335..14b44999eb335f3fc84b4362980b1730b8887588:/include/wx/gtk/frame.h?ds=sidebyside diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h index c052cd6388..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_CORE wxMDIChildFrame; -class WXDLLIMPEXP_CORE wxMDIClientWindow; -class WXDLLIMPEXP_CORE wxMenu; -class WXDLLIMPEXP_CORE wxMenuBar; -class WXDLLIMPEXP_CORE wxToolBar; -class WXDLLIMPEXP_CORE wxStatusBar; - //----------------------------------------------------------------------------- // wxFrame //----------------------------------------------------------------------------- @@ -54,57 +43,41 @@ public: virtual ~wxFrame(); #if wxUSE_STATUSBAR - virtual wxStatusBar* CreateStatusBar(int number = 1, - long style = wxST_SIZEGRIP|wxFULL_REPAINT_ON_RESIZE, - wxWindowID id = 0, - const wxString& name = wxStatusLineNameStr); - void SetStatusBar(wxStatusBar *statbar); #endif // wxUSE_STATUSBAR #if wxUSE_TOOLBAR - virtual wxToolBar* CreateToolBar(long style = -1, - wxWindowID id = -1, - 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); } +#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 void Init(); -#if wxUSE_STATUSBAR - virtual void PositionStatusBar(); -#endif // wxUSE_STATUSBAR - // override wxWindow methods to take into account tool/menu/statusbars - virtual void DoSetClientSize(int width, int height); virtual void DoGetClientSize( int *width, int *height ) const; #if wxUSE_MENUS_NATIVE - virtual void DetachMenuBar(); virtual void AttachMenuBar(wxMenuBar *menubar); - -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) };