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

fixed virtual function hiding for LoadBitmap()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-09-13 16:04:10 +00:00
parent c493691d62
commit 1d54b9d297
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,8 +47,15 @@ public:
~wxIcon(); ~wxIcon();
bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM, bool LoadFile(const wxString& name, wxBitmapType type,
int desiredWidth = -1, int desiredHeight = -1); int desiredWidth, int desiredHeight = -1);
// unhide base class LoadFile()
virtual bool LoadFile(const wxString& name,
wxBitmapType type = wxBITMAP_TYPE_XPM)
{
return LoadFile(name, type, -1, -1);
}
// 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