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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index 5fd6206fdc866d54576149b1deabae9b648e7917..0fd9ab4705d3e735056fe1b435b65b7284025b52 100644 (file)
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -98,10 +98,7 @@ public:
     long SetItem( long index, int col, const wxString& label, int imageId = -1 );
     int  GetItemState( long item, long stateMask ) const;
     bool SetItemState( long item, long state, long stateMask);
-#if WXWIN_COMPATIBILITY_2_4
-    wxDEPRECATED(bool SetItemImage( long item, int image, int selImage ));
-#endif
-    bool SetItemImage( long item, int image );
+    bool SetItemImage( long item, int image, int selImage = -1 );
     wxString GetItemText( long item ) const;
     void SetItemText( long item, const wxString& str );
     wxUIntPtr GetItemData( long item ) const;

diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h
index 8d8fd8a7a8c1a234d6d3626a9d43f46cbf178edc..d2cbb4d71be45330f82d3c027339f32f169b86d0 100644 (file)
--- a/include/wx/msw/listctrl.h
+++ b/include/wx/msw/listctrl.h
@@ -160,10 +160,7 @@ public:
     bool SetItemState(long item, long state, long stateMask) ;
 
     // Sets the item image
-#if WXWIN_COMPATIBILITY_2_4
-    wxDEPRECATED(bool SetItemImage(long item, int image, int selImage)) ;
-#endif
-    bool SetItemImage(long item, int image) ;
+    bool SetItemImage(long item, int image, int selImage = -1) ;
 
     // Gets the item text
     wxString GetItemText(long item) const ;

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 1d6af59568770abed3640bc99a47430ec029aa11..e5b8353e680383170b40104011323fe5075f6d93 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -4824,19 +4824,8 @@ bool wxGenericListCtrl::SetItemState( long item, long state, long stateMask )
     return true;
 }
 
-#if WXWIN_COMPATIBILITY_2_4
-bool 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 )
+bool
+wxGenericListCtrl::SetItemImage( long item, int image, int WXUNUSED(selImage) )
 {
     wxListItem info;
     info.m_image = image;

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 85c5fef7f48ee6160b85fb074f3e73fa9c82fc0a..8022ba2992ffe2b791c36173e0fe825453505685 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -903,7 +903,6 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask)
 }
 
 // Sets the item image
-#if WXWIN_COMPATIBILITY_2_4
 bool wxListCtrl::SetItemImage(long item, int image, int WXUNUSED(selImage))
 {
     wxListItem info;
@@ -914,18 +913,6 @@ bool wxListCtrl::SetItemImage(long item, int image, int WXUNUSED(selImage))
 
     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
 wxString wxListCtrl::GetItemText(long item) const