Cleanup of previous fix

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

diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h
index a181bba996084f7ed949eba8d5d2573be0384047..cd75831ca02d52c17aeb115646065d100bc1aa0a 100644 (file)
--- a/include/wx/univ/frame.h
+++ b/include/wx/univ/frame.h
@@ -12,15 +12,11 @@
 #ifndef _WX_UNIV_FRAME_H_
 #define _WX_UNIV_FRAME_H_
 
-#ifdef __GNUG__
-    #pragma interface "univframe.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // wxFrame
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFrame : public wxFrameBase
+class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase
 {
 public:
     wxFrame() {}
@@ -44,7 +40,7 @@ public:
                 const wxString& name = wxFrameNameStr);
 
     virtual wxPoint GetClientAreaOrigin() const;
-    virtual bool Enable(bool enable = TRUE);
+    virtual bool Enable(bool enable = true);
 
 #if wxUSE_STATUSBAR
     virtual wxStatusBar* CreateStatusBar(int number = 1,
@@ -55,20 +51,16 @@ public:
 
 #if wxUSE_TOOLBAR
     // create main toolbar bycalling OnCreateToolBar()
-    virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL,
-                                     wxWindowID id = -1,
+    virtual wxToolBar* CreateToolBar(long style = -1,
+                                     wxWindowID id = wxID_ANY,
                                      const wxString& name = wxToolBarNameStr);
-    virtual void PositionToolBar();
 #endif // wxUSE_TOOLBAR
 
-    virtual int GetMinWidth() const;
-    virtual int GetMinHeight() const;
+    virtual wxSize GetMinSize() const;
 
 protected:
     void OnSize(wxSizeEvent& event);
-
-    // sends wxSizeEvent to itself (used after attaching xxxBar)
-    void SendSizeEvent();
+    void OnSysColourChanged(wxSysColourChangedEvent& event);
 
     virtual void DoGetClientSize(int *width, int *height) const;
     virtual void DoSetClientSize(int width, int height);
@@ -85,6 +77,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)
 };