Warning fixes, source cleaning.

[wxWidgets.git] / contrib / include / wx / stc / stc.h

diff --git a/contrib/include/wx/stc/stc.h b/contrib/include/wx/stc/stc.h
index 6d17fd87efba013a5dae0e215214d9ff07215242..32b6b7bf34fd5e8cb42c01d0252a83466fa56a56 100644 (file)
--- a/contrib/include/wx/stc/stc.h
+++ b/contrib/include/wx/stc/stc.h
@@ -1311,14 +1311,14 @@ public:
     %pythonAppend wxStyledTextCtrl   "self._setOORInfo(self)"
     %pythonAppend wxStyledTextCtrl() ""
 
     %pythonAppend wxStyledTextCtrl   "self._setOORInfo(self)"
     %pythonAppend wxStyledTextCtrl() ""
 

-    wxStyledTextCtrl(wxWindow *parent, wxWindowID id,
+    wxStyledTextCtrl(wxWindow *parent, wxWindowID id=wxID_ANY,

                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize, long style = 0,
                      const wxString& name = wxPySTCNameStr);
     %name(PreStyledTextCtrl) wxStyledTextCtrl();
     
 #else
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize, long style = 0,
                      const wxString& name = wxPySTCNameStr);
     %name(PreStyledTextCtrl) wxStyledTextCtrl();
     
 #else

-    wxStyledTextCtrl(wxWindow *parent, wxWindowID id,
+    wxStyledTextCtrl(wxWindow *parent, wxWindowID id=wxID_ANY,

                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize, long style = 0,
                      const wxString& name = wxSTCNameStr);
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize, long style = 0,
                      const wxString& name = wxSTCNameStr);


@@ -1327,7 +1327,7 @@ public:
     
 #endif
 
     
 #endif
 

-    void Create(wxWindow *parent, wxWindowID id,
+    void Create(wxWindow *parent, wxWindowID id=wxID_ANY,

                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize, long style = 0,
                      const wxString& name = wxSTCNameStr);
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize, long style = 0,
                      const wxString& name = wxSTCNameStr);


@@ -2730,6 +2730,7 @@ private:
     void OnListBox(wxCommandEvent& evt);
     void OnIdle(wxIdleEvent& evt);
     
     void OnListBox(wxCommandEvent& evt);
     void OnIdle(wxIdleEvent& evt);
     

+    virtual wxSize DoGetBestSize() const;

 
     // Turn notifications from Scintilla into events
     void NotifyChange();
 
     // Turn notifications from Scintilla into events
     void NotifyChange();