X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6bc8a1c80bd02b418107ba089f0026125c43e39b..31ad423e4fb556ec225a63b161154d3bf3445c1b:/include/wx/gtk1/frame.h diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h index 13a543e0fe..3befcf231f 100644 --- a/include/wx/gtk1/frame.h +++ b/include/wx/gtk1/frame.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: frame.h +// Name: wx/gtk/frame.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -11,15 +11,10 @@ #ifndef __GTKFRAMEH__ #define __GTKFRAMEH__ -#ifdef __GNUG__ -#pragma interface +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) + #pragma interface "frame.h" #endif -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/window.h" -#include "wx/icon.h" - //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- @@ -31,101 +26,89 @@ class wxMenuBar; class wxToolBar; class wxStatusBar; -class wxFrame; - -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -extern const wxChar *wxFrameNameStr; -extern const wxChar *wxToolBarNameStr; - //----------------------------------------------------------------------------- // wxFrame //----------------------------------------------------------------------------- -class wxFrame: public wxWindow +class wxFrame : public wxFrameBase { -DECLARE_DYNAMIC_CLASS(wxFrame) - public: - wxFrame(); - wxFrame( wxWindow *parent, wxWindowID id, const wxString &title, - const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr ); - bool Create( wxWindow *parent, wxWindowID id, const wxString &title, - const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr ); - ~wxFrame(); - bool Destroy(); - - virtual bool Show( bool show ); - virtual void Centre( int direction = wxHORIZONTAL ); - - virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0, - const wxString& name = _T("statusBar")); - virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id, - const wxString& name ); - virtual wxStatusBar *GetStatusBar() const; - inline void SetStatusBar(wxStatusBar *statusBar) { m_frameStatusBar = statusBar; } - virtual void SetStatusText( const wxString &text, int number = 0 ); - virtual void SetStatusWidths( int n, const int widths_field[] ); - - virtual wxToolBar* CreateToolBar( long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1, - const wxString& name = wxToolBarNameStr); - virtual wxToolBar *OnCreateToolBar( long style, wxWindowID id, const wxString& name ); - virtual wxToolBar *GetToolBar() const; - inline void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; } - - virtual void SetMenuBar( wxMenuBar *menuBar ); - virtual wxMenuBar *GetMenuBar() const; - - virtual void SetTitle( const wxString &title ); - virtual wxString GetTitle() const { return m_title; } - - virtual void SetIcon( const wxIcon &icon ); - virtual void Iconize( bool WXUNUSED(iconize)) { } - virtual bool IsIconized() const { return FALSE; } - bool Iconized() const { return IsIconized(); } - virtual void Maximize(bool WXUNUSED(maximize)) {} - virtual void Restore() {} - - virtual void Command( int id ); + // construction + wxFrame() { Init(); } + wxFrame(wxWindow *parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDEFAULT_FRAME_STYLE, + const wxString& name = wxFrameNameStr) + { + Init(); + + Create(parent, id, title, pos, size, style, name); + } + + bool Create(wxWindow *parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDEFAULT_FRAME_STYLE, + const wxString& name = wxFrameNameStr); + + virtual ~wxFrame(); + +#if wxUSE_STATUSBAR + virtual void PositionStatusBar(); + + 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 - void OnCloseWindow( wxCloseEvent& event ); - void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp - void OnSize( wxSizeEvent &event ); + wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); } - void OnMenuHighlight( wxMenuEvent& event ); - - // implementation + // implementation from now on + // -------------------------- + // GTK callbacks virtual void GtkOnSize( int x, int y, int width, int height ); - void DoMenuUpdates(); - void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin); virtual void OnInternalIdle(); - wxMenuBar *m_frameMenuBar; - wxStatusBar *m_frameStatusBar; - wxToolBar *m_frameToolBar; - wxString m_title; - wxIcon m_icon; - int m_miniEdge,m_miniTitle; - GtkWidget *m_mainWidget; bool m_menuBarDetached; + int m_menuBarHeight; bool m_toolBarDetached; - bool m_insertInClientArea; /* not from within OnCreateXXX */ protected: - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); + // 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; -private: - DECLARE_EVENT_TABLE() +#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 + + DECLARE_DYNAMIC_CLASS(wxFrame) }; #endif // __GTKFRAMEH__