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

compilation fix after last change

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-12-31 15:27:00 +00:00
parent e9bef30205
commit 2ffeccb3b7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/generic/icon.h
View File

@@ -42,12 +42,13 @@ public:
{ {
} }
bool LoadFile(const wxString& name, wxBitmapType flags = wxICON_DEFAULT_TYPE, bool LoadFile(const wxString& name, wxBitmapType flags,
int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight)) int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight))
{ return wxBitmap::LoadFile(name, flags); } { return wxBitmap::LoadFile(name, flags); }
// unhide the base class version // unhide the base class version
virtual bool LoadFile(const wxString& name, wxBitmapType flags) virtual bool LoadFile(const wxString& name,
wxBitmapType flags = wxICON_DEFAULT_TYPE)
{ return wxBitmap::LoadFile(name, flags); } { return wxBitmap::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):