abandon attempts to make wxAnyStrPtr behave as bool: user-defined logical operators...

[wxWidgets.git] / interface / wx / stc / stc.h

diff --git a/interface/wx/stc/stc.h b/interface/wx/stc/stc.h
index f936debde1625843abe0273f409fc3fa37e57408..ff4494dcf98fdc178cafebe848e20695965efee3 100644 (file)
--- a/interface/wx/stc/stc.h
+++ b/interface/wx/stc/stc.h
@@ -14,7 +14,7 @@
     @todo list styled text ctrl events.
 
     @library{wxbase}
     @todo list styled text ctrl events.
 
     @library{wxbase}

-    @category{events}
+    @category{events,stc}

 */
 class wxStyledTextEvent : public wxCommandEvent
 {
 */
 class wxStyledTextEvent : public wxCommandEvent
 {


@@ -263,7 +263,7 @@ public:
     wxStyledTextCtrl is a 1 to 1 mapping of "raw" scintilla interface, whose
     documentation can be found in the Scintilla website (http://www.scintilla.org/).
 
     wxStyledTextCtrl is a 1 to 1 mapping of "raw" scintilla interface, whose
     documentation can be found in the Scintilla website (http://www.scintilla.org/).
 

-    @beginEventTable{wxStyledTextEvent}
+    @beginEventEmissionTable{wxStyledTextEvent}

     @event{EVT_STC_CHANGE(id, fn)}
         TOWRITE
     @event{EVT_STC_STYLENEEDED(id, fn)}
     @event{EVT_STC_CHANGE(id, fn)}
         TOWRITE
     @event{EVT_STC_STYLENEEDED(id, fn)}


@@ -331,10 +331,10 @@ public:
     */
     wxStyledTextCtrl::wxStyledTextCtrl(wxWindow* parent,
                                        wxWindowID id = wxID_ANY,
     */
     wxStyledTextCtrl::wxStyledTextCtrl(wxWindow* parent,
                                        wxWindowID id = wxID_ANY,

-                                       const wxPoint pos = wxDefaultPosition,
-                                       const wxSize size = wxDefaultSize,
+                                       const wxPoint& pos = wxDefaultPosition,
+                                       const wxSize& size = wxDefaultSize,

                                        long style = 0,
                                        long style = 0,

-                                       const wxString name = "stcwindow");
+                                       const wxString& name = wxSTCNameStr);

 
     /**
         Extend life of document.
 
     /**
         Extend life of document.


@@ -597,7 +597,7 @@ public:
     /**
         Will a paste succeed?
     */
     /**
         Will a paste succeed?
     */

-    bool CanPaste();
+    virtual bool CanPaste() const;

 
     /**
         Are there any redoable actions in the undo history?
 
     /**
         Are there any redoable actions in the undo history?