wxSocket::Initialize() and Shutdown() are for main thread only.

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

diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index bbddab8c19363eae66d4e2f1afe444d83a46f3f0..f7497f28d9eab5bbc9a63806b1b2b431cb82a2bd 100644 (file)
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -61,7 +61,7 @@
     wxDataViewIndexListModel, wxDataViewVirtualListModel, wxDataViewTreeStore,
     wxDataViewListStore.
 
     wxDataViewIndexListModel, wxDataViewVirtualListModel, wxDataViewTreeStore,
     wxDataViewListStore.
 

-    Note that wxDataViewModel is reference counted, derives from wxObjectRefData
+    Note that wxDataViewModel is reference counted, derives from wxRefCounter

     and cannot be deleted directly as it can be shared by several wxDataViewCtrls.
     This implies that you need to decrease the reference count after
     associating the model with a control like this:
     and cannot be deleted directly as it can be shared by several wxDataViewCtrls.
     This implies that you need to decrease the reference count after
     associating the model with a control like this:


@@ -78,7 +78,7 @@
     @library{wxadv}
     @category{dvc}
 */
     @library{wxadv}
     @category{dvc}
 */

-class wxDataViewModel : public wxObjectRefData
+class wxDataViewModel : public wxRefCounter

 {
 public:
     /**
 {
 public:
     /**


@@ -107,7 +107,7 @@ public:
     virtual int Compare(const wxDataViewItem& item1,
                         const wxDataViewItem& item2,
                         unsigned int column,
     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.
 
     /**
         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.
            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)}
     @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)}


@@ -1456,7 +1460,7 @@ enum wxDataViewColumnFlags
     @library{wxadv}
     @category{dvc}
 */
     @library{wxadv}
     @category{dvc}
 */

-class wxDataViewColumn : public wxHeaderColumn
+class wxDataViewColumn : public wxSettableHeaderColumn

 {
 public:
     /**
 {
 public:
     /**


@@ -2314,6 +2318,8 @@ public:
            Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE event.
     @event{EVT_DATAVIEW_ITEM_DROP(id, func)}
            Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_DROP event.
            Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE event.
     @event{EVT_DATAVIEW_ITEM_DROP(id, func)}
            Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_DROP event.

+    @event{EVT_DATAVIEW_CACHE_HINT(id, func)}
+           Process a @c wxEVT_COMMAND_DATAVIEW_CACHE_HINT event.

     @endEventTable
     
     @library{wxadv}
     @endEventTable
     
     @library{wxadv}


@@ -2415,5 +2421,15 @@ public:
         Gets the data buffer for a drop data transfer.
     */
     void *GetDataBuffer() const;
         Gets the data buffer for a drop data transfer.
     */
     void *GetDataBuffer() const;

+
+    /**
+        Return the first row that will be displayed.
+    */
+    int GetCacheFrom() const;
+
+    /**
+        Return the last row that will be displayed.
+    */
+    int GetCacheTo() const;

 };
 
 };