X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e45080c10b11190028e843b617564caec95e82dd..1fd850ab550a30bc600d5a10c5aed5386bf3624b:/src/msw/icon.cpp

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index ee899f2b8a..dccefc51cc 100644
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -72,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)
@@ -86,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
 
@@ -100,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;
 
@@ -135,7 +135,7 @@ void wxIcon::CreateIconFromXpm(const char* const* data)
 }
 
 bool wxIcon::LoadFile(const wxString& filename,
-                      long type,
+                      wxBitmapType type,
                       int desiredWidth, int desiredHeight)
 {
     UnRef();
@@ -156,3 +156,14 @@ bool wxIcon::LoadFile(const wxString& filename,
 
     return handler->Load(this, filename, type, desiredWidth, desiredHeight);
 }
+
+bool wxIcon::CreateFromHICON(WXHICON icon)
+{
+    SetHICON(icon);
+    if ( !IsOk() )
+        return false;
+
+    SetSize(wxGetHiconSize(icon));
+
+    return true;
+}