load any files, not only XPMs, in wxIcon(wxIconLocation)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -46,7 +46,7 @@ public:
|
||||
wxIcon( char **bits, int width=-1, int height=-1 );
|
||||
|
||||
wxIcon(const wxIconLocation& loc)
|
||||
: wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_XPM)
|
||||
: wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY)
|
||||
{
|
||||
}
|
||||
|
||||
|
@@ -46,7 +46,7 @@ public:
|
||||
wxIcon( char **bits, int width=-1, int height=-1 );
|
||||
|
||||
wxIcon(const wxIconLocation& loc)
|
||||
: wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_XPM)
|
||||
: wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY)
|
||||
{
|
||||
}
|
||||
|
||||
|
@@ -44,7 +44,7 @@ public:
|
||||
wxBitmap(filename, (wxBitmapType)type) {}
|
||||
|
||||
wxIcon(const wxIconLocation& loc)
|
||||
: wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ICO)
|
||||
: wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY)
|
||||
{
|
||||
}
|
||||
|
||||
|
@@ -42,7 +42,7 @@ public:
|
||||
|
||||
wxIcon(const wxIconLocation& loc)
|
||||
{
|
||||
LoadFile(loc.GetFileName());
|
||||
LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ANY);
|
||||
}
|
||||
|
||||
~wxIcon();
|
||||
|
@@ -39,7 +39,7 @@ public:
|
||||
wxIcon( char **bits, int width=-1, int height=-1 );
|
||||
|
||||
wxIcon(const wxIconLocation& loc)
|
||||
: wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_XPM)
|
||||
: wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY)
|
||||
{
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user