Make wxDataViewItemArray more efficient

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

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 6a8ede95ba766a598266ef4fc77a6e55f481bb09..051447a2f19575be1040e810803c2a1484a5fecc 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -74,6 +74,7 @@ public:
         { m_id = item.m_id; }
     bool IsOk() const                  { return m_id != NULL; }
     void* GetID() const                { return m_id; }
         { m_id = item.m_id; }
     bool IsOk() const                  { return m_id != NULL; }
     void* GetID() const                { return m_id; }

+    operator const void* () const      { return m_id; }

     
 private:
     void* m_id;
     
 private:
     void* m_id;


@@ -396,7 +397,7 @@ protected:
 // wxDataViewCtrlBase
 // ---------------------------------------------------------
 
 // wxDataViewCtrlBase
 // ---------------------------------------------------------
 

-WX_DECLARE_OBJARRAY(wxDataViewItem, wxDataViewItemArray);
+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

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index cfa0149e6a86d0f3ed2cd4004c45d146833c49c5..1572f8c75f8ef4d9d6e07b6b64b98c5a40e6352e 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -533,9 +533,6 @@ void wxDataViewColumnBase::SetFlags(int flags)
 // wxDataViewCtrlBase
 // ---------------------------------------------------------
 
 // wxDataViewCtrlBase
 // ---------------------------------------------------------
 

-#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(wxDataViewItemArray);
-

 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl)
 
 wxDataViewCtrlBase::wxDataViewCtrlBase()
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCtrlBase, wxControl)
 
 wxDataViewCtrlBase::wxDataViewCtrlBase()