undo the last change as it results in buildbot configuration error

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

diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index 16d5ef6e3eff595ff207b5f090357297bf3bca29..79db099c1fb399defcf11fb453cf1183c263e63f 100644 (file)
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -107,7 +107,7 @@ public:
     virtual int Compare(const wxDataViewItem& item1,
                         const wxDataViewItem& item2,
                         unsigned int column,
-                        bool ascending);
+                        bool ascending) const;
 
     /**
         Override this to indicate that the item has special font attributes.
@@ -530,6 +530,10 @@ public:
            Process a @c wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED event.
     @event{EVT_DATAVIEW_ITEM_ACTIVATED(id, func)}
            Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED event.
+    @event{EVT_DATAVIEW_ITEM_START_EDITING(id, func)}
+           Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED event. This
+           event can be vetoed in order to prevent editing on an item by item
+           basis. Still experimental.
     @event{EVT_DATAVIEW_ITEM_EDITING_STARTED(id, func)}
            Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED event.
     @event{EVT_DATAVIEW_ITEM_EDITING_DONE(id, func)}
@@ -1373,7 +1377,7 @@ public:
         Override this and make it return @true in order to
         indicate that this renderer supports in-place editing.
     */
-    virtual bool HasEditorCtrl();
+    virtual bool HasEditorCtrl() const;
 
     /**
         Overrride this to react to a left click.
@@ -1456,7 +1460,7 @@ enum wxDataViewColumnFlags
     @library{wxadv}
     @category{dvc}
 */
-class wxDataViewColumn : public wxHeaderColumn
+class wxDataViewColumn : public wxSettableHeaderColumn
 {
 public:
     /**