From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 21 Jul 2003 12:21:22 +0000 (+0000)
Subject: load any files, not only XPMs, in wxIcon(wxIconLocation)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6f12c2c9555e3498d5c27c9245f1bcaec2bcd2c2

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
---

diff --git a/include/wx/gtk/icon.h b/include/wx/gtk/icon.h
index 10bb5b12a2..93dd3b354b 100644
--- a/include/wx/gtk/icon.h
+++ b/include/wx/gtk/icon.h
@@ -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)
     {
     }
 
diff --git a/include/wx/gtk1/icon.h b/include/wx/gtk1/icon.h
index 10bb5b12a2..93dd3b354b 100644
--- a/include/wx/gtk1/icon.h
+++ b/include/wx/gtk1/icon.h
@@ -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)
     {
     }
 
diff --git a/include/wx/mgl/icon.h b/include/wx/mgl/icon.h
index a555b70552..e79f001ae2 100644
--- a/include/wx/mgl/icon.h
+++ b/include/wx/mgl/icon.h
@@ -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)
     {
     }
 
diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h
index 1f2fab60b9..eea99e4055 100644
--- a/include/wx/motif/icon.h
+++ b/include/wx/motif/icon.h
@@ -42,7 +42,7 @@ public:
 
     wxIcon(const wxIconLocation& loc)
     {
-        LoadFile(loc.GetFileName());
+        LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ANY);
     }
 
     ~wxIcon();
diff --git a/include/wx/x11/icon.h b/include/wx/x11/icon.h
index 95ec79f429..1c51c79318 100644
--- a/include/wx/x11/icon.h
+++ b/include/wx/x11/icon.h
@@ -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)
     {
     }