cleaning up problems after string changes

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

diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h
index 6e9b24f1d5112130306a71b586a1014b888caa11..d53d940e1be8d5e60c4d06583f70c0834857d577 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_
 
 #ifndef _WX_UNIV_FRAME_H_
 #define _WX_UNIV_FRAME_H_
 

-#ifdef __GNUG__
-    #pragma interface "univframe.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // wxFrame
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFrame
 // ----------------------------------------------------------------------------


@@ -44,7 +40,7 @@ public:
                 const wxString& name = wxFrameNameStr);
 
     virtual wxPoint GetClientAreaOrigin() const;
                 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,
 
 #if wxUSE_STATUSBAR
     virtual wxStatusBar* CreateStatusBar(int number = 1,


@@ -53,12 +49,21 @@ public:
                                          const wxString& name = wxStatusLineNameStr);
 #endif // wxUSE_STATUSBAR
 
                                          const wxString& name = wxStatusLineNameStr);
 #endif // wxUSE_STATUSBAR
 

+#if wxUSE_TOOLBAR
+    // create main toolbar bycalling OnCreateToolBar()
+    virtual wxToolBar* CreateToolBar(long style = -1,
+                                     wxWindowID id = wxID_ANY,
+                                     const wxString& name = wxToolBarNameStr);
+#endif // wxUSE_TOOLBAR

 
 

-protected:
-    void OnSize(wxSizeEvent& event);
+    virtual wxSize GetMinSize() const;

 
     // sends wxSizeEvent to itself (used after attaching xxxBar)
 
     // sends wxSizeEvent to itself (used after attaching xxxBar)

-    void SendSizeEvent();
+    virtual void SendSizeEvent();
+
+protected:
+    void OnSize(wxSizeEvent& event);
+    void OnSysColourChanged(wxSysColourChangedEvent& event);

 
     virtual void DoGetClientSize(int *width, int *height) const;
     virtual void DoSetClientSize(int width, int height);
 
     virtual void DoGetClientSize(int *width, int *height) const;
     virtual void DoSetClientSize(int width, int height);


@@ -75,6 +80,11 @@ protected:
     virtual void PositionStatusBar();
 #endif // wxUSE_MENUS
 
     virtual void PositionStatusBar();
 #endif // wxUSE_MENUS
 

+protected:
+#if wxUSE_TOOLBAR
+    virtual void PositionToolBar();
+#endif // wxUSE_TOOLBAR
+

     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxFrame)
 };
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxFrame)
 };