X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..3f434666bf9476e7fc6c27de94075211db5f1417:/include/wx/gtk1/frame.h diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h index d4ec4bc940..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,30 +7,25 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __GTKFRAMEH__ #define __GTKFRAMEH__ -#if defined(__GNUG__) && !defined(__APPLE__) - #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; //----------------------------------------------------------------------------- // wxFrame //----------------------------------------------------------------------------- -class wxFrame : public wxFrameBase +class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase { public: // construction @@ -62,18 +57,20 @@ public: 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 - + wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); } // implementation from now on