From 9b3eb4aa61cb7f637933d560d322f2b68cf1adf0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 12 Nov 2008 14:40:28 +0000 Subject: [PATCH] fix warning about hiding the base class LoadFile() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/icon.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/wx/generic/icon.h b/include/wx/generic/icon.h index 6d216d56a5..d7b13446b0 100644 --- a/include/wx/generic/icon.h +++ b/include/wx/generic/icon.h @@ -44,7 +44,11 @@ public: bool LoadFile(const wxString& name, wxBitmapType flags = wxICON_DEFAULT_TYPE, int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1) - { return LoadFile(name, flags); } + { return wxBitmap::LoadFile(name, flags); } + + // unhide the base class version + virtual bool LoadFile(const wxString& name, wxBitmapType flags) + { return wxBitmap::LoadFile(name, flags); } // create from bitmap (which should have a mask unless it's monochrome): // there shouldn't be any implicit bitmap -> icon conversion (i.e. no -- 2.47.2