Fix typo in wxStandardPathsBase::ResourceCat description and document it.

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

diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index c4ac26a10b3385d9e618a8027ec756d284bb3da4..bfbf14018c8bed1e8f82b3ae37c2c481362ace86 100644 (file)
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxDataView* classes
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxDataView* classes
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -20,17 +20,26 @@
     wxDataViewModel::GetValue in order to define the data model which acts as an
     interface between your actual data and the wxDataViewCtrl.
 
     wxDataViewModel::GetValue in order to define the data model which acts as an
     interface between your actual data and the wxDataViewCtrl.
 

-    Since you will usually also allow the wxDataViewCtrl to change your data
-    through its graphical interface, you will also have to override
-    wxDataViewModel::SetValue which the wxDataViewCtrl will call when a change
-    to some data has been commited.
+    Note that wxDataViewModel does not define the position or index of any item
+    in the control because different controls might display the same data differently.
+    wxDataViewModel does provide a wxDataViewModel::Compare method which the
+    wxDataViewCtrl may use to sort the data either in conjunction with a column
+    header or without (see wxDataViewModel::HasDefaultCompare).

 
     wxDataViewModel (as indeed the entire wxDataViewCtrl code) is using wxVariant
     to store data and its type in a generic way. wxVariant can be extended to contain
 
     wxDataViewModel (as indeed the entire wxDataViewCtrl code) is using wxVariant
     to store data and its type in a generic way. wxVariant can be extended to contain

-    almost any data without changes to the original class.
+    almost any data without changes to the original class. To a certain extent,
+    you can use (the somewhat more elegant) wxAny instead of wxVariant as there
+    is code to convert between the two, but it is unclear what impact this will
+    have on performance.

 
 

-    The data that is presented through this data model is expected to change at
-    run-time. You need to inform the data model when a change happened.
+    Since you will usually allow the wxDataViewCtrl to change your data
+    through its graphical interface, you will also have to override
+    wxDataViewModel::SetValue which the wxDataViewCtrl will call when a change
+    to some data has been committed.
+
+    If the data represented by the model is changed by something else than its
+    associated wxDataViewCtrl, the control has to be notified about the change.

     Depending on what happened you need to call one of the following methods:
     - wxDataViewModel::ValueChanged,
     - wxDataViewModel::ItemAdded,
     Depending on what happened you need to call one of the following methods:
     - wxDataViewModel::ValueChanged,
     - wxDataViewModel::ItemAdded,


@@ -44,12 +53,6 @@
     - wxDataViewModel::ItemsDeleted,
     - wxDataViewModel::ItemsChanged.
 
     - wxDataViewModel::ItemsDeleted,
     - wxDataViewModel::ItemsChanged.
 

-    Note that wxDataViewModel does not define the position or index of any item
-    in the control because different controls might display the same data differently.
-    wxDataViewModel does provide a wxDataViewModel::Compare method which the
-    wxDataViewCtrl may use to sort the data either in conjunction with a column
-    header or without (see wxDataViewModel::HasDefaultCompare).
-

     This class maintains a list of wxDataViewModelNotifier which link this class
     to the specific implementations on the supported platforms so that e.g. calling
     wxDataViewModel::ValueChanged on this model will just call
     This class maintains a list of wxDataViewModelNotifier which link this class
     to the specific implementations on the supported platforms so that e.g. calling
     wxDataViewModel::ValueChanged on this model will just call


@@ -61,16 +64,29 @@
     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:
 
     @code
     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:
 
     @code

-        wxDataViewCtrl *musicCtrl = new wxDataViewCtrl( this, ID_MUSIC_CTRL );
+        wxDataViewCtrl *musicCtrl = new wxDataViewCtrl( this, wxID_ANY );

         wxDataViewModel *musicModel = new MyMusicModel;
         wxDataViewModel *musicModel = new MyMusicModel;

-        m_musicCtrl-AssociateModel( musicModel );
-        musicModel-DecRef();  // avoid memory leak !!
+        m_musicCtrl->AssociateModel( musicModel );
+        musicModel->DecRef();  // avoid memory leak !!
+
+        // add columns now
+    @endcode
+
+    A potentially better way to avoid memory leaks is to use wxObjectDataPtr
+    
+    @code
+        wxObjectDataPtr<MyMusicModel> musicModel;
+        
+        wxDataViewCtrl *musicCtrl = new wxDataViewCtrl( this, wxID_ANY );
+        musicModel = new MyMusicModel;
+        m_musicCtrl->AssociateModel( musicModel.get() );
+

         // add columns now
     @endcode
 
         // add columns now
     @endcode
 


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

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

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


@@ -91,6 +107,28 @@ public:
     */
     void AddNotifier(wxDataViewModelNotifier* notifier);
 
     */
     void AddNotifier(wxDataViewModelNotifier* notifier);
 

+    /**
+        Change the value of the given item and update the control to reflect
+        it.
+
+        This function simply calls SetValue() and, if it succeeded,
+        ValueChanged().
+
+        @since 2.9.1
+
+        @param variant
+            The new value.
+        @param item
+            The item (row) to update.
+        @param col
+            The column to update.
+        @return
+            @true if both SetValue() and ValueChanged() returned @true.
+     */
+    bool ChangeValue(const wxVariant& variant,
+                     const wxDataViewItem& item,
+                     unsigned int col);
+

     /**
         Called to inform the model that all data has been cleared.
         The control will reread the data from the model again.
     /**
         Called to inform the model that all data has been cleared.
         The control will reread the data from the model again.


@@ -107,16 +145,27 @@ 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.
         This only affects the wxDataViewTextRendererText renderer.
 
 
     /**
         Override this to indicate that the item has special font attributes.
         This only affects the wxDataViewTextRendererText renderer.
 

+        The base class version always simply returns @false.
+

         @see wxDataViewItemAttr.
         @see wxDataViewItemAttr.

+
+        @param item
+            The item for which the attribute is requested.
+        @param col
+            The column of the item for which the attribute is requested.
+        @param attr
+            The attribute to be filled in if the function returns @true.
+        @return
+            @true if this item has an attribute or @false otherwise.

     */
     virtual bool GetAttr(const wxDataViewItem& item, unsigned int col,
     */
     virtual bool GetAttr(const wxDataViewItem& item, unsigned int col,

-                         wxDataViewItemAttr& attr);
+                         wxDataViewItemAttr& attr) const;

 
     /**
         Override this so the control can query the child items of an item.
 
     /**
         Override this so the control can query the child items of an item.


@@ -171,6 +220,20 @@ public:
     */
     virtual bool HasDefaultCompare() const;
 
     */
     virtual bool HasDefaultCompare() const;
 

+    /**
+        Return true if there is a value in the given column of this item.
+
+        All normal items have values in all columns but the container items
+        only show their label in the first column (@a col == 0) by default (but
+        see HasContainerColumns()). So this function always returns true for
+        the first column while for the other ones it returns true only if the
+        item is not a container or HasContainerColumns() was overridden to
+        return true for it.
+
+        @since 2.9.1
+     */
+    bool HasValue(const wxDataViewItem& item, unsigned col) const;
+

     /**
         Override this to indicate of @a item is a container, i.e. if
         it can have child items.
     /**
         Override this to indicate of @a item is a container, i.e. if
         it can have child items.


@@ -180,7 +243,7 @@ public:
     /**
         Call this to inform the model that an item has been added to the data.
     */
     /**
         Call this to inform the model that an item has been added to the data.
     */

