Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix overloaded virtual warning

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-03-02 13:45:09 +00:00
parent 135b23b266
commit 0208a9a31b
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/motif/icon.h
View File

@@ -42,8 +42,13 @@ public:
virtual ~wxIcon(); virtual ~wxIcon();
bool LoadFile(const wxString& name, wxBitmapType type = wxICON_DEFAULT_TYPE, bool LoadFile(const wxString& name, wxBitmapType type,
int desiredWidth = -1, int desiredHeight = -1); 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): // create from bitmap (which should have a mask unless it's monochrome):
// there shouldn't be any implicit bitmap -> icon conversion (i.e. no // there shouldn't be any implicit bitmap -> icon conversion (i.e. no