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

diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp
index 458a6e43f652faaa851d5bc1582b7c652b549319..351a59bf6b73c764534827d8822fa912f16105ab 100644 (file)
--- 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();
 
     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);
 
     virtual bool            MacIsChecked(unsigned int n) const;
     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();
 }

diff --git a/src/mac/carbon/listctrl_mac.cpp b/src/mac/carbon/listctrl_mac.cpp
index fcefba941eb59dd1ebe70ac6e1f44d1350b7fcd6..fbad0105e4f8ae4ea7804ab4eab8a422ad88eef0 100644 (file)
--- 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)
 
 
     // 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 );
 
     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);
 }
 
     MacSetColumnInfo(n, 0, item);
 }
 

-wxMacListCtrlItem* wxMacDataBrowserListCtrlControl::CreateItem()
+wxMacDataItem* wxMacDataBrowserListCtrlControl::CreateItem()

 {
     return new wxMacListCtrlItem();
 }
 {
     return new wxMacListCtrlItem();
 }