-    virtual bool ItemAdded(const wxDataViewItem& parent,
+    bool ItemAdded(const wxDataViewItem& parent,

                            const wxDataViewItem& item);
 
     /**
                            const wxDataViewItem& item);
 
     /**


@@ -189,18 +252,18 @@ public:
         This will eventually emit a wxEVT_DATAVIEW_ITEM_VALUE_CHANGED
         event (in which the column fields will not be set) to the user.
     */
         This will eventually emit a wxEVT_DATAVIEW_ITEM_VALUE_CHANGED
         event (in which the column fields will not be set) to the user.
     */

-    virtual bool ItemChanged(const wxDataViewItem& item);
+    bool ItemChanged(const wxDataViewItem& item);

 
     /**
         Call this to inform the model that an item has been deleted from the data.
     */
 
     /**
         Call this to inform the model that an item has been deleted from the data.
     */

-    virtual bool ItemDeleted(const wxDataViewItem& parent,
+    bool ItemDeleted(const wxDataViewItem& parent,

                              const wxDataViewItem& item);
 
     /**
         Call this to inform the model that several items have been added to the data.
     */
                              const wxDataViewItem& item);
 
     /**
         Call this to inform the model that several items have been added to the data.
     */

-    virtual bool ItemsAdded(const wxDataViewItem& parent,
+    bool ItemsAdded(const wxDataViewItem& parent,

                             const wxDataViewItemArray& items);
 
     /**
                             const wxDataViewItemArray& items);
 
     /**


@@ -209,12 +272,12 @@ public:
         This will eventually emit wxEVT_DATAVIEW_ITEM_VALUE_CHANGED
         events (in which the column fields will not be set) to the user.
     */
         This will eventually emit wxEVT_DATAVIEW_ITEM_VALUE_CHANGED
         events (in which the column fields will not be set) to the user.
     */

-    virtual bool ItemsChanged(const wxDataViewItemArray& items);
+    bool ItemsChanged(const wxDataViewItemArray& items);

 
     /**
         Call this to inform the model that several items have been deleted.
     */
 
     /**
         Call this to inform the model that several items have been deleted.
     */

-    virtual bool ItemsDeleted(const wxDataViewItem& parent,
+    bool ItemsDeleted(const wxDataViewItem& parent,

                               const wxDataViewItemArray& items);
 
     /**
                               const wxDataViewItemArray& items);
 
     /**


@@ -229,12 +292,17 @@ public:
 
     /**
         This gets called in order to set a value in the data model.
 
     /**
         This gets called in order to set a value in the data model.

+

         The most common scenario is that the wxDataViewCtrl calls this method
         after the user changed some data in the view.
 
         The most common scenario is that the wxDataViewCtrl calls this method
         after the user changed some data in the view.
 

-        Afterwards ValueChanged() has to be called!
+        This is the function you need to override in your derived class but if
+        you want to call it, ChangeValue() is usually more convenient as
+        otherwise you need to manually call ValueChanged() to update the
+        control itself.

     */
     */

-    virtual bool SetValue(const wxVariant& variant, const wxDataViewItem& item,
+    virtual bool SetValue(const wxVariant& variant,
+                          const wxDataViewItem& item,

                           unsigned int col) = 0;
 
     /**
                           unsigned int col) = 0;
 
     /**


@@ -259,28 +327,17 @@ protected:
 
 
 /**
 
 
 /**

-    @class wxDataViewIndexListModel
-
-    wxDataViewIndexListModel is a specialized data model which lets you address
-    an item by its position (row) rather than its wxDataViewItem (which you can
-    obtain from this class).
-    This model also provides its own wxDataViewIndexListModel::Compare
-    method which sorts the model's data by the index.
+    @class wxDataViewListModel

 
 

-    This model is not a virtual model since the control stores each wxDataViewItem.
-    Use wxDataViewVirtualListModel if you need to display millions of items or
-    have other reason to use a virtual control.
+    Base class with abstract API for wxDataViewIndexListModel and
+    wxDataViewVirtualListModel.

 
     @library{wxadv}
     @category{dvc}
 */
 
     @library{wxadv}
     @category{dvc}
 */

-class wxDataViewIndexListModel : public wxDataViewModel
+class wxDataViewListModel : public wxDataViewModel

 {
 public:
 {
 public:

-    /**
-        Constructor.
-    */
-    wxDataViewIndexListModel(unsigned int initial_size = 0);

 
     /**
         Destructor.
 
     /**
         Destructor.


@@ -298,10 +355,26 @@ public:
         Override this to indicate that the row has special font attributes.
         This only affects the wxDataViewTextRendererText() renderer.
 
         Override this to indicate that the row has special font attributes.
         This only affects the wxDataViewTextRendererText() renderer.
 

+        The base class version always simply returns @false.
+

         @see wxDataViewItemAttr.
         @see wxDataViewItemAttr.

+
+        @param row
+            The row for which the attribute is requested.
+        @param col
+            The column for which the attribute is requested.
+        @param attr
+            The attribute to be filled in if the function returns @true.
+        @return
+            @true if this item has an attribute or @false otherwise.

     */
     virtual bool GetAttrByRow(unsigned int row, unsigned int col,
     */
     virtual bool GetAttrByRow(unsigned int row, unsigned int col,

-                         wxDataViewItemAttr& attr);
+                         wxDataViewItemAttr& attr) const;
+
+    /**
+        Returns the number of items (i.e. rows) in the list.
+    */
+    unsigned int GetCount() const;

 
     /**
         Returns the wxDataViewItem at the given @e row.
 
     /**
         Returns the wxDataViewItem at the given @e row.


@@ -371,6 +444,34 @@ public:
 };
 
 
 };
 
 

+/**
+    @class wxDataViewIndexListModel
+
+    wxDataViewIndexListModel is a specialized data model which lets you address
+    an item by its position (row) rather than its wxDataViewItem (which you can
+    obtain from this class).
+    This model also provides its own wxDataViewIndexListModel::Compare
+    method which sorts the model's data by the index.
+
+    This model is not a virtual model since the control stores each wxDataViewItem.
+    Use wxDataViewVirtualListModel if you need to display millions of items or
+    have other reason to use a virtual control.
+
+    @see wxDataViewListModel for the API.
+    
+    @library{wxadv}
+    @category{dvc}
+*/
+
+class wxDataViewIndexListModel : public wxDataViewListModel
+{
+public:
+    /**
+        Constructor.
+    */
+    wxDataViewIndexListModel(unsigned int initial_size = 0);
+
+};

 
 /**
     @class wxDataViewVirtualListModel
 
 /**
     @class wxDataViewVirtualListModel


@@ -380,21 +481,22 @@ public:
     the exact same interface as wxDataViewIndexListModel.
     The important difference is that under platforms other than OS X, using this
     model will result in a truly virtual control able to handle millions of items
     the exact same interface as wxDataViewIndexListModel.
     The important difference is that under platforms other than OS X, using this
     model will result in a truly virtual control able to handle millions of items

-    as the control doesn't store any item (a feature not supported by the
-    Carbon API under OS X).
+    as the control doesn't store any item (a feature not supported by OS X).

 
 

-    @see wxDataViewIndexListModel for the API.
+    @see wxDataViewListModel for the API.

 
     @library{wxadv}
     @category{dvc}
 */
 
     @library{wxadv}
     @category{dvc}
 */

-class wxDataViewVirtualListModel : public wxDataViewModel
+
+class wxDataViewVirtualListModel : public wxDataViewListModel

 {
 public:
     /**
         Constructor.
     */
     wxDataViewVirtualListModel(unsigned int initial_size = 0);
 {
 public:
     /**
         Constructor.
     */
     wxDataViewVirtualListModel(unsigned int initial_size = 0);

+

 };
 
 
 };
 
 


@@ -441,7 +543,7 @@ public:
     @class wxDataViewItem
 
     wxDataViewItem is a small opaque class that represents an item in a wxDataViewCtrl
     @class wxDataViewItem
 
     wxDataViewItem is a small opaque class that represents an item in a wxDataViewCtrl

-    in a persistent way, i.e. indepent of the position of the item in the control
+    in a persistent way, i.e. independent of the position of the item in the control

     or changes to its contents.
 
     It must hold a unique ID of type @e void* in its only field and can be converted
     or changes to its contents.
 
     It must hold a unique ID of type @e void* in its only field and can be converted


@@ -485,10 +587,10 @@ public:
 
     wxDataViewCtrl is a control to display data either in a tree like fashion or
     in a tabular form or both.
 
     wxDataViewCtrl is a control to display data either in a tree like fashion or
     in a tabular form or both.

-    
+

     If you only need to display a simple tree structure with an API more like the
     older wxTreeCtrl class, then the specialized wxDataViewTreeCtrl can be used.
     If you only need to display a simple tree structure with an API more like the
     older wxTreeCtrl class, then the specialized wxDataViewTreeCtrl can be used.

-    Likewise, if you only want to display simple table structure you can use 
+    Likewise, if you only want to display simple table structure you can use

     the specialized wxDataViewListCtrl class. Both wxDataViewTreeCtrl and
     wxDataViewListCtrl can be used without defining  your own wxDataViewModel.
 
     the specialized wxDataViewListCtrl class. Both wxDataViewTreeCtrl and
     wxDataViewListCtrl can be used without defining  your own wxDataViewModel.
 


@@ -522,44 +624,50 @@ public:
            Display fine rules between columns is supported.
     @style{wxDV_VARIABLE_LINE_HEIGHT}
            Allow variable line heights.
            Display fine rules between columns is supported.
     @style{wxDV_VARIABLE_LINE_HEIGHT}
            Allow variable line heights.

-            This can be inefficient when displaying large number of items.
+           This can be inefficient when displaying large number of items.
+    @style{wxDV_NO_HEADER}
+           Do not show column headers (which are shown by default).

     @endStyleTable
 
     @endStyleTable
 

-    @beginEventTable{wxDataViewEvent}
+    @beginEventEmissionTable{wxDataViewEvent}

     @event{EVT_DATAVIEW_SELECTION_CHANGED(id, func)}
     @event{EVT_DATAVIEW_SELECTION_CHANGED(id, func)}

-           Process a wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED event.
+           Process a @c wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED event.

     @event{EVT_DATAVIEW_ITEM_ACTIVATED(id, func)}
     @event{EVT_DATAVIEW_ITEM_ACTIVATED(id, func)}

-           Process a wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED event.
+           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)}
     @event{EVT_DATAVIEW_ITEM_EDITING_STARTED(id, func)}

-           Process a wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED event.
+           Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED event.

     @event{EVT_DATAVIEW_ITEM_EDITING_DONE(id, func)}
     @event{EVT_DATAVIEW_ITEM_EDITING_DONE(id, func)}

-           Process a wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE event.
+           Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE event.

     @event{EVT_DATAVIEW_ITEM_COLLAPSING(id, func)}
     @event{EVT_DATAVIEW_ITEM_COLLAPSING(id, func)}

-           Process a wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING event.
+           Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING event.

     @event{EVT_DATAVIEW_ITEM_COLLAPSED(id, func)}
     @event{EVT_DATAVIEW_ITEM_COLLAPSED(id, func)}

-           Process a wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED event.
+           Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED event.

     @event{EVT_DATAVIEW_ITEM_EXPANDING(id, func)}
     @event{EVT_DATAVIEW_ITEM_EXPANDING(id, func)}

-           Process a wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING event.
+           Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING event.

     @event{EVT_DATAVIEW_ITEM_EXPANDED(id, func)}
     @event{EVT_DATAVIEW_ITEM_EXPANDED(id, func)}

-           Process a wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED event.
+           Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED event.

     @event{EVT_DATAVIEW_ITEM_VALUE_CHANGED(id, func)}
     @event{EVT_DATAVIEW_ITEM_VALUE_CHANGED(id, func)}

-           Process a wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED event.
+           Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED event.

     @event{EVT_DATAVIEW_ITEM_CONTEXT_MENU(id, func)}
     @event{EVT_DATAVIEW_ITEM_CONTEXT_MENU(id, func)}

-           Process a wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU event.
+           Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU event.

     @event{EVT_DATAVIEW_COLUMN_HEADER_CLICK(id, func)}
     @event{EVT_DATAVIEW_COLUMN_HEADER_CLICK(id, func)}

-           Process a wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICKED event.
+           Process a @c wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICKED event.

     @event{EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK(id, func)}
     @event{EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK(id, func)}

-           Process a wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED event.
+           Process a @c wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED event.

     @event{EVT_DATAVIEW_COLUMN_SORTED(id, func)}
     @event{EVT_DATAVIEW_COLUMN_SORTED(id, func)}

-           Process a wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED event.
+           Process a @c wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED event.

     @event{EVT_DATAVIEW_COLUMN_REORDERED(id, func)}
     @event{EVT_DATAVIEW_COLUMN_REORDERED(id, func)}

-           Process a wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED event.
+           Process a @c wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED event.

     @event{EVT_DATAVIEW_ITEM_BEGIN_DRAG(id, func)}
     @event{EVT_DATAVIEW_ITEM_BEGIN_DRAG(id, func)}

-           Process a wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG event.
+           Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG event.

     @event{EVT_DATAVIEW_ITEM_DROP_POSSIBLE(id, func)}
     @event{EVT_DATAVIEW_ITEM_DROP_POSSIBLE(id, func)}

-           Process a wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE event.
+           Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE event.

     @event{EVT_DATAVIEW_ITEM_DROP(id, func)}
     @event{EVT_DATAVIEW_ITEM_DROP(id, func)}

-           Process a wxEVT_COMMAND_DATAVIEW_ITEM_DROP event.
+           Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_DROP event.

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


@@ -581,7 +689,8 @@ public:
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,

-                   const wxValidator& validator = wxDefaultValidator);
+                   const wxValidator& validator = wxDefaultValidator,
+                   const wxString& name = wxDataViewCtrlNameStr);

 
     /**
         Destructor.
 
     /**
         Destructor.


@@ -762,7 +871,8 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,

-                const wxValidator& validator = wxDefaultValidator);
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxDataViewCtrlNameStr);

 
     /**
         Deletes given column.
 
     /**
         Deletes given column.


@@ -773,12 +883,12 @@ public:
        Enable drag operations using the given @a format.
     */
     virtual bool EnableDragSource( const wxDataFormat &format );
        Enable drag operations using the given @a format.
     */
     virtual bool EnableDragSource( const wxDataFormat &format );

-    
+

     /**
        Enable drop operations using the given @a format.
     */
     virtual bool EnableDropTarget( const wxDataFormat &format );
     /**
        Enable drop operations using the given @a format.
     */
     virtual bool EnableDropTarget( const wxDataFormat &format );

-    
+

     /**
         Call this to ensure that the given item is visible.
     */
     /**
         Call this to ensure that the given item is visible.
     */


@@ -818,6 +928,26 @@ public:
     */
     wxDataViewColumn* GetExpanderColumn() const;
 
     */
     wxDataViewColumn* GetExpanderColumn() const;
 

+    /**
+        Returns the currently focused item.
+
+        This is the item that the keyboard commands apply to. It may be invalid
+        if there is no focus currently.
+
+        This method is mostly useful for the controls with @c wxDV_MULTIPLE
+        style as in the case of single selection it returns the same thing as
+        GetSelection().
+
+        Notice that under all platforms except Mac OS X the currently focused
+        item may be selected or not but under OS X the current item is always
+        selected.
+
+        @see SetCurrentItem()
+
+        @since 2.9.2
+     */
+    wxDataViewItem GetCurrentItem() const;
+

     /**
         Returns indentation.
     */
     /**
         Returns indentation.
     */


@@ -868,6 +998,10 @@ public:
 
     /**
         Select the given item.
 
     /**
         Select the given item.

+
+        In single selection mode this changes the (unique) currently selected
+        item. In multi selection mode, the @a item is selected and the
+        previously selected items remain selected.

     */
     virtual void Select(const wxDataViewItem& item);
 
     */
     virtual void Select(const wxDataViewItem& item);
 


@@ -881,6 +1015,25 @@ public:
     */
     void SetExpanderColumn(wxDataViewColumn* col);
 
     */
     void SetExpanderColumn(wxDataViewColumn* col);
 

+    /**
+        Changes the currently focused item.
+
+        The @a item parameter must be valid, there is no way to remove the
+        current item from the control.
+
+        In single selection mode, calling this method is the same as calling
+        Select() and is thus not very useful. In multiple selection mode this
+        method only moves the current item however without changing the
+        selection except under OS X where the current item is always selected,
+        so calling SetCurrentItem() selects @a item if it hadn't been selected
+        before.
+
+        @see GetCurrentItem()
+
+        @since 2.9.2
+     */
+    void SetCurrentItem(const wxDataViewItem& item);
+

     /**
         Sets the indendation.
     */
     /**
         Sets the indendation.
     */


@@ -1029,13 +1182,13 @@ enum wxDataViewCellRenderState
     One instance of a renderer class is owned by a wxDataViewColumn.
     There is a number of ready-to-use renderers provided:
     - wxDataViewTextRenderer,
     One instance of a renderer class is owned by a wxDataViewColumn.
     There is a number of ready-to-use renderers provided:
     - wxDataViewTextRenderer,

-    - wxDataViewTextRendererAttr,

     - wxDataViewIconTextRenderer,
     - wxDataViewToggleRenderer,
     - wxDataViewProgressRenderer,
     - wxDataViewBitmapRenderer,
     - wxDataViewDateRenderer,
     - wxDataViewSpinRenderer.
     - wxDataViewIconTextRenderer,
     - wxDataViewToggleRenderer,
     - wxDataViewProgressRenderer,
     - wxDataViewBitmapRenderer,
     - wxDataViewDateRenderer,
     - wxDataViewSpinRenderer.

+    - wxDataViewChoiceRenderer.

 
     Additionally, the user can write own renderers by deriving from
     wxDataViewCustomRenderer.
 
     Additionally, the user can write own renderers by deriving from
     wxDataViewCustomRenderer.


@@ -1057,11 +1210,49 @@ public:
                        wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
                        int align = wxDVR_DEFAULT_ALIGNMENT );
 
                        wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
                        int align = wxDVR_DEFAULT_ALIGNMENT );
 

