X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7d9f12f3b9f997b6308faf336d5381be591b71f4..9c34a216817028bc533e07873d047208a96b05a2:/include/wx/gtk/frame.h diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h index ec5261621e..397ad76c56 100644 --- a/include/wx/gtk/frame.h +++ b/include/wx/gtk/frame.h @@ -7,35 +7,19 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKFRAMEH__ -#define __GTKFRAMEH__ - -#ifdef __GNUG__ - #pragma interface "frame.h" -#endif - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class wxMDIChildFrame; -class wxMDIClientWindow; -class wxMenu; -class wxMenuBar; -class wxToolBar; -class wxStatusBar; +#ifndef _WX_GTK_FRAME_H_ +#define _WX_GTK_FRAME_H_ //----------------------------------------------------------------------------- -// wxFrameGTK +// wxFrame //----------------------------------------------------------------------------- -class wxFrameGTK : public wxFrameBase +class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase { public: // construction - wxFrameGTK() { Init(); } - wxFrameGTK(wxWindow *parent, + wxFrame() { Init(); } + wxFrame(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, @@ -56,46 +40,44 @@ public: long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr); - virtual ~wxFrameGTK(); + virtual ~wxFrame(); #if wxUSE_STATUSBAR - virtual void PositionStatusBar(); - - virtual wxStatusBar* CreateStatusBar(int number = 1, - long style = wxST_SIZEGRIP, - wxWindowID id = 0, - const wxString& name = wxStatusLineNameStr); + void SetStatusBar(wxStatusBar *statbar); #endif // wxUSE_STATUSBAR #if wxUSE_TOOLBAR - virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT, - 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( int x, int y, int width, int height ); - virtual void OnInternalIdle(); - - bool m_menuBarDetached; - bool m_toolBarDetached; + virtual bool SendIdleEvents(wxIdleEvent& event); protected: - // common part of all ctors - void Init(); - // 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); #endif // wxUSE_MENUS_NATIVE + +private: + void Init(); + + long m_fsSaveFlag; + + DECLARE_DYNAMIC_CLASS(wxFrame) }; -#endif // __GTKFRAMEH__ +#endif // _WX_GTK_FRAME_H_