From 9ce05df4bcf937129ca426e5e2937c07a109bde0 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sun, 8 Oct 2006 06:42:09 +0000 Subject: [PATCH] return values of overloaded virtuals should match the base class version git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/checklst.cpp | 4 ++-- src/mac/carbon/listctrl_mac.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp index 458a6e43f6..351a59bf6b 100644 --- a/src/mac/carbon/checklst.cpp +++ b/src/mac/carbon/checklst.cpp @@ -39,7 +39,7 @@ public: wxMacDataBrowserCheckListControl( wxListBox *peer, const wxPoint& pos, const wxSize& size, long style ); virtual ~wxMacDataBrowserCheckListControl(); - virtual wxMacListBoxItem* CreateItem(); + virtual wxMacDataItem* CreateItem(); virtual bool MacIsChecked(unsigned int n) const; virtual void MacCheck(unsigned int n, bool bCheck = true); @@ -249,7 +249,7 @@ protected : bool m_isChecked; }; -wxMacListBoxItem* wxMacDataBrowserCheckListControl::CreateItem() +wxMacDataItem* wxMacDataBrowserCheckListControl::CreateItem() { return new wxMacCheckListBoxItem(); } diff --git a/src/mac/carbon/listctrl_mac.cpp b/src/mac/carbon/listctrl_mac.cpp index fcefba941e..fbad0105e4 100644 --- a/src/mac/carbon/listctrl_mac.cpp +++ b/src/mac/carbon/listctrl_mac.cpp @@ -149,7 +149,7 @@ public: // create a list item (can be a subclass of wxMacListBoxItem) - virtual wxMacListCtrlItem* CreateItem(); + virtual wxMacDataItem* CreateItem(); virtual void MacInsertItem( unsigned int n, wxListItem* item ); virtual void MacSetColumnInfo( unsigned int row, unsigned int column, wxListItem* item ); @@ -1840,7 +1840,7 @@ void wxMacDataBrowserListCtrlControl::MacInsertItem( unsigned int n, wxListItem* MacSetColumnInfo(n, 0, item); } -wxMacListCtrlItem* wxMacDataBrowserListCtrlControl::CreateItem() +wxMacDataItem* wxMacDataBrowserListCtrlControl::CreateItem() { return new wxMacListCtrlItem(); } -- 2.45.2