+    /**
+        Enable or disable replacing parts of the item text with ellipsis to
+        make it fit the column width.
+
+        This method only makes sense for the renderers working with text, such
+        as wxDataViewTextRenderer or wxDataViewIconTextRenderer.
+
+        By default wxELLIPSIZE_MIDDLE is used.
+
+        @param mode
+            Ellipsization mode, use wxELLIPSIZE_NONE to disable.
+
+        @since 2.9.1
+     */
+    void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE);
+
+    /**
+        Disable replacing parts of the item text with ellipsis.
+
+        If ellipsizing is disabled, the string will be truncated if it doesn't
+        fit.
+
+        This is the same as @code EnableEllipsize(wxELLIPSIZE_NONE) @endcode.
+
+        @since 2.9.1
+     */
+    void DisableEllipsize();
+

     /**
         Returns the alignment. See SetAlignment()
     */
     virtual int GetAlignment() const;
 
     /**
         Returns the alignment. See SetAlignment()
     */
     virtual int GetAlignment() const;
 

+    /**
+        Returns the ellipsize mode used by the renderer.
+
+        If the return value is wxELLIPSIZE_NONE, the text is simply truncated
+        if it doesn't fit.
+
+        @see EnableEllipsize()
+     */
+    wxEllipsizeMode GetEllipsizeMode() const;
+

     /**
         Returns the cell mode.
     */
     /**
         Returns the cell mode.
     */


