'Set to Unspecified' -> 'Set Value to Unspecified'

[wxWidgets.git] / samples / dataview / mymodels.h

diff --git a/samples/dataview/mymodels.h b/samples/dataview/mymodels.h
index 9a926ddc343f76001fc96d91199392e8491b0663..a0b98bc83245624fc682e35e555e95f38372065f 100644 (file)
--- a/samples/dataview/mymodels.h
+++ b/samples/dataview/mymodels.h
@@ -141,7 +141,7 @@ public:
     // override sorting to always sort branches ascendingly
 
     int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
     // override sorting to always sort branches ascendingly
 
     int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,

-                 unsigned int column, bool ascending );
+                 unsigned int column, bool ascending ) const;

 
     // implementation of base class virtuals to define model
 
 
     // implementation of base class virtuals to define model
 


@@ -188,6 +188,15 @@ private:
 class MyListModel: public wxDataViewVirtualListModel
 {
 public:
 class MyListModel: public wxDataViewVirtualListModel
 {
 public:

+    enum
+    {
+        Col_EditableText,
+        Col_IconText,
+        Col_TextWithAttr,
+        Col_Custom,
+        Col_Max
+    };
+

     MyListModel();
 
     // helper methods to change the model
     MyListModel();
 
     // helper methods to change the model


@@ -202,12 +211,12 @@ public:
 
     virtual unsigned int GetColumnCount() const
     {
 
     virtual unsigned int GetColumnCount() const
     {

-        return 3;
+        return Col_Max;

     }
 
     virtual wxString GetColumnType( unsigned int col ) const
     {
     }
 
     virtual wxString GetColumnType( unsigned int col ) const
     {

-        if (col == 1)
+        if (col == Col_IconText)

             return wxT("wxDataViewIconText");
 
         return wxT("string");
             return wxT("wxDataViewIconText");
 
         return wxT("string");


@@ -215,17 +224,19 @@ public:
 
     virtual unsigned int GetRowCount()
     {
 
     virtual unsigned int GetRowCount()
     {

-        return m_array.GetCount();
+        return m_textColValues.GetCount();

     }
 
     virtual void GetValueByRow( wxVariant &variant,
                                 unsigned int row, unsigned int col ) const;
     }
 
     virtual void GetValueByRow( wxVariant &variant,
                                 unsigned int row, unsigned int col ) const;

-    virtual bool GetAttrByRow( unsigned int row, unsigned int col, wxDataViewItemAttr &attr );
+    virtual bool GetAttrByRow( unsigned int row, unsigned int col,
+                               wxDataViewItemAttr &attr ) const;

     virtual bool SetValueByRow( const wxVariant &variant,
                                 unsigned int row, unsigned int col );
 
 private:
     virtual bool SetValueByRow( const wxVariant &variant,
                                 unsigned int row, unsigned int col );
 
 private:

-    wxArrayString    m_array;
+    wxArrayString    m_textColValues;
+    wxArrayString    m_iconColValues;

     wxIcon           m_icon[2];
     int              m_virtualItems;
 };
     wxIcon           m_icon[2];
     int              m_virtualItems;
 };