Test using wxString::ToCDouble() in wxAny.

[wxWidgets.git] / src / msw / icon.cpp

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index ebf8f49d986406df0624544bf5c33defb8b710cb..dccefc51ccc9976eb7869c14d1656396f7016c36 100644 (file)
--- 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,
 }
 
 wxIcon::wxIcon(const wxString& iconfile,

-               long flags,
+               wxBitmapType type,

                int desiredWidth,
                int desiredHeight)
 
 {
                int desiredWidth,
                int desiredHeight)
 
 {

-    LoadFile(iconfile, flags, desiredWidth, desiredHeight);
+    LoadFile(iconfile, type, desiredWidth, desiredHeight);

 }
 
 wxIcon::wxIcon(const wxIconLocation& loc)
 }
 
 wxIcon::wxIcon(const wxIconLocation& loc)


@@ -86,7 +86,7 @@ wxIcon::wxIcon(const wxIconLocation& loc)
     wxString fullname = loc.GetFileName();
     if ( loc.GetIndex() )
     {
     wxString fullname = loc.GetFileName();
     if ( loc.GetIndex() )
     {

-        fullname << _T(';') << loc.GetIndex();
+        fullname << wxT(';') << loc.GetIndex();

     }
     //else: 0 is default
 
     }
     //else: 0 is default
 


@@ -100,7 +100,7 @@ wxIcon::~wxIcon()
 wxObjectRefData *wxIcon::CloneRefData(const wxObjectRefData *dataOrig) const
 {
     const wxIconRefData *
 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;
 
     if ( !data )
         return NULL;
 


@@ -128,14 +128,14 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
 #endif // __WXMICROWIN__
 }
 
 #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,
 {
     wxBitmap bmp(data);
     CopyFromBitmap(bmp);
 }
 
 bool wxIcon::LoadFile(const wxString& filename,

-                      long type,
+                      wxBitmapType type,

                       int desiredWidth, int desiredHeight)
 {
     UnRef();
                       int desiredWidth, int desiredHeight)
 {
     UnRef();


@@ -156,3 +156,14 @@ bool wxIcon::LoadFile(const wxString& filename,
 
     return handler->Load(this, filename, type, desiredWidth, desiredHeight);
 }
 
     return handler->Load(this, filename, type, desiredWidth, desiredHeight);
 }

+
+bool wxIcon::CreateFromHICON(WXHICON icon)
+{
+    SetHICON(icon);
+    if ( !IsOk() )
+        return false;
+
+    SetSize(wxGetHiconSize(icon));
+
+    return true;
+}