@@ -1152,8 +1343,8 @@ public:
     a small icon next to it as it is typically done in a file manager.
 
     This classes uses the wxDataViewIconText helper class to store its data.
     a small icon next to it as it is typically done in a file manager.
 
     This classes uses the wxDataViewIconText helper class to store its data.

-    wxDataViewIonText can be converted to and from a wxVariant using the left shift
-    operator.
+    wxDataViewIconText can be converted to and from a wxVariant using the left
+    shift operator.

 
     @library{wxadv}
     @category{dvc}
 
     @library{wxadv}
     @category{dvc}


@@ -1237,48 +1428,56 @@ public:
 };
 
 
 };
 
 

-

 /**
 /**

-    @class wxDataViewDateRenderer
+    @class wxDataViewChoiceRenderer

 
 

-    This class is used by wxDataViewCtrl to render calendar controls.
+    This class is used by wxDataViewCtrl to render choice controls.
+    It stores a string so that SetValue() and GetValue() operate
+    on a variant holding a string.

 
     @library{wxadv}
     @category{dvc}
 */
 
     @library{wxadv}
     @category{dvc}
 */

-class wxDataViewDateRenderer : public wxDataViewRenderer
+
+class wxDataViewChoiceRenderer: public wxDataViewRenderer

 {
 public:
     /**
         The ctor.
     */
 {
 public:
     /**
         The ctor.
     */

-    wxDataViewDateRenderer(const wxString& varianttype = "datetime",
-                           wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE,
-                           int align = wxDVR_DEFAULT_ALIGNMENT);
-};
+    wxDataViewChoiceRenderer( const wxArrayString &choices,
+                              wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
+                              int alignment = wxDVR_DEFAULT_ALIGNMENT );

 
 

+    /**
+        Returns the choice referred to by index.
+    */
+    wxString GetChoice(size_t index) const;
+    
+    /**
+        Returns all choices.
+    */
+    const wxArrayString& GetChoices() const;
+};

 
 
 /**
 
 
 /**

-    @class wxDataViewTextRendererAttr
-
-    The same as wxDataViewTextRenderer but with support for font attributes.
-    Font attributes are currently only supported under GTK+ and MSW.
+    @class wxDataViewDateRenderer

 
 

-    @see wxDataViewModel::GetAttr and wxDataViewItemAttr.
+    This class is used by wxDataViewCtrl to render calendar controls.

 
     @library{wxadv}
     @category{dvc}
 */
 
     @library{wxadv}
     @category{dvc}
 */

