From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 25 May 2012 17:02:40 +0000 (+0000)
Subject: Add wxDataViewListCtrl::GetItemCount().
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5fb4b6cd65d39b21c3015b6dd54fcecb777e4edd

Add wxDataViewListCtrl::GetItemCount().

This method is convenient and (almost, except for the return value) compatible
with wxListCtrl.

See #11088.

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

diff --git a/docs/changes.txt b/docs/changes.txt
index d0ddc372b8..28bbac5ac6 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -557,6 +557,7 @@ All (GUI):
 - Added pixel font size capability to wxTextAttr and wxRichTextCtrl.
 - Fully implement wxStyledTextCtrl::PositionToXY() (troelsk).
 - Added wxDataViewListCtrl::{Set,Get}ItemData().
+- Added wxDataViewListCtrl::GetItemCount() (Kry).
 
 GTK:
 
diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 9e1ad7bac1..7b86dea69f 100644
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -972,6 +972,8 @@ public:
     void DeleteItem( unsigned int pos );
     void DeleteAllItems();
 
+    unsigned int GetItemCount() const;
+
     void SetItemData( const wxDataViewItem& item, wxUIntPtr data );
     wxUIntPtr GetItemData( const wxDataViewItem& item ) const;
 
@@ -1085,6 +1087,9 @@ public:
     wxUIntPtr GetItemData( const wxDataViewItem& item ) const
         { return GetStore()->GetItemData( item ); }
 
+    int GetItemCount() const
+        { return GetStore()->GetItemCount(); }
+
     void OnSize( wxSizeEvent &event );
 
 private:
diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index a491490c40..e45d0fced1 100644
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -2337,6 +2337,13 @@ public:
     */
     void DeleteAllItems();
 
+    /**
+        Returns the number of items (=rows) in the control
+
+        @since 2.9.4
+    */
+    unsigned int GetItemCount() const;
+
     /**
         Returns the client data associated with the item.
 
@@ -2710,6 +2717,13 @@ public:
     */
     void DeleteAllItems();
 
+    /**
+        Returns the number of items (=rows) in the control
+
+        @since 2.9.4
+    */
+    unsigned int GetItemCount() const;
+
     /**
         Returns the client data associated with the item.
 
diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index ab385d09d3..1ac5c1d16f 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -1705,6 +1705,11 @@ unsigned int wxDataViewListStore::GetColumnCount() const
     return m_cols.GetCount();
 }
 
+unsigned int wxDataViewListStore::GetItemCount() const
+{
+    return m_data.size();
+}
+
 wxString wxDataViewListStore::GetColumnType( unsigned int pos ) const
 {
     return m_cols[pos];