Use an even more informative error message in wxFSW unit test.

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

diff --git a/samples/dataview/mymodels.h b/samples/dataview/mymodels.h
index 7412e9517817db7f1cd5e9402f6ddbc09534d4e0..a078c59150674b825740cb7ce2ddcb76aaa2488a 100644 (file)
--- a/samples/dataview/mymodels.h
+++ b/samples/dataview/mymodels.h
@@ -124,6 +124,7 @@ public:
     // helper method for wxLog
 
     wxString GetTitle( const wxDataViewItem &item ) const;
+    wxString GetArtist( const wxDataViewItem &item ) const;
     int GetYear( const wxDataViewItem &item ) const;
 
     // helper methods to change the model
@@ -140,7 +141,7 @@ public:
     // 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
 
@@ -214,7 +215,7 @@ public:
 
     virtual unsigned int GetRowCount()
     {
-        return m_array.GetCount();
+        return m_textColValues.GetCount();
     }
 
     virtual void GetValueByRow( wxVariant &variant,
@@ -224,7 +225,8 @@ public:
                                 unsigned int row, unsigned int col );
 
 private:
-    wxArrayString    m_array;
+    wxArrayString    m_textColValues;
+    wxArrayString    m_iconColValues;
     wxIcon           m_icon[2];
     int              m_virtualItems;
 };