From: Vadim Zeitlin Date: Mon, 2 Mar 2009 13:45:09 +0000 (+0000) Subject: fix overloaded virtual warning X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0208a9a31b09e563f88d60058a65bd89b9b32e8c fix overloaded virtual warning git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h index 4b9e089fba..efadb28ba1 100644 --- a/include/wx/motif/icon.h +++ b/include/wx/motif/icon.h @@ -42,8 +42,13 @@ public: virtual ~wxIcon(); - bool LoadFile(const wxString& name, wxBitmapType type = wxICON_DEFAULT_TYPE, - int desiredWidth = -1, int desiredHeight = -1); + bool LoadFile(const wxString& name, wxBitmapType type, + int desiredWidth, int desiredHeight); + + // unhide the base class version + virtual bool LoadFile(const wxString& name, + wxBitmapType flags = wxICON_DEFAULT_TYPE) + { return 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