adapting to new API

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

diff --git a/include/wx/osx/listctrl.h b/include/wx/osx/listctrl.h
index 888051597685acbbb4826e4b66fbf654ec457539..e6dfc378f5a28b3c211a290b569a493026656c70 100644 (file)
--- a/include/wx/osx/listctrl.h
+++ b/include/wx/osx/listctrl.h
@@ -103,7 +103,7 @@ class WXDLLIMPEXP_CORE wxListCtrl: public wxControl
   bool SetItemColumnImage(long item, long column, int image);
 
   // Gets the item text
-  wxString GetItemText(long item) const ;
+  wxString GetItemText(long item, int int col = 0) const ;
 
   // Sets the item text
   void SetItemText(long item, const wxString& str) ;

diff --git a/src/osx/carbon/listctrl_mac.cpp b/src/osx/carbon/listctrl_mac.cpp
index e66650820e20d60b9b9a7fffe2bb2b19fe16d702..859c50437f7c9384765ba9eda66f4f54ceb0df18 100644 (file)
--- a/src/osx/carbon/listctrl_mac.cpp
+++ b/src/osx/carbon/listctrl_mac.cpp
@@ -1350,15 +1350,16 @@ bool wxListCtrl::SetItemColumnImage(long item, long column, int image)
 }
 
 // Gets the item text
-wxString wxListCtrl::GetItemText(long item) const
+wxString wxListCtrl::GetItemText(long item, int column) const
 {
     if (m_genericImpl)
-        return m_genericImpl->GetItemText(item);
+        return m_genericImpl->GetItemText(item, column);
 
     wxListItem info;
 
     info.m_mask = wxLIST_MASK_TEXT;
     info.m_itemId = item;
+    info.m_col = column;
 
     if (!GetItem(info))
         return wxEmptyString;