X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d79c8ea96fad32c212b51dc6985d61337ea94055..4e15d1caa03346c126015019c1fdf093033ef40b:/src/msw/icon.cpp

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index 2fbdb94996..fdd9d501c3 100644
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/icon.cpp
+// Name:        src/msw/icon.cpp
 // Purpose:     wxIcon class
 // Author:      Julian Smart
 // Modified by: 20.11.99 (VZ): don't derive from wxBitmap any more
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "icon.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -29,7 +25,6 @@
 #endif
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
@@ -77,12 +72,12 @@ wxIcon::wxIcon(const char bits[], int width, int height)
 }
 
 wxIcon::wxIcon(const wxString& iconfile,
-               long flags,
+               wxBitmapType type,
                int desiredWidth,
                int desiredHeight)
 
 {
-    LoadFile(iconfile, flags, desiredWidth, desiredHeight);
+    LoadFile(iconfile, type, desiredWidth, desiredHeight);
 }
 
 wxIcon::wxIcon(const wxIconLocation& loc)
@@ -91,7 +86,7 @@ wxIcon::wxIcon(const wxIconLocation& loc)
     wxString fullname = loc.GetFileName();
     if ( loc.GetIndex() )
     {
-        fullname << _T(';') << loc.GetIndex();
+        fullname << wxT(';') << loc.GetIndex();
     }
     //else: 0 is default
 
@@ -105,7 +100,7 @@ wxIcon::~wxIcon()
 wxObjectRefData *wxIcon::CloneRefData(const wxObjectRefData *dataOrig) const
 {
     const wxIconRefData *
-        data = wx_static_cast(const wxIconRefData *, dataOrig);
+        data = static_cast<const wxIconRefData *>(dataOrig);
     if ( !data )
         return NULL;
 
@@ -133,14 +128,14 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
 #endif // __WXMICROWIN__
 }
 
-void wxIcon::CreateIconFromXpm(const char **data)
+void wxIcon::CreateIconFromXpm(const char* const* data)
 {
     wxBitmap bmp(data);
     CopyFromBitmap(bmp);
 }
 
 bool wxIcon::LoadFile(const wxString& filename,
-                      long type,
+                      wxBitmapType type,
                       int desiredWidth, int desiredHeight)
 {
     UnRef();
@@ -149,10 +144,15 @@ bool wxIcon::LoadFile(const wxString& filename,
 
     if ( !handler )
     {
-        // say something?
-        return false;
+        // load via wxBitmap which, in turn, uses wxImage allowing us to
+        // support more formats
+        wxBitmap bmp;
+        if ( !bmp.LoadFile(filename, type) )
+            return false;
+
+        CopyFromBitmap(bmp);
+        return true;
     }
 
     return handler->Load(this, filename, type, desiredWidth, desiredHeight);
 }
-