fix overloaded virtual warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user