Tidy up includes and #if wxUSE statements.

[wxWidgets.git] / include / wx / gtk / frame.h

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index 94949f2d67cdb0e8cd3c24891e017af7efb4554e..c052cd6388fa239ebcce5a9832854ecc3eed5717 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -7,8 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKFRAMEH__
-#define __GTKFRAMEH__
+#ifndef _WX_GTK_FRAME_H_
+#define _WX_GTK_FRAME_H_
 
 //-----------------------------------------------------------------------------
 // classes
@@ -54,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,
@@ -77,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;
@@ -88,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;
@@ -106,4 +108,4 @@ public:
     DECLARE_DYNAMIC_CLASS(wxFrame)
 };
 
-#endif // __GTKFRAMEH__
+#endif // _WX_GTK_FRAME_H_