minor change

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 76b98fcf144d3b91a65e553426478f8e9c93fb9c..df1aff285277a81f14d2d1a0f80cf5dd81d789b6 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -25,7 +25,7 @@
 
 #if defined(__WXGTK20__)
     // for testing
 
 #if defined(__WXGTK20__)
     // for testing

-    #define wxUSE_GENERICDATAVIEWCTRL 1
+    // #define wxUSE_GENERICDATAVIEWCTRL 1

 #elif defined(__WXMAC__)
 #else
     #define wxUSE_GENERICDATAVIEWCTRL 1
 #elif defined(__WXMAC__)
 #else
     #define wxUSE_GENERICDATAVIEWCTRL 1


@@ -82,6 +82,8 @@ private:
 
 bool operator == (const wxDataViewItem &left, const wxDataViewItem &right);
 
 
 bool operator == (const wxDataViewItem &left, const wxDataViewItem &right);
 

+WX_DEFINE_ARRAY(wxDataViewItem, wxDataViewItemArray);
+

 // ---------------------------------------------------------
 // wxDataViewModelNotifier
 // ---------------------------------------------------------
 // ---------------------------------------------------------
 // wxDataViewModelNotifier
 // ---------------------------------------------------------


@@ -166,9 +168,6 @@ protected:
 // wxDataViewIndexListModel
 // ---------------------------------------------------------
 
 // wxDataViewIndexListModel
 // ---------------------------------------------------------
 

-// use hash map later
-WX_DEFINE_ARRAY_PTR( void*, wxDataViewItemHash );
-

 class wxDataViewIndexListModel: public wxDataViewModel
 {
 public:
 class wxDataViewIndexListModel: public wxDataViewModel
 {
 public:


@@ -212,7 +211,7 @@ public:
     virtual wxDataViewItem GetNextSibling( const wxDataViewItem &item ) const;
     
 private:
     virtual wxDataViewItem GetNextSibling( const wxDataViewItem &item ) const;
     
 private:

-    wxDataViewItemHash m_hash;
+    wxDataViewItemArray m_hash;

     unsigned int m_lastIndex;
 };
 
     unsigned int m_lastIndex;
 };
 


@@ -397,8 +396,6 @@ protected:
 // wxDataViewCtrlBase
 // ---------------------------------------------------------
 
 // wxDataViewCtrlBase
 // ---------------------------------------------------------
 

-WX_DEFINE_ARRAY(wxDataViewItem, wxDataViewItemArray);
-

 #define wxDV_SINGLE                  0x0000     // for convenience
 #define wxDV_MULTIPLE                0x0001     // can select multiple items
 
 #define wxDV_SINGLE                  0x0000     // for convenience
 #define wxDV_MULTIPLE                0x0001     // can select multiple items