projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
provide generic implementation for ShowScrollbars() too
[wxWidgets.git]
/
include
/
wx
/
generic
/
icon.h
diff --git
a/include/wx/generic/icon.h
b/include/wx/generic/icon.h
index 6d216d56a5c7a46c62d08a98f26a25ceb711aa1f..d7b13446b01c58e13bc0b6243eb746764c83b2e2 100644
(file)
--- a/
include/wx/generic/icon.h
+++ b/
include/wx/generic/icon.h
@@
-44,7
+44,11
@@
public:
bool LoadFile(const wxString& name, wxBitmapType flags = wxICON_DEFAULT_TYPE,
int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1)
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
// create from bitmap (which should have a mask unless it's monochrome):
// there shouldn't be any implicit bitmap -> icon conversion (i.e. no