X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..e276acb530f41f0b87c4576c0215201a8a767dff:/include/wx/gtk1/frame.h?ds=sidebyside diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h index 23dde5eab4..c7e14925f3 100644 --- a/include/wx/gtk1/frame.h +++ b/include/wx/gtk1/frame.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/frame.h +// Name: wx/gtk1/frame.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,35 +7,30 @@ // 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; +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; //----------------------------------------------------------------------------- -// 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,89 +51,59 @@ public: long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr); - 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 + virtual ~wxFrame(); #if wxUSE_STATUSBAR virtual void PositionStatusBar(); virtual wxStatusBar* CreateStatusBar(int number = 1, - long style = wxST_SIZEGRIP, + 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 = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT, + virtual wxToolBar* CreateToolBar(long style = -1, wxWindowID id = -1, const wxString& name = wxToolBarNameStr); 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; } + wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); } // 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; + int m_menuBarHeight; 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); + +public: + // Menu size is dynamic now, call this whenever it might change. + void UpdateMenuBarSize(); + +#endif // wxUSE_MENUS_NATIVE -private: - DECLARE_DYNAMIC_CLASS(wxFrameGTK) + DECLARE_DYNAMIC_CLASS(wxFrame) }; #endif // __GTKFRAMEH__