X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ddb6bc71266486f2e7222915740393eddea620f5..5ea4780630b335a1b8b2d3a94c0b82e46f4c56f6:/include/wx/gtk1/frame.h diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h index aa968fe867..b69144382b 100644 --- a/include/wx/gtk1/frame.h +++ b/include/wx/gtk1/frame.h @@ -62,6 +62,7 @@ public: virtual bool Show( bool show ); virtual void Centre( int direction = wxHORIZONTAL ); +#if wxUSE_STATUSBAR 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, @@ -70,12 +71,15 @@ public: 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[] ); +#endif // wxUSE_STATUSBAR +#if wxUSE_TOOLBAR 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; } + void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; } +#endif // wxUSE_TOOLBAR virtual void SetMenuBar( wxMenuBar *menuBar ); virtual wxMenuBar *GetMenuBar() const; @@ -109,8 +113,12 @@ public: virtual void OnInternalIdle(); wxMenuBar *m_frameMenuBar; +#if wxUSE_STATUSBAR wxStatusBar *m_frameStatusBar; +#endif +#if wxUSE_TOOLBAR wxToolBar *m_frameToolBar; +#endif wxString m_title; wxIcon m_icon; int m_miniEdge,m_miniTitle;