From dfdad1f9364422bc00d4ce320b4f1b8e150c6665 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 20 May 2010 12:06:48 +0000 Subject: [PATCH] adapting to new API git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/listctrl.h | 2 +- src/osx/carbon/listctrl_mac.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/wx/osx/listctrl.h b/include/wx/osx/listctrl.h index 8880515976..e6dfc378f5 100644 --- 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 e66650820e..859c50437f 100644 --- 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; -- 2.45.2