-class wxDataViewTextRendererAttr : public wxDataViewTextRenderer
+class wxDataViewDateRenderer : public wxDataViewRenderer

 {
 public:
     /**
         The ctor.
     */
 {
 public:
     /**
         The ctor.
     */

-    wxDataViewTextRendererAttr(const wxString& varianttype = "string",
-                               wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
-                               int align = wxDVR_DEFAULT_ALIGNMENT);
+    wxDataViewDateRenderer(const wxString& varianttype = "datetime",
+                           wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE,
+                           int align = wxDVR_DEFAULT_ALIGNMENT);

 };
 
 
 };
 
 


@@ -1345,9 +1544,20 @@ public:
                                         const wxVariant& value);
 
     /**
                                         const wxVariant& value);
 
     /**

-        Create DC on request. Internal.
-    */
-    virtual wxDC* GetDC();
+        Return the attribute to be used for rendering.
+
+        This function may be called from Render() implementation to use the
+        attributes defined for the item if the renderer supports them.
+
+        Notice that when Render() is called, the wxDC object passed to it is
+        already set up to use the correct attributes (e.g. its font is set to
+        bold or italic version if wxDataViewItemAttr::GetBold() or GetItalic()
+        returns true) so it may not be necessary to call it explicitly if you
+        only want to render text using the items attributes.
+
+        @since 2.9.1
+     */
+    const wxDataViewItemAttr& GetAttr() const;

 
     /**
         Return size required to show content.
 
     /**
         Return size required to show content.


@@ -1355,7 +1565,7 @@ public:
     virtual wxSize GetSize() const = 0;
 
     /**
     virtual wxSize GetSize() const = 0;
 
     /**

-        Overrride this so that the renderer can get the value from the editor
+        Override this so that the renderer can get the value from the editor

         control (pointed to by @a editor):
         @code
         {
         control (pointed to by @a editor):
         @code
         {


@@ -1373,10 +1583,10 @@ public:
         Override this and make it return @true in order to
         indicate that this renderer supports in-place editing.
     */
         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.
