X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af8964c4c3770b2d54ee54a9f8275113e944a3d9..0cecad314c1052c1e3545f431af4228b3c737033:/include/wx/gtk/frame.h diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h index fd7e72f4d3..ec5261621e 100644 --- a/include/wx/gtk/frame.h +++ b/include/wx/gtk/frame.h @@ -58,22 +58,6 @@ public: virtual ~wxFrameGTK(); - // implement base class pure virtuals - virtual void Maximize(bool maximize = TRUE); - virtual bool IsMaximized() const; - virtual void Iconize(bool iconize = TRUE); - virtual bool IsIconized() const; - virtual void SetIcon(const wxIcon& icon); - virtual void MakeModal(bool modal = TRUE); - virtual void Restore(); - - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); - virtual bool IsFullScreen() const { return m_fsIsShowing; }; - -#if wxUSE_MENUS - virtual void SetMenuBar( wxMenuBar *menuBar ); -#endif // wxUSE_MENUS - #if wxUSE_STATUSBAR virtual void PositionStatusBar(); @@ -90,52 +74,28 @@ public: void SetToolBar(wxToolBar *toolbar); #endif // wxUSE_TOOLBAR - virtual bool Show(bool show = TRUE); - - virtual void SetTitle( const wxString &title ); - virtual wxString GetTitle() const { return m_title; } - // implementation from now on // -------------------------- - // move the window to the specified location and resize it: this is called - // from both DoSetSize() and DoSetClientSize() - virtual void DoMoveWindow(int x, int y, int width, int height); - // GTK callbacks virtual void GtkOnSize( int x, int y, int width, int height ); virtual void OnInternalIdle(); - // do *not* call this to iconize the frame, this is a private function! - void SetIconizeState(bool iconic); - - wxString m_title; - int m_miniEdge, - m_miniTitle; - GtkWidget *m_mainWidget; bool m_menuBarDetached; bool m_toolBarDetached; - bool m_insertInClientArea; /* not from within OnCreateXXX */ - - bool m_fsIsShowing; /* full screen */ - long m_fsSaveStyle; - long m_fsSaveFlag; - wxRect m_fsSaveFrame; protected: // common part of all ctors void Init(); // override wxWindow methods to take into account tool/menu/statusbars - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - virtual void DoSetClientSize(int width, int height); virtual void DoGetClientSize( int *width, int *height ) const; - // is the frame currently iconized? - bool m_isIconized; +#if wxUSE_MENUS_NATIVE + virtual void DetachMenuBar(); + virtual void AttachMenuBar(wxMenuBar *menubar); +#endif // wxUSE_MENUS_NATIVE }; #endif // __GTKFRAMEH__