removed const operator[]s (should fix 1162115)

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

diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h
index 94f7b090b19a5eac6ea1a09da5c1068cc496e9bc..03f550957e305690104de4bf80502e3b9109fc06 100644 (file)
--- a/include/wx/univ/frame.h
+++ b/include/wx/univ/frame.h
@@ -23,14 +23,17 @@
 class WXDLLEXPORT wxFrame : public wxFrameBase
 {
 public:
 class WXDLLEXPORT wxFrame : public wxFrameBase
 {
 public:

-    wxFrame();
+    wxFrame() {}

     wxFrame(wxWindow *parent,
             wxWindowID id,
             const wxString& title,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxDEFAULT_FRAME_STYLE,
     wxFrame(wxWindow *parent,
             wxWindowID id,
             const wxString& title,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxDEFAULT_FRAME_STYLE,

-            const wxString& name = wxFrameNameStr);
+            const wxString& name = wxFrameNameStr)
+    {
+        Create(parent, id, title, pos, size, style, name);
+    }

 
     bool Create(wxWindow *parent,
                 wxWindowID id,
 
     bool Create(wxWindow *parent,
                 wxWindowID id,


@@ -41,7 +44,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,7 +56,7 @@ public:
 #if wxUSE_TOOLBAR
     // create main toolbar bycalling OnCreateToolBar()
     virtual wxToolBar* CreateToolBar(long style = -1,
 #if wxUSE_TOOLBAR
     // create main toolbar bycalling OnCreateToolBar()
     virtual wxToolBar* CreateToolBar(long style = -1,

-                                     wxWindowID id = -1,
+                                     wxWindowID id = wxID_ANY,

                                      const wxString& name = wxToolBarNameStr);
     virtual void PositionToolBar();
 #endif // wxUSE_TOOLBAR
                                      const wxString& name = wxToolBarNameStr);
     virtual void PositionToolBar();
 #endif // wxUSE_TOOLBAR


@@ -66,6 +69,7 @@ public:
 
 protected:
     void OnSize(wxSizeEvent& event);
 
 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);