Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

return values of overloaded virtuals should match the base class version

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-10-08 06:42:09 +00:00
parent e6fd62dd84
commit 9ce05df4bc
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mac/carbon/checklst.cpp
View File

@@ -39,7 +39,7 @@ public:
wxMacDataBrowserCheckListControl( wxListBox *peer, const wxPoint& pos, const wxSize& size, long style ); wxMacDataBrowserCheckListControl( wxListBox *peer, const wxPoint& pos, const wxSize& size, long style );
virtual ~wxMacDataBrowserCheckListControl(); virtual ~wxMacDataBrowserCheckListControl();
virtual wxMacListBoxItem* CreateItem(); virtual wxMacDataItem* CreateItem();
virtual bool MacIsChecked(unsigned int n) const; virtual bool MacIsChecked(unsigned int n) const;
virtual void MacCheck(unsigned int n, bool bCheck = true); virtual void MacCheck(unsigned int n, bool bCheck = true);
@@ -249,7 +249,7 @@ protected :
bool m_isChecked; bool m_isChecked;
}; };
wxMacListBoxItem* wxMacDataBrowserCheckListControl::CreateItem() wxMacDataItem* wxMacDataBrowserCheckListControl::CreateItem()
{ {
return new wxMacCheckListBoxItem(); return new wxMacCheckListBoxItem();
} }

4
src/mac/carbon/listctrl_mac.cpp
View File

@@ -149,7 +149,7 @@ public:
// create a list item (can be a subclass of wxMacListBoxItem) // 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 MacInsertItem( unsigned int n, wxListItem* item );
virtual void MacSetColumnInfo( unsigned int row, unsigned int column, 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); MacSetColumnInfo(n, 0, item);
} }
wxMacListCtrlItem* wxMacDataBrowserListCtrlControl::CreateItem() wxMacDataItem* wxMacDataBrowserListCtrlControl::CreateItem()
{ {
return new wxMacListCtrlItem(); return new wxMacListCtrlItem();
} }