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

complete rev55777 with some icon.h modifications which I missed in the first place

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-09-21 21:09:36 +00:00
parent e912ebe39f
commit c48d0d37c2
4 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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