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

removing overloads to avoid 'hidden method' warning

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-04-18 11:10:40 +00:00
parent d07e1e0c13
commit 0698ed3ca8
4 changed files with 3 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/wx/osx/carbon/private.h
View File

@@ -733,22 +733,6 @@ public :
public : public :
// item aware methods, to be used in subclasses
virtual Boolean CompareItems(const wxMacDataItem* itemOneID,
const wxMacDataItem* itemTwoID,
DataBrowserPropertyID sortProperty);
virtual OSStatus GetSetItemData(wxMacDataItem* itemID,
DataBrowserPropertyID property,
DataBrowserItemDataRef itemData,
Boolean changeValue );
virtual void ItemNotification(
const wxMacDataItem* itemID,
DataBrowserItemNotification message,
DataBrowserItemDataRef itemData);
// as we are getting the same events for human and API selection we have to suppress // as we are getting the same events for human and API selection we have to suppress
// events in the latter case, since this will be used from many subclasses we keep it here // events in the latter case, since this will be used from many subclasses we keep it here
@@ -913,7 +897,7 @@ public:
virtual void UpdateLineToEnd( unsigned int n) ; virtual void UpdateLineToEnd( unsigned int n) ;
virtual void ItemNotification( virtual void ItemNotification(
const wxMacDataItem* itemID, DataBrowserItemID itemID,
DataBrowserItemNotification message, DataBrowserItemNotification message,
DataBrowserItemDataRef itemData); DataBrowserItemDataRef itemData);

2
src/osx/carbon/listbox.cpp
View File

@@ -345,7 +345,7 @@ wxMacDataBrowserListControl::~wxMacDataBrowserListControl()
} }
void wxMacDataBrowserListControl::ItemNotification( void wxMacDataBrowserListControl::ItemNotification(
const wxMacDataItem* itemID, DataBrowserItemID itemID,
DataBrowserItemNotification message, DataBrowserItemNotification message,
DataBrowserItemDataRef itemData) DataBrowserItemDataRef itemData)
{ {

2
src/osx/carbon/listctrl_mac.cpp
View File

@@ -2682,7 +2682,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
int imgIndex = -1; int imgIndex = -1;
DataBrowserTableViewColumnIndex listColumn = 0; DataBrowserTableViewColumnIndex listColumn = 0;
OSStatus err = GetColumnPosition( property, &listColumn ); GetColumnPosition( property, &listColumn );
wxListCtrl* list = wxDynamicCast( GetWXPeer() , wxListCtrl ); wxListCtrl* list = wxDynamicCast( GetWXPeer() , wxListCtrl );
wxMacListCtrlItem* lcItem; wxMacListCtrlItem* lcItem;

23
src/osx/carbon/utils.cpp
View File

@@ -756,13 +756,7 @@ Boolean wxMacDataItemBrowserControl::CompareItems(DataBrowserItemID itemOneID,
{ {
wxMacDataItem* itemOne = (wxMacDataItem*) itemOneID; wxMacDataItem* itemOne = (wxMacDataItem*) itemOneID;
wxMacDataItem* itemTwo = (wxMacDataItem*) itemTwoID; wxMacDataItem* itemTwo = (wxMacDataItem*) itemTwoID;
return CompareItems( itemOne , itemTwo , sortProperty );
}
Boolean wxMacDataItemBrowserControl::CompareItems(const wxMacDataItem* itemOne,
const wxMacDataItem* itemTwo,
DataBrowserPropertyID sortProperty)
{
Boolean retval = false; Boolean retval = false;
if ( itemOne != NULL ) if ( itemOne != NULL )
retval = itemOne->IsLessThan( this , itemTwo , sortProperty); retval = itemOne->IsLessThan( this , itemTwo , sortProperty);
@@ -776,15 +770,6 @@ OSStatus wxMacDataItemBrowserControl::GetSetItemData(
Boolean changeValue ) Boolean changeValue )
{ {
wxMacDataItem* item = (wxMacDataItem*) itemID; wxMacDataItem* item = (wxMacDataItem*) itemID;
return GetSetItemData(item, property, itemData , changeValue );
}
OSStatus wxMacDataItemBrowserControl::GetSetItemData(
wxMacDataItem* item,
DataBrowserPropertyID property,
DataBrowserItemDataRef itemData,
Boolean changeValue )
{
OSStatus err = errDataBrowserPropertyNotSupported; OSStatus err = errDataBrowserPropertyNotSupported;
switch( property ) switch( property )
{ {
@@ -810,14 +795,6 @@ void wxMacDataItemBrowserControl::ItemNotification(
DataBrowserItemDataRef itemData) DataBrowserItemDataRef itemData)
{ {
wxMacDataItem* item = (wxMacDataItem*) itemID; wxMacDataItem* item = (wxMacDataItem*) itemID;
ItemNotification( item , message, itemData);
}
void wxMacDataItemBrowserControl::ItemNotification(
const wxMacDataItem* item,
DataBrowserItemNotification message,
DataBrowserItemDataRef itemData)
{
if (item != NULL) if (item != NULL)
item->Notification( this, message, itemData); item->Notification( this, message, itemData);
} }