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

load any files, not only XPMs, in wxIcon(wxIconLocation)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-07-21 12:21:22 +00:00
parent 4340bf8cb0
commit 6f12c2c955
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gtk/icon.h
View File

@@ -46,7 +46,7 @@ public:
wxIcon( char **bits, int width=-1, int height=-1 ); wxIcon( char **bits, int width=-1, int height=-1 );
wxIcon(const wxIconLocation& loc) wxIcon(const wxIconLocation& loc)
: wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_XPM) : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY)
{ {
} }

2
include/wx/gtk1/icon.h
View File

@@ -46,7 +46,7 @@ public:
wxIcon( char **bits, int width=-1, int height=-1 ); wxIcon( char **bits, int width=-1, int height=-1 );
wxIcon(const wxIconLocation& loc) wxIcon(const wxIconLocation& loc)
: wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_XPM) : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY)
{ {
} }

2
include/wx/mgl/icon.h
View File

@@ -44,7 +44,7 @@ public:
wxBitmap(filename, (wxBitmapType)type) {} wxBitmap(filename, (wxBitmapType)type) {}
wxIcon(const wxIconLocation& loc) wxIcon(const wxIconLocation& loc)
: wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ICO) : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY)
{ {
} }

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

@@ -42,7 +42,7 @@ public:
wxIcon(const wxIconLocation& loc) wxIcon(const wxIconLocation& loc)
{ {
LoadFile(loc.GetFileName()); LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ANY);
} }
~wxIcon(); ~wxIcon();

2
include/wx/x11/icon.h
View File

@@ -39,7 +39,7 @@ public:
wxIcon( char **bits, int width=-1, int height=-1 ); wxIcon( char **bits, int width=-1, int height=-1 );
wxIcon(const wxIconLocation& loc) wxIcon(const wxIconLocation& loc)
: wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_XPM) : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY)
{ {
} }