Remove test code accidentally committed as part of r66015.

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

diff --git a/samples/dataview/mymodels.h b/samples/dataview/mymodels.h
index 01084a58c477da815457a584931ffa71da2e8e5d..bb9ca8f6532f8761255c59906361da266751ec43 100644 (file)
--- a/samples/dataview/mymodels.h
+++ b/samples/dataview/mymodels.h
@@ -6,7 +6,7 @@
 // Created:     06/01/06
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Created:     06/01/06
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling

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

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


@@ -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,22 +211,17 @@ 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");
     }
 

-    virtual unsigned int GetRowCount()
-    {
-        return m_textColValues.GetCount();
-    }
-

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


@@ -229,6 +233,5 @@ private:
     wxArrayString    m_textColValues;
     wxArrayString    m_iconColValues;
     wxIcon           m_icon[2];
     wxArrayString    m_textColValues;
     wxArrayString    m_iconColValues;
     wxIcon           m_icon[2];

-    int              m_virtualItems;

 };
 
 };