Fixed initialisation order warning

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

diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h
index 8a5617f53e393636cc4e7c23e861fb61ce4085aa..1335647d82422782f8637e0bfccd4b9dd179f6c6 100644 (file)
--- a/include/wx/univ/frame.h
+++ b/include/wx/univ/frame.h
@@ -12,10 +12,6 @@
 #ifndef _WX_UNIV_FRAME_H_
 #define _WX_UNIV_FRAME_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univframe.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // wxFrame
 // ----------------------------------------------------------------------------
@@ -58,7 +54,6 @@ public:
     virtual wxToolBar* CreateToolBar(long style = -1,
                                      wxWindowID id = wxID_ANY,
                                      const wxString& name = wxToolBarNameStr);
-    virtual void PositionToolBar();
 #endif // wxUSE_TOOLBAR
 
     virtual int GetMinWidth() const;
@@ -69,6 +64,7 @@ public:
 
 protected:
     void OnSize(wxSizeEvent& event);
+    void OnSysColourChanged(wxSysColourChangedEvent& event);
 
     virtual void DoGetClientSize(int *width, int *height) const;
     virtual void DoSetClientSize(int width, int height);
@@ -85,6 +81,11 @@ protected:
     virtual void PositionStatusBar();
 #endif // wxUSE_MENUS
 
+protected:
+#if wxUSE_TOOLBAR
+    virtual void PositionToolBar();
+#endif // wxUSE_TOOLBAR
+
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxFrame)
 };