From 0482be5e1d33c8973d86145801f1840b26334a00 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 8 Jan 2012 00:55:22 +0000 Subject: [PATCH] Fix wxOSX/Carbon compilation after wxListCtrlBase introduction. Make wxListCtrl::SetColumn() item parameter const reference. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/listctrl.h | 3 +-- src/osx/carbon/listctrl_mac.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/wx/osx/listctrl.h b/include/wx/osx/listctrl.h index 23b660dfdd..cd6b2e9fb6 100644 --- a/include/wx/osx/listctrl.h +++ b/include/wx/osx/listctrl.h @@ -63,8 +63,7 @@ class WXDLLIMPEXP_CORE wxListCtrl: public wxListCtrlBase bool GetColumn(int col, wxListItem& item) const; // Sets information about this column - // TODO: NOT const to be compatible with wxGenericListCtrl API - bool SetColumn(int col, wxListItem& item) ; + bool SetColumn(int col, const wxListItem& item) ; // Gets the column width int GetColumnWidth(int col) const; diff --git a/src/osx/carbon/listctrl_mac.cpp b/src/osx/carbon/listctrl_mac.cpp index 40b16b2ba8..a325b64687 100644 --- a/src/osx/carbon/listctrl_mac.cpp +++ b/src/osx/carbon/listctrl_mac.cpp @@ -898,7 +898,7 @@ bool wxListCtrl::GetColumn(int col, wxListItem& item) const } // Sets information about this column -bool wxListCtrl::SetColumn(int col, wxListItem& item) +bool wxListCtrl::SetColumn(int col, const wxListItem& item) { if (m_genericImpl) return m_genericImpl->SetColumn(col, item); -- 2.50.0