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 10bb5b12a27bcbd7690ec3a9599b7c9c1152b1e3..93dd3b354b1bef77f113c6130df9adfc239fd42b 100644 (file)
--- 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)
     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 10bb5b12a27bcbd7690ec3a9599b7c9c1152b1e3..93dd3b354b1bef77f113c6130df9adfc239fd42b 100644 (file)
--- 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)
     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 a555b7055237666b9fcaaab11205040d8001c2de..e79f001ae235b8f59984e4e819915039cdf9216a 100644 (file)
--- 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(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 1f2fab60b99e669e0ef34bb4c55c20fab01f8a31..eea99e4055bdb32e8f7bca28b9c92dd40a3e0a88 100644 (file)
--- a/include/wx/motif/icon.h
+++ b/include/wx/motif/icon.h
@@ -42,7 +42,7 @@ public:
 
     wxIcon(const wxIconLocation& loc)
     {
 
     wxIcon(const wxIconLocation& loc)
     {

-        LoadFile(loc.GetFileName());
+        LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ANY);

     }
 
     ~wxIcon();
     }
 
     ~wxIcon();

diff --git a/include/wx/x11/icon.h b/include/wx/x11/icon.h
index 95ec79f429fc35f804d20fbcae2fc3d538289a92..1c51c79318863ff62b4991129c46e435ecd1125d 100644 (file)
--- 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)
     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)

     {
     }
 
     {
     }