From 3f93a7508ea292a0ba836eefcccf20a716eaf135 Mon Sep 17 00:00:00 2001 From: Chris Elliott Date: Wed, 26 Oct 2005 20:09:10 +0000 Subject: [PATCH] avoid hidden GetImageList git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/treectrl.h | 3 ++- src/msw/treectrl.cpp | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h index b19b5ba4f6..d671445587 100644 --- 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 cd3942ed1c..0394ff22e9 100644 --- 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) { -- 2.45.2