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
This commit is contained in:
parent
17520c84b3
commit
9b3eb4aa61
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user