+        Override this to react to a left click.

         This method will only be called in @c wxDATAVIEW_CELL_ACTIVATABLE mode.
     */
     virtual bool LeftClick( wxPoint cursor,
         This method will only be called in @c wxDATAVIEW_CELL_ACTIVATABLE mode.
     */
     virtual bool LeftClick( wxPoint cursor,


@@ -1402,7 +1612,7 @@ public:
                     wxDC* dc, int state);
 
     /**
                     wxDC* dc, int state);
 
     /**

-        Overrride this to start a drag operation. Not yet supported.
+        Override this to start a drag operation. Not yet supported.

     */
     virtual bool StartDrag(wxPoint cursor, wxRect cell,
                            wxDataViewModel* model,
     */
     virtual bool StartDrag(wxPoint cursor, wxRect cell,
                            wxDataViewModel* model,


@@ -1434,6 +1644,7 @@ public:
 
 /**
     The flags used by wxDataViewColumn.
 
 /**
     The flags used by wxDataViewColumn.

+    Can be combined together.

 */
 enum wxDataViewColumnFlags
 {
 */
 enum wxDataViewColumnFlags
 {


@@ -1455,12 +1666,25 @@ enum wxDataViewColumnFlags
     @library{wxadv}
     @category{dvc}
 */
     @library{wxadv}
     @category{dvc}
 */

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

 {
 public:
 {
 public:

-    //@{

     /**
     /**

-        Constructors.
+        Constructs a text column.
+
+        @param title
+            The title of the column.
+        @param renderer
+            The class which will render the contents of this column.
+        @param model_column
+            The index of the model's column which is associated with this object.
+        @param width
+            The width of the column.
+            The @c wxDVC_DEFAULT_WIDTH value is the fixed default value.
+        @param align
+            The alignment of the column title.
+        @param flags
+            One or more flags of the ::wxDataViewColumnFlags enumeration.

     */
     wxDataViewColumn(const wxString& title,
                      wxDataViewRenderer* renderer,
     */
     wxDataViewColumn(const wxString& title,
                      wxDataViewRenderer* renderer,


@@ -1468,13 +1692,30 @@ public:
                      int width = wxDVC_DEFAULT_WIDTH,
                      wxAlignment align = wxALIGN_CENTER,
                      int flags = wxDATAVIEW_COL_RESIZABLE);
                      int width = wxDVC_DEFAULT_WIDTH,
                      wxAlignment align = wxALIGN_CENTER,
                      int flags = wxDATAVIEW_COL_RESIZABLE);

+
+    /**
+        Constructs a bitmap column.
+
+        @param bitmap
+            The bitmap of the column.
+        @param renderer
+            The class which will render the contents of this column.
+        @param model_column
+            The index of the model's column which is associated with this object.
+        @param width
+            The width of the column.
+            The @c wxDVC_DEFAULT_WIDTH value is the fixed default value.
+        @param align
+            The alignment of the column title.
+        @param flags
+            One or more flags of the ::wxDataViewColumnFlags enumeration.
+    */

     wxDataViewColumn(const wxBitmap& bitmap,
                      wxDataViewRenderer* renderer,
                      unsigned int model_column,
                      int width = wxDVC_DEFAULT_WIDTH,
                      wxAlignment align = wxALIGN_CENTER,
                      int flags = wxDATAVIEW_COL_RESIZABLE);
     wxDataViewColumn(const wxBitmap& bitmap,
                      wxDataViewRenderer* renderer,
                      unsigned int model_column,
                      int width = wxDVC_DEFAULT_WIDTH,
                      wxAlignment align = wxALIGN_CENTER,
                      int flags = wxDATAVIEW_COL_RESIZABLE);

-    //@}

 
     /**
         Returns the index of the column of the model, which this
 
     /**
         Returns the index of the column of the model, which this


@@ -1507,22 +1748,29 @@ public:
     edit a small table of data without having to write your own wxDataViewModel.
 
     @code
     edit a small table of data without having to write your own wxDataViewModel.
 
     @code

-       wxDataViewListCtrl *listctrl = new wxDataViewListCtrl( parent, -1 );
-        
+       wxDataViewListCtrl *listctrl = new wxDataViewListCtrl( parent, wxID_ANY );
+

        listctrl->AppendToggleColumn( "Toggle" );
        listctrl->AppendTextColumn( "Text" );
        listctrl->AppendToggleColumn( "Toggle" );
        listctrl->AppendTextColumn( "Text" );

-    
+

        wxVector<wxVariant> data;
        wxVector<wxVariant> data;

-       data.push_back( true );
-       data.push_back( "row 1" );
+       data.push_back( wxVariant(true) );
+       data.push_back( wxVariant("row 1") );

        listctrl->AppendItem( data );
        listctrl->AppendItem( data );

-    
+

        data.clear();
        data.clear();

-       data.push_back( false );
-       data.push_back( "row 3" );
+       data.push_back( wxVariant(false) );
+       data.push_back( wxVariant("row 3") );

        listctrl->AppendItem( data );
     @endcode
 
        listctrl->AppendItem( data );
     @endcode
 

+    @beginStyleTable
+    See wxDataViewCtrl for the list of supported styles.
+    @endStyleTable
+
+    @beginEventEmissionTable
+    See wxDataViewCtrl for the list of events emitted by this class.
+    @endEventTable

 
     @library{wxadv}
     @category{ctrl,dvc}
 
     @library{wxadv}
     @category{ctrl,dvc}


@@ -1534,7 +1782,7 @@ public:
         Default ctor.
     */
     wxDataViewListCtrl();
         Default ctor.
     */
     wxDataViewListCtrl();

-    
+

     /**
         Constructor. Calls Create().
     */
     /**
         Constructor. Calls Create().
     */


@@ -1542,7 +1790,7 @@ public:
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = wxDV_ROW_LINES,
            const wxValidator& validator = wxDefaultValidator );
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = wxDV_ROW_LINES,
            const wxValidator& validator = wxDefaultValidator );

-           
+

     /**
         Destructor. Deletes the image list if any.
     */
     /**
         Destructor. Deletes the image list if any.
     */


@@ -1565,74 +1813,156 @@ public:
     //@}
 
     /**
     //@}
 
     /**

-        Appends a column to the control and additonally appends a
-        column to the store with the type @a varianttype.
+        Returns the position of given @e item or wxNOT_FOUND if it's
+        not a valid item.
+
+        @since 2.9.2
+     */
+    int ItemToRow(const wxDataViewItem &item) const;
+
+    /**
+        Returns the wxDataViewItem at the given @e row.
+
+        @since 2.9.2
+     */
+    wxDataViewItem RowToItem(int row) const;
+
+    //@{
+    /**
+        @name Selection handling functions
+     */
+
+    /**
+        Returns index of the selected row or wxNOT_FOUND.
+
+        @see wxDataViewCtrl::GetSelection()
+
+        @since 2.9.2
+     */
+    int GetSelectedRow() const;
+
+    /**
+        Selects given row.
+
+        @see wxDataViewCtrl::Select()
+
+        @since 2.9.2
+     */
+    void SelectRow(unsigned row);
+
+    /**
+        Unselects given row.
+
+        @see wxDataViewCtrl::Unselect()
+
+        @since 2.9.2
+     */
+    void UnselectRow(unsigned row);
+
+    /**
+        Returns true if @a row is selected.
+
+        @see wxDataViewCtrl::IsSelected()
+
+        @since 2.9.2
+     */
+    bool IsRowSelected(unsigned row) const;
+
+    //@}
+
+    /**
+        @name Column management functions
+    */
+    //@{
+
+    /**
+        Appends a column to the control and additionally appends a
+        column to the store with the type string.
+    */
+    virtual void AppendColumn( wxDataViewColumn *column );
+
+    /**
+        Appends a column to the control and additionally appends a
+        column to the list store with the type @a varianttype.

     */
     void AppendColumn( wxDataViewColumn *column, const wxString &varianttype );
     */
     void AppendColumn( wxDataViewColumn *column, const wxString &varianttype );

-    
+

     /**
     /**

-        Prepends a column to the control and additonally prepends a
-        column to the store with the type @a varianttype.
+        Appends a text column to the control and the store.
+
+        See wxDataViewColumn::wxDataViewColumn for more info about
+        the parameters.

     */
     */

-    void PrependColumn( wxDataViewColumn *column, const wxString &varianttype );
-    
+    wxDataViewColumn *AppendTextColumn( const wxString &label,
+          wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
+          int width = -1, wxAlignment align = wxALIGN_LEFT,
+          int flags = wxDATAVIEW_COL_RESIZABLE );
+

     /**
     /**

-        Inserts a column to the control and additonally inserts a
-        column to the store with the type @a varianttype.
+        Appends a toggle column to the control and the store.
+
+        See wxDataViewColumn::wxDataViewColumn for more info about
+        the parameters.

     */
     */

-    void InsertColumn( unsigned int pos, wxDataViewColumn *column, const wxString &varianttype );
-                    
+    wxDataViewColumn *AppendToggleColumn( const wxString &label,
+          wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE,
+          int width = -1, wxAlignment align = wxALIGN_LEFT,
+          int flags = wxDATAVIEW_COL_RESIZABLE );
+

     /**
     /**

-        Overridden from wxDataViewCtrl
-        
-        Appends a column to the control and additonally appends a
-        column to the store with the type string.
+        Appends a progress column to the control and the store.
+
+        See wxDataViewColumn::wxDataViewColumn for more info about
+        the parameters.

     */
     */

-    virtual void AppendColumn( wxDataViewColumn *column );
-    
+    wxDataViewColumn *AppendProgressColumn( const wxString &label,
+          wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
+          int width = -1, wxAlignment align = wxALIGN_LEFT,
+          int flags = wxDATAVIEW_COL_RESIZABLE );
+

     /**
     /**

-        Overridden from wxDataViewCtrl
-        
-        Prepends a column to the control and additonally prepends a
-        column to the store with the type string.
+        Appends an icon-and-text column to the control and the store.
+
+        See wxDataViewColumn::wxDataViewColumn for more info about
+        the parameters.

     */
     */

-    virtual void PrependColumn( wxDataViewColumn *column );
-    
+    wxDataViewColumn *AppendIconTextColumn( const wxString &label,
+          wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
+          int width = -1, wxAlignment align = wxALIGN_LEFT,
+          int flags = wxDATAVIEW_COL_RESIZABLE );
+

     /**
     /**

-        Overridden from wxDataViewCtrl
-        
-        Inserts a column to the control and additonally inserts a
+        Inserts a column to the control and additionally inserts a

         column to the store with the type string.
     */
     virtual void InsertColumn( unsigned int pos, wxDataViewColumn *column );
         column to the store with the type string.
     */
     virtual void InsertColumn( unsigned int pos, wxDataViewColumn *column );

-                    
+

     /**
     /**

-        Inserts a text column to the control and the store.
+        Inserts a column to the control and additionally inserts a
+        column to the list store with the type @a varianttype.

     */
     */

-    wxDataViewColumn *AppendTextColumn( const wxString &label, 
-          wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, 
-          int width = -1, wxAlignment align = wxALIGN_LEFT, int flags = wxDATAVIEW_COL_RESIZABLE );
-                    
+    void InsertColumn( unsigned int pos, wxDataViewColumn *column,
+                       const wxString &varianttype );
+

     /**
     /**

-        Inserts a toggle column to the control and the store.
+        Prepends a column to the control and additionally prepends a
+        column to the store with the type string.

     */
     */

-    wxDataViewColumn *AppendToggleColumn( const wxString &label, 
-          wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE, 
-          int width = -1, wxAlignment align = wxALIGN_LEFT, int flags = wxDATAVIEW_COL_RESIZABLE );
-                    
+    virtual void PrependColumn( wxDataViewColumn *column );
+

     /**
     /**

-        Inserts a progress column to the control and the store.
+        Prepends a column to the control and additionally prepends a
+        column to the list store with the type @a varianttype.

     */
     */

-    wxDataViewColumn *AppendProgressColumn( const wxString &label, 
-          wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, 
-          int width = -1, wxAlignment align = wxALIGN_LEFT, int flags = wxDATAVIEW_COL_RESIZABLE );
-                    
+    void PrependColumn( wxDataViewColumn *column, const wxString &varianttype );
+
+    //@}
+
+

     /**
     /**

-        Inserts a icon and text column to the control and the store.
+        @name Item management functions

     */
     */

-    wxDataViewColumn *AppendIconTextColumn( const wxString &label, 
-          wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, 
-          int width = -1, wxAlignment align = wxALIGN_LEFT, int flags = wxDATAVIEW_COL_RESIZABLE );
+    //@{

 
     /**
         Appends an item (=row) to the control and store.
 
     /**
         Appends an item (=row) to the control and store.


@@ -1647,59 +1977,61 @@ public:
     /**
         Inserts an item (=row) to the control and store.
     */
     /**
         Inserts an item (=row) to the control and store.
     */

-    void InsertItem(  unsigned int row, const wxVector<wxVariant> &values, wxClientData *data = NULL );
-    
+    void InsertItem( unsigned int row, const wxVector<wxVariant> &values, wxClientData *data = NULL );
+

     /**
         Delete the row at position @a row.
     */
     void DeleteItem( unsigned row );
     /**
         Delete the row at position @a row.
     */
     void DeleteItem( unsigned row );

-    
+

     /**
         Delete all items (= all rows).
     */
     void DeleteAllItems();
     /**
         Delete all items (= all rows).
     */
     void DeleteAllItems();

-    
+

     /**
          Sets the value in the store and update the control.
     */
     void SetValue( const wxVariant &value, unsigned int row, unsigned int col );
     /**
          Sets the value in the store and update the control.
     */
     void SetValue( const wxVariant &value, unsigned int row, unsigned int col );

-    
+

     /**
          Returns the value from the store.
     */
     void GetValue( wxVariant &value, unsigned int row, unsigned int col );
     /**
          Returns the value from the store.
     */
     void GetValue( wxVariant &value, unsigned int row, unsigned int col );

-    
+

     /**
     /**

-         Sets the value in the store and update the control. 
-         
+         Sets the value in the store and update the control.
+

          This method assumes that the a string is stored in respective
          column.
     */
     void SetTextValue( const wxString &value, unsigned int row, unsigned int col );
          This method assumes that the a string is stored in respective
          column.
     */
     void SetTextValue( const wxString &value, unsigned int row, unsigned int col );

-    
+

     /**
          Returns the value from the store.
     /**
          Returns the value from the store.

-         
+

          This method assumes that the a string is stored in respective
          column.
     */
     wxString GetTextValue( unsigned int row, unsigned int col ) const;
          This method assumes that the a string is stored in respective
          column.
     */
     wxString GetTextValue( unsigned int row, unsigned int col ) const;

-    
+

     /**
     /**

-         Sets the value in the store and update the control. 
-         
+         Sets the value in the store and update the control.
+

          This method assumes that the a boolean value is stored in
          respective column.
     */
     void SetToggleValue( bool value, unsigned int row, unsigned int col );
          This method assumes that the a boolean value is stored in
          respective column.
     */
     void SetToggleValue( bool value, unsigned int row, unsigned int col );

-    
+

     /**
          Returns the value from the store.
     /**
          Returns the value from the store.

-         
+

          This method assumes that the a boolean value is stored in
          respective column.
     */
     bool GetToggleValue( unsigned int row, unsigned int col ) const;
          This method assumes that the a boolean value is stored in
          respective column.
     */
     bool GetToggleValue( unsigned int row, unsigned int col ) const;

+
+    //@}

 };
 
 
 };
 
 


@@ -1710,8 +2042,16 @@ public:
     and forwards most of its API to that class.
     Additionally, it uses a wxImageList to store a list of icons.
 
     and forwards most of its API to that class.
     Additionally, it uses a wxImageList to store a list of icons.
 

-    The main purpose of this class is to look like a wxTreeCtrl to make a transition
-    from it to the wxDataViewCtrl class simpler.
+    The main purpose of this class is to provide a simple upgrade path for code
+    using wxTreeCtrl.
+
+    @beginStyleTable
+    See wxDataViewCtrl for the list of supported styles.
+    @endStyleTable
+
+    @beginEventEmissionTable
+    See wxDataViewCtrl for the list of events emitted by this class.
+    @endEventTable

 
     @library{wxadv}
     @category{ctrl,dvc}
 
     @library{wxadv}
     @category{ctrl,dvc}


@@ -1726,12 +2066,14 @@ public:
     wxDataViewTreeCtrl();
 
     /**
     wxDataViewTreeCtrl();
 
     /**

-        Constructor. Calls Create().
+        Constructor.
+
+        Calls Create().

     */
     wxDataViewTreeCtrl(wxWindow* parent, wxWindowID id,
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,
     */
     wxDataViewTreeCtrl(wxWindow* parent, wxWindowID id,
                        const wxPoint& pos = wxDefaultPosition,
                        const wxSize& size = wxDefaultSize,

-                       long style = wxDV_NO_HEADER,
+                       long style = wxDV_NO_HEADER | wxDV_ROW_LINES,

                        const wxValidator& validator = wxDefaultValidator);
 
     /**
                        const wxValidator& validator = wxDefaultValidator);
 
     /**


@@ -1758,11 +2100,14 @@ public:
 
     /**
         Creates the control and a wxDataViewTreeStore as its internal model.
 
     /**
         Creates the control and a wxDataViewTreeStore as its internal model.

+
+        The default tree column created by this method is an editable column
+        using wxDataViewIconTextRenderer as its renderer.

     */
     bool Create(wxWindow* parent, wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
     */
     bool Create(wxWindow* parent, wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

-                long style = wxDV_NO_HEADER,
+                long style = wxDV_NO_HEADER | wxDV_ROW_LINES,

                 const wxValidator& validator = wxDefaultValidator);
 
     /**
                 const wxValidator& validator = wxDefaultValidator);
 
     /**


@@ -1845,6 +2190,11 @@ public:
                               int icon = -1,
                               wxClientData* data = NULL);
 
                               int icon = -1,
                               wxClientData* data = NULL);
 

+    /**
+        Returns true if item is a container.
+    */
+    bool IsContainer( const wxDataViewItem& item );
+    

     /**
         Calls the same method from wxDataViewTreeStore but uses
         an index position in the image list instead of a wxIcon.
     /**
         Calls the same method from wxDataViewTreeStore but uses
         an index position in the image list instead of a wxIcon.


@@ -1901,9 +2251,9 @@ public:
     its data is be accessed by row (i.e. by index) instead of only
     by wxDataViewItem.
 
     its data is be accessed by row (i.e. by index) instead of only
     by wxDataViewItem.
 

-    This class actually stores the values (therefore its name) 
+    This class actually stores the values (therefore its name)

     and implements all virtual methods from the base classes so it can be
     and implements all virtual methods from the base classes so it can be

-    used directly without having to derive any class from it, but it is 
+    used directly without having to derive any class from it, but it is

     mostly used from within wxDataViewListCtrl.
 
     @library{wxadv}
     mostly used from within wxDataViewListCtrl.
 
     @library{wxadv}


@@ -1914,77 +2264,77 @@ class wxDataViewListStore: public wxDataViewIndexListModel
 {
 public:
     /**
 {
 public:
     /**

-       Constructor
+        Constructor

     */
     wxDataViewListStore();
     */
     wxDataViewListStore();

-    
+

     /**
     /**

-       Destructor
+        Destructor

     */
     ~wxDataViewListStore();
 
     /**
     */
     ~wxDataViewListStore();
 
     /**

-      Prepends a data column. 
-      
-      @a variantype indicates the type of values store in the column.
-      
-      This does not automatically fill in any (default) values in 
-      rows which exist in the store already.
+        Prepends a data column.
+
+        @a variantype indicates the type of values store in the column.
+
+        This does not automatically fill in any (default) values in
+        rows which exist in the store already.

     */
     void PrependColumn( const wxString &varianttype );
 
     /**
     */
     void PrependColumn( const wxString &varianttype );
 
     /**

-      Inserts a data column before @a pos.
-      
-      @a variantype indicates the type of values store in the column.
-      
-      This does not automatically fill in any (default) values in 
-      rows which exist in the store already.
+        Inserts a data column before @a pos.
+
+        @a variantype indicates the type of values store in the column.
+
+        This does not automatically fill in any (default) values in
+        rows which exist in the store already.

     */
     void InsertColumn( unsigned int pos, const wxString &varianttype );
 
     /**
     */
     void InsertColumn( unsigned int pos, const wxString &varianttype );
 
     /**

-      Apppends a data column. 
-      
-      @a variantype indicates the type of values store in the column.
-      
-      This does not automatically fill in any (default) values in 
-      rows which exist in the store already.
+        Appends a data column.
+
+        @a variantype indicates the type of values store in the column.
+
+        This does not automatically fill in any (default) values in
+        rows which exist in the store already.

     */
     void AppendColumn( const wxString &varianttype );
     */
     void AppendColumn( const wxString &varianttype );

-    
+

     /**
         Appends an item (=row) and fills it with @a values.
     /**
         Appends an item (=row) and fills it with @a values.

-        
+

         The values must match the values specifies in the column
         in number and type. No (default) values are filled in
         automatically.
     */
     void AppendItem( const wxVector<wxVariant> &values, wxClientData *data = NULL );
         The values must match the values specifies in the column
         in number and type. No (default) values are filled in
         automatically.
     */
     void AppendItem( const wxVector<wxVariant> &values, wxClientData *data = NULL );

-    
+

     /**
         Prepends an item (=row) and fills it with @a values.
     /**
         Prepends an item (=row) and fills it with @a values.

-        
+

         The values must match the values specifies in the column
         in number and type. No (default) values are filled in
         automatically.
     */
     void PrependItem( const wxVector<wxVariant> &values, wxClientData *data = NULL );
         The values must match the values specifies in the column
         in number and type. No (default) values are filled in
         automatically.
     */
     void PrependItem( const wxVector<wxVariant> &values, wxClientData *data = NULL );

-    
+

     /**
         Inserts an item (=row) and fills it with @a values.
     /**
         Inserts an item (=row) and fills it with @a values.

-        
+

         The values must match the values specifies in the column
         in number and type. No (default) values are filled in
         automatically.
     */
     void InsertItem(  unsigned int row, const wxVector<wxVariant> &values, wxClientData *data = NULL );
         The values must match the values specifies in the column
         in number and type. No (default) values are filled in
         automatically.
     */
     void InsertItem(  unsigned int row, const wxVector<wxVariant> &values, wxClientData *data = NULL );

-    
+

     /**
         Delete the item (=row) at position @a pos.
     */
     void DeleteItem( unsigned pos );
     /**
         Delete the item (=row) at position @a pos.
     */
     void DeleteItem( unsigned pos );

-    
+

     /**
         Delete all item (=all rows) in the store.
     */
     /**
         Delete all item (=all rows) in the store.
     */


@@ -2020,7 +2370,7 @@ public:
     wxDataViewTreeStore is a specialised wxDataViewModel for stroing simple
     trees very much like wxTreeCtrl does and it offers a similar API.
 
     wxDataViewTreeStore is a specialised wxDataViewModel for stroing simple
     trees very much like wxTreeCtrl does and it offers a similar API.
 

-    This class actually stores the entire tree and the values (therefore its name) 
+    This class actually stores the entire tree and the values (therefore its name)

     and implements all virtual methods from the base class so it can be used directly
     without having to derive any class from it, but it is mostly used from within
     wxDataViewTreeCtrl.
     and implements all virtual methods from the base class so it can be used directly
     without having to derive any class from it, but it is mostly used from within
     wxDataViewTreeCtrl.


@@ -2207,6 +2557,45 @@ public:
 
     This is the event class for the wxDataViewCtrl notifications.
 
 
     This is the event class for the wxDataViewCtrl notifications.
 

+    @beginEventTable{wxDataViewEvent}
+    @event{EVT_DATAVIEW_SELECTION_CHANGED(id, func)}
+           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_EDITING_STARTED(id, func)}
+           Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED event.
+    @event{EVT_DATAVIEW_ITEM_EDITING_DONE(id, func)}
+           Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE event.
+    @event{EVT_DATAVIEW_ITEM_COLLAPSING(id, func)}
+           Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING event.
+    @event{EVT_DATAVIEW_ITEM_COLLAPSED(id, func)}
+           Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED event.
+    @event{EVT_DATAVIEW_ITEM_EXPANDING(id, func)}
+           Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING event.
+    @event{EVT_DATAVIEW_ITEM_EXPANDED(id, func)}
+           Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED event.
+    @event{EVT_DATAVIEW_ITEM_VALUE_CHANGED(id, func)}
+           Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED event.
+    @event{EVT_DATAVIEW_ITEM_CONTEXT_MENU(id, func)}
+           Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU event.
+    @event{EVT_DATAVIEW_COLUMN_HEADER_CLICK(id, func)}
+           Process a @c wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICKED event.
+    @event{EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK(id, func)}
+           Process a @c wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED event.
+    @event{EVT_DATAVIEW_COLUMN_SORTED(id, func)}
+           Process a @c wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED event.
+    @event{EVT_DATAVIEW_COLUMN_REORDERED(id, func)}
+           Process a @c wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED event.
+    @event{EVT_DATAVIEW_ITEM_BEGIN_DRAG(id, func)}
+           Process a @c wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG event.
+    @event{EVT_DATAVIEW_ITEM_DROP_POSSIBLE(id, func)}
+           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}
     @category{events,dvc}
 */
     @library{wxadv}
     @category{events,dvc}
 */


@@ -2265,46 +2654,56 @@ public:
         Sets the value associated with this event.
     */
     void SetValue(const wxVariant& value);
         Sets the value associated with this event.
     */
     void SetValue(const wxVariant& value);

-    
+

     /**
         Set wxDataObject for data transfer within a drag operation.
     */
     void SetDataObject( wxDataObject *obj );
     /**
         Set wxDataObject for data transfer within a drag operation.
     */
     void SetDataObject( wxDataObject *obj );

-            
+

     /**
         Used internally. Gets associated wxDataObject for data transfer
         within a drag operation.
     */
     wxDataObject *GetDataObject() const;
     /**
         Used internally. Gets associated wxDataObject for data transfer
         within a drag operation.
     */
     wxDataObject *GetDataObject() const;

-    
+

     /**
         Used internally. Sets the wxDataFormat during a drop operation.
     */
     void SetDataFormat( const wxDataFormat &format );
     /**
         Used internally. Sets the wxDataFormat during a drop operation.
     */
     void SetDataFormat( const wxDataFormat &format );

-    
+

     /**
         Gets the wxDataFormat during a drop operation.
     */
     wxDataFormat GetDataFormat() const;
     /**
         Gets the wxDataFormat during a drop operation.
     */
     wxDataFormat GetDataFormat() const;

-    
+

     /**
         Used internally. Sets the data size for a drop data transfer.
     */
     void SetDataSize( size_t size );
     /**
         Used internally. Sets the data size for a drop data transfer.
     */
     void SetDataSize( size_t size );

-    
+

     /**
         Gets the data size for a drop data transfer.
     */
     size_t GetDataSize() const;
     /**
         Gets the data size for a drop data transfer.
     */
     size_t GetDataSize() const;

-    
+

     /**
         Used internally. Sets the data buffer for a drop data transfer.
     */
     void SetDataBuffer( void* buf );
     /**
         Used internally. Sets the data buffer for a drop data transfer.
     */
     void SetDataBuffer( void* buf );

-    
+

     /**
         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;

 };
 
 };