X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20123d495814b8b8543bf43fbd63aa7ec21e5d78..79b83ef08503bf1b546ad9df919ffd0ebf462cd7:/include/wx/gtk/frame.h?ds=sidebyside diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h index a8f91cb9ce..c052cd6388 100644 --- a/include/wx/gtk/frame.h +++ b/include/wx/gtk/frame.h @@ -7,13 +7,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKFRAMEH__ -#define __GTKFRAMEH__ - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "frame.h" -#endif +#ifndef _WX_GTK_FRAME_H_ +#define _WX_GTK_FRAME_H_ //----------------------------------------------------------------------------- // classes @@ -59,8 +54,6 @@ public: 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, @@ -82,7 +75,7 @@ public: // -------------------------- // GTK callbacks - virtual void GtkOnSize( int x, int y, int width, int height ); + virtual void GtkOnSize(); virtual void OnInternalIdle(); bool m_menuBarDetached; @@ -93,6 +86,10 @@ protected: // common part of all ctors void Init(); +#if wxUSE_STATUSBAR + virtual void PositionStatusBar(); +#endif // wxUSE_STATUSBAR + // 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; @@ -111,4 +108,4 @@ public: DECLARE_DYNAMIC_CLASS(wxFrame) }; -#endif // __GTKFRAMEH__ +#endif // _WX_GTK_FRAME_H_