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

don't deprecate SetItemImage() with 3 parameters; just add a default value for the last one

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-09-30 22:27:45 +00:00
parent e30fbc5234
commit aba3d35e7b
4 changed files with 4 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/generic/listctrl.h
View File

@@ -98,10 +98,7 @@ public:
long SetItem( long index, int col, const wxString& label, int imageId = -1 ); long SetItem( long index, int col, const wxString& label, int imageId = -1 );
int GetItemState( long item, long stateMask ) const; int GetItemState( long item, long stateMask ) const;
bool SetItemState( long item, long state, long stateMask); bool SetItemState( long item, long state, long stateMask);
#if WXWIN_COMPATIBILITY_2_4 bool SetItemImage( long item, int image, int selImage = -1 );
wxDEPRECATED(bool SetItemImage( long item, int image, int selImage ));
#endif
bool SetItemImage( long item, int image );
wxString GetItemText( long item ) const; wxString GetItemText( long item ) const;
void SetItemText( long item, const wxString& str ); void SetItemText( long item, const wxString& str );
wxUIntPtr GetItemData( long item ) const; wxUIntPtr GetItemData( long item ) const;

5
include/wx/msw/listctrl.h
View File

@@ -160,10 +160,7 @@ public:
bool SetItemState(long item, long state, long stateMask) ; bool SetItemState(long item, long state, long stateMask) ;
// Sets the item image // Sets the item image
#if WXWIN_COMPATIBILITY_2_4 bool SetItemImage(long item, int image, int selImage = -1) ;
wxDEPRECATED(bool SetItemImage(long item, int image, int selImage)) ;
#endif
bool SetItemImage(long item, int image) ;
// Gets the item text // Gets the item text
wxString GetItemText(long item) const ; wxString GetItemText(long item) const ;

15
src/generic/listctrl.cpp
View File

@@ -4824,19 +4824,8 @@ bool wxGenericListCtrl::SetItemState( long item, long state, long stateMask )
return true; return true;
} }
#if WXWIN_COMPATIBILITY_2_4 bool
bool wxGenericListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) ) wxGenericListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) )
{
wxListItem info;
info.m_image = image;
info.m_mask = wxLIST_MASK_IMAGE;
info.m_itemId = item;
m_mainWin->SetItem( info );
return true;
}
#endif
bool wxGenericListCtrl::SetItemImage( long item, int image )
{ {
wxListItem info; wxListItem info;
info.m_image = image; info.m_image = image;

13
src/msw/listctrl.cpp
View File

@@ -903,7 +903,6 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask)
} }
// Sets the item image // Sets the item image
#if WXWIN_COMPATIBILITY_2_4
bool wxListCtrl::SetItemImage(long item, int image, int WXUNUSED(selImage)) bool wxListCtrl::SetItemImage(long item, int image, int WXUNUSED(selImage))
{ {
wxListItem info; wxListItem info;
@@ -914,18 +913,6 @@ bool wxListCtrl::SetItemImage(long item, int image, int WXUNUSED(selImage))
return SetItem(info); return SetItem(info);
} }
#endif
bool wxListCtrl::SetItemImage(long item, int image)
{
wxListItem info;
info.m_mask = wxLIST_MASK_IMAGE;
info.m_image = image;
info.m_itemId = item;
return SetItem(info);
}
// Gets the item text // Gets the item text
wxString wxListCtrl::GetItemText(long item) const wxString wxListCtrl::GetItemText(long item) const