avoid hidden GetImageList

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

diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h
index b19b5ba4f68ddddbed13ed43449f6e3368b66eb7..d671445587b0c12a03f8dae03fe92f56c5e44102 100644 (file)
--- a/include/wx/msw/treectrl.h
+++ b/include/wx/msw/treectrl.h
@@ -192,7 +192,8 @@ public:
     wxDEPRECATED( void ExpandItem(const wxTreeItemId& item, int action) );
 
         // use Set/GetImageList and Set/GetStateImageList
-    wxDEPRECATED( wxImageList *GetImageList(int) const );
+//    This appears to hide base class GetImageList()
+//    wxDEPRECATED( wxImageList *GetImageList(int) const );
     wxDEPRECATED( void SetImageList(wxImageList *imageList, int) );
 
     // use Set/GetItemImage directly

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index cd3942ed1ca019184ab97bc710eac6fa078aee41..0394ff22e9c3a5f4fc9101554ea7b72cfcb50179 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -1678,10 +1678,12 @@ wxTreeItemId wxTreeCtrl::DoInsertAfter(const wxTreeItemId& parent,
 // for compatibility only
 #if WXWIN_COMPATIBILITY_2_4
 
+/* This appears to hide base class GetImageList()
 wxImageList *wxTreeCtrl::GetImageList(int) const
 {
     return wxTreeCtrlBase::GetImageList();
 }
+*/
 
 void wxTreeCtrl::SetImageList(wxImageList *imageList, int)
 {