Test using wxString::ToCDouble() in wxAny.

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

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index 33229d4fab5566c9b48ae01b06b7ed6634d1adac..d19d26afd91dd4024a282628be9651bf385556da 100644 (file)
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/gdiimage.cpp
+// Name:        src/msw/gdiimage.cpp

 // Purpose:     wxGDIImage implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxGDIImage implementation
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "gdiimage.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -31,27 +27,39 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"

+    #include "wx/app.h"
+    #include "wx/bitmap.h"

 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"
 
 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"
 

-#include "wx/app.h"
+#include "wx/msw/gdiimage.h"

 
 

-#ifndef __WXMICROWIN__
+#if wxUSE_WXDIB

 #include "wx/msw/dib.h"
 #endif
 
 #include "wx/msw/dib.h"
 #endif
 

-#include "wx/msw/bitmap.h"
-#include "wx/msw/gdiimage.h"
-#include "wx/bitmap.h"
+// By default, use PNG resource handler if we can, i.e. have support for
+// loading PNG images in the library. This symbol could be predefined as 0 to
+// avoid doing this if anybody ever needs to do it for some reason.
+#if !defined(wxUSE_PNG_RESOURCE_HANDLER) && wxUSE_LIBPNG && wxUSE_IMAGE
+    #define wxUSE_PNG_RESOURCE_HANDLER 1
+#endif

 
 

-#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxGDIImageHandlerList);
+#if wxUSE_PNG_RESOURCE_HANDLER
+    #include "wx/image.h"
+    #include "wx/utils.h"       // For wxLoadUserResource()
+#endif
+
+#ifdef __WXWINCE__
+#include <winreg.h>
+#include <shellapi.h>
+#endif

 
 

+#include "wx/file.h"

 
 

-#ifdef __WIN16__
-#   include "wx/msw/curico.h"
-#endif // __WIN16__
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxGDIImageHandlerList)

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -65,17 +73,17 @@ WX_DEFINE_LIST(wxGDIImageHandlerList);
 class WXDLLEXPORT wxBMPFileHandler : public wxBitmapHandler
 {
 public:
 class WXDLLEXPORT wxBMPFileHandler : public wxBitmapHandler
 {
 public:

-    wxBMPFileHandler() : wxBitmapHandler(_T("Windows bitmap file"), _T("bmp"),
+    wxBMPFileHandler() : wxBitmapHandler(wxT("Windows bitmap file"), wxT("bmp"),

                                          wxBITMAP_TYPE_BMP)
     {
     }
 
     virtual bool LoadFile(wxBitmap *bitmap,
                                          wxBITMAP_TYPE_BMP)
     {
     }
 
     virtual bool LoadFile(wxBitmap *bitmap,

-                          const wxString& name, long flags,
+                          const wxString& name, wxBitmapType flags,

                           int desiredWidth, int desiredHeight);
                           int desiredWidth, int desiredHeight);

-    virtual bool SaveFile(wxBitmap *bitmap,
-                          const wxString& name, int type,
-                          const wxPalette *palette = NULL);
+    virtual bool SaveFile(const wxBitmap *bitmap,
+                          const wxString& name, wxBitmapType type,
+                          const wxPalette *palette = NULL) const;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxBMPFileHandler)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxBMPFileHandler)


@@ -84,14 +92,14 @@ private:
 class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler
 {
 public:
 class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler
 {
 public:

-    wxBMPResourceHandler() : wxBitmapHandler(_T("Windows bitmap resource"),
+    wxBMPResourceHandler() : wxBitmapHandler(wxT("Windows bitmap resource"),

                                              wxEmptyString,
                                              wxBITMAP_TYPE_BMP_RESOURCE)
     {
     }
 
     virtual bool LoadFile(wxBitmap *bitmap,
                                              wxEmptyString,
                                              wxBITMAP_TYPE_BMP_RESOURCE)
     {
     }
 
     virtual bool LoadFile(wxBitmap *bitmap,

-                          const wxString& name, long flags,
+                          const wxString& name, wxBitmapType flags,

                           int desiredWidth, int desiredHeight);
 
 private:
                           int desiredWidth, int desiredHeight);
 
 private:


@@ -101,15 +109,15 @@ private:
 class WXDLLEXPORT wxIconHandler : public wxGDIImageHandler
 {
 public:
 class WXDLLEXPORT wxIconHandler : public wxGDIImageHandler
 {
 public:

-    wxIconHandler(const wxString& name, const wxString& ext, long type)
+    wxIconHandler(const wxString& name, const wxString& ext, wxBitmapType type)

         : wxGDIImageHandler(name, ext, type)
     {
     }
 
     // creating and saving icons is not supported
     virtual bool Create(wxGDIImage *WXUNUSED(image),
         : wxGDIImageHandler(name, ext, type)
     {
     }
 
     // creating and saving icons is not supported
     virtual bool Create(wxGDIImage *WXUNUSED(image),

-                        void *WXUNUSED(data),
-                        long WXUNUSED(flags),
+                        const void* WXUNUSED(data),
+                        wxBitmapType WXUNUSED(flags),

                         int WXUNUSED(width),
                         int WXUNUSED(height),
                         int WXUNUSED(depth) = 1)
                         int WXUNUSED(width),
                         int WXUNUSED(height),
                         int WXUNUSED(depth) = 1)


@@ -117,41 +125,42 @@ public:
         return false;
     }
 
         return false;
     }
 

-    virtual bool Save(wxGDIImage *WXUNUSED(image),
+    virtual bool Save(const wxGDIImage *WXUNUSED(image),

                       const wxString& WXUNUSED(name),
                       const wxString& WXUNUSED(name),

-                      int WXUNUSED(type))
+                      wxBitmapType WXUNUSED(type)) const

     {
         return false;
     }
 
     virtual bool Load(wxGDIImage *image,
                       const wxString& name,
     {
         return false;
     }
 
     virtual bool Load(wxGDIImage *image,
                       const wxString& name,

-                      long flags,
+                      wxBitmapType flags,

                       int desiredWidth, int desiredHeight)
     {
         wxIcon *icon = wxDynamicCast(image, wxIcon);
                       int desiredWidth, int desiredHeight)
     {
         wxIcon *icon = wxDynamicCast(image, wxIcon);

-        wxCHECK_MSG( icon, false, _T("wxIconHandler only works with icons") );
+        wxCHECK_MSG( icon, false, wxT("wxIconHandler only works with icons") );

 
         return LoadIcon(icon, name, flags, desiredWidth, desiredHeight);
     }
 
 protected:
     virtual bool LoadIcon(wxIcon *icon,
 
         return LoadIcon(icon, name, flags, desiredWidth, desiredHeight);
     }
 
 protected:
     virtual bool LoadIcon(wxIcon *icon,

-                          const wxString& name, long flags,
+                          const wxString& name, wxBitmapType flags,

                           int desiredWidth = -1, int desiredHeight = -1) = 0;
 };
 
 class WXDLLEXPORT wxICOFileHandler : public wxIconHandler
 {
 public:
                           int desiredWidth = -1, int desiredHeight = -1) = 0;
 };
 
 class WXDLLEXPORT wxICOFileHandler : public wxIconHandler
 {
 public:

-    wxICOFileHandler() : wxIconHandler(_T("ICO icon file"),
-                                       _T("ico"),
+    wxICOFileHandler() : wxIconHandler(wxT("ICO icon file"),
+                                       wxT("ico"),

                                        wxBITMAP_TYPE_ICO)
     {
     }
 
                                        wxBITMAP_TYPE_ICO)
     {
     }
 

+protected:

     virtual bool LoadIcon(wxIcon *icon,
     virtual bool LoadIcon(wxIcon *icon,

-                          const wxString& name, long flags,
+                          const wxString& name, wxBitmapType flags,

                           int desiredWidth = -1, int desiredHeight = -1);
 
 private:
                           int desiredWidth = -1, int desiredHeight = -1);
 
 private:


@@ -161,20 +170,42 @@ private:
 class WXDLLEXPORT wxICOResourceHandler: public wxIconHandler
 {
 public:
 class WXDLLEXPORT wxICOResourceHandler: public wxIconHandler
 {
 public:

-    wxICOResourceHandler() : wxIconHandler(_T("ICO resource"),
-                                           _T("ico"),
+    wxICOResourceHandler() : wxIconHandler(wxT("ICO resource"),
+                                           wxT("ico"),

                                            wxBITMAP_TYPE_ICO_RESOURCE)
     {
     }
 
                                            wxBITMAP_TYPE_ICO_RESOURCE)
     {
     }
 

+protected:

     virtual bool LoadIcon(wxIcon *icon,
     virtual bool LoadIcon(wxIcon *icon,

-                          const wxString& name, long flags,
+                          const wxString& name, wxBitmapType flags,

                           int desiredWidth = -1, int desiredHeight = -1);
 
 private:
     DECLARE_DYNAMIC_CLASS(wxICOResourceHandler)
 };
 
                           int desiredWidth = -1, int desiredHeight = -1);
 
 private:
     DECLARE_DYNAMIC_CLASS(wxICOResourceHandler)
 };
 

+#if wxUSE_PNG_RESOURCE_HANDLER
+
+class WXDLLEXPORT wxPNGResourceHandler : public wxBitmapHandler
+{
+public:
+    wxPNGResourceHandler() : wxBitmapHandler(wxS("Windows PNG resource"),
+                                             wxString(),
+                                             wxBITMAP_TYPE_PNG_RESOURCE)
+    {
+    }
+
+    virtual bool LoadFile(wxBitmap *bitmap,
+                          const wxString& name, wxBitmapType flags,
+                          int desiredWidth, int desiredHeight);
+
+private:
+    wxDECLARE_DYNAMIC_CLASS(wxPNGResourceHandler);
+};
+
+#endif // wxUSE_PNG_RESOURCE_HANDLER
+

 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------


@@ -183,6 +214,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxObject)

+#if wxUSE_PNG_RESOURCE_HANDLER
+IMPLEMENT_DYNAMIC_CLASS(wxPNGResourceHandler, wxBitmapHandler)
+#endif // wxUSE_PNG_RESOURCE_HANDLER

 
 // ----------------------------------------------------------------------------
 // private functions
 
 // ----------------------------------------------------------------------------
 // private functions


@@ -245,7 +279,7 @@ bool wxGDIImage::RemoveHandler(const wxString& name)
 
 wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& name)
 {
 
 wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& name)
 {

-    wxGDIImageHandlerList::Node *node = ms_handlers.GetFirst();
+    wxGDIImageHandlerList::compatibility_iterator node = ms_handlers.GetFirst();

     while ( node )
     {
         wxGDIImageHandler *handler = node->GetData();
     while ( node )
     {
         wxGDIImageHandler *handler = node->GetData();


@@ -260,11 +294,11 @@ wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& name)
 wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& extension,
                                            long type)
 {
 wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& extension,
                                            long type)
 {

-    wxGDIImageHandlerList::Node *node = ms_handlers.GetFirst();
+    wxGDIImageHandlerList::compatibility_iterator node = ms_handlers.GetFirst();

     while ( node )
     {
         wxGDIImageHandler *handler = node->GetData();
     while ( node )
     {
         wxGDIImageHandler *handler = node->GetData();

-        if ( (handler->GetExtension() = extension) &&
+        if ( (handler->GetExtension() == extension) &&

              (type == -1 || handler->GetType() == type) )
         {
             return handler;
              (type == -1 || handler->GetType() == type) )
         {
             return handler;


@@ -277,7 +311,7 @@ wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& extension,
 
 wxGDIImageHandler *wxGDIImage::FindHandler(long type)
 {
 
 wxGDIImageHandler *wxGDIImage::FindHandler(long type)
 {

-    wxGDIImageHandlerList::Node *node = ms_handlers.GetFirst();
+    wxGDIImageHandlerList::compatibility_iterator node = ms_handlers.GetFirst();

     while ( node )
     {
         wxGDIImageHandler *handler = node->GetData();
     while ( node )
     {
         wxGDIImageHandler *handler = node->GetData();


@@ -292,13 +326,13 @@ wxGDIImageHandler *wxGDIImage::FindHandler(long type)
 
 void wxGDIImage::CleanUpHandlers()
 {
 
 void wxGDIImage::CleanUpHandlers()
 {

-    wxGDIImageHandlerList::Node *node = ms_handlers.GetFirst();
+    wxGDIImageHandlerList::compatibility_iterator node = ms_handlers.GetFirst();

     while ( node )
     {
         wxGDIImageHandler *handler = node->GetData();
     while ( node )
     {
         wxGDIImageHandler *handler = node->GetData();

-        wxGDIImageHandlerList::Node *next = node->GetNext();
+        wxGDIImageHandlerList::compatibility_iterator next = node->GetNext();

         delete handler;
         delete handler;

-        delete node;
+        ms_handlers.Erase( node );

         node = next;
     }
 }
         node = next;
     }
 }


@@ -308,8 +342,11 @@ void wxGDIImage::InitStandardHandlers()
 #ifndef __WXMICROWIN__
     AddHandler(new wxBMPResourceHandler);
     AddHandler(new wxBMPFileHandler);
 #ifndef __WXMICROWIN__
     AddHandler(new wxBMPResourceHandler);
     AddHandler(new wxBMPFileHandler);

-    AddHandler(new wxICOResourceHandler);

     AddHandler(new wxICOFileHandler);
     AddHandler(new wxICOFileHandler);

+    AddHandler(new wxICOResourceHandler);
+#if wxUSE_PNG_RESOURCE_HANDLER
+    AddHandler(new wxPNGResourceHandler);
+#endif // wxUSE_PNG_RESOURCE_HANDLER

 #endif
 }
 
 #endif
 }
 


@@ -320,14 +357,14 @@ void wxGDIImage::InitStandardHandlers()
 // ----------------------------------------------------------------------------
 
 bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap,
 // ----------------------------------------------------------------------------
 
 bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap,

-                                    const wxString& name, long WXUNUSED(flags),
+                                    const wxString& name, wxBitmapType WXUNUSED(flags),

                                     int WXUNUSED(desiredWidth),
                                     int WXUNUSED(desiredHeight))
 {
     // TODO: load colourmap.
                                     int WXUNUSED(desiredWidth),
                                     int WXUNUSED(desiredHeight))
 {
     // TODO: load colourmap.

-    bitmap->SetHBITMAP((WXHBITMAP)::LoadBitmap(wxGetInstance(), name));
+    bitmap->SetHBITMAP((WXHBITMAP)::LoadBitmap(wxGetInstance(), name.t_str()));

 
 

-    if ( !bitmap->Ok() )
+    if ( !bitmap->IsOk() )

     {
         // it's probably not found
         wxLogError(wxT("Can't load bitmap '%s' from resources! Check .rc file."),
     {
         // it's probably not found
         wxLogError(wxT("Can't load bitmap '%s' from resources! Check .rc file."),


@@ -346,50 +383,39 @@ bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap,
     bitmap->SetHeight(bm.bmHeight);
     bitmap->SetDepth(bm.bmBitsPixel);
 
     bitmap->SetHeight(bm.bmHeight);
     bitmap->SetDepth(bm.bmBitsPixel);
 

+    // use 0xc0c0c0 as transparent colour by default
+    bitmap->SetMask(new wxMask(*bitmap, *wxLIGHT_GREY));
+

     return true;
 }
 
 bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap,
     return true;
 }
 
 bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap,

-                                const wxString& name, long WXUNUSED(flags),
+                                const wxString& name, wxBitmapType WXUNUSED(flags),

                                 int WXUNUSED(desiredWidth),
                                 int WXUNUSED(desiredHeight))
 {
                                 int WXUNUSED(desiredWidth),
                                 int WXUNUSED(desiredHeight))
 {

-#if wxUSE_IMAGE_LOADING_IN_MSW
-    wxPalette *palette = NULL;
-    bool success = wxLoadIntoBitmap(WXSTRINGCAST name, bitmap, &palette) != 0;
-
-#if wxUSE_PALETTE
-    if ( success && palette )
-    {
-        bitmap->SetPalette(*palette);
-    }
+#if wxUSE_WXDIB
+    wxCHECK_MSG( bitmap, false, wxT("NULL bitmap in LoadFile") );

 
 

-    // it was copied by the bitmap if it was loaded successfully
-    delete palette;
-#endif // wxUSE_PALETTE
+    wxDIB dib(name);

 
 

-    return success;
+    return dib.IsOk() && bitmap->CopyFromDIB(dib);

 #else
     return false;
 #endif
 }
 
 #else
     return false;
 #endif
 }
 

-bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap,
+bool wxBMPFileHandler::SaveFile(const wxBitmap *bitmap,

                                 const wxString& name,
                                 const wxString& name,

-                                int WXUNUSED(type),
-                                const wxPalette *pal)
+                                wxBitmapType WXUNUSED(type),
+                                const wxPalette * WXUNUSED(pal)) const

 {
 {

-#if wxUSE_IMAGE_LOADING_IN_MSW
+#if wxUSE_WXDIB
+    wxCHECK_MSG( bitmap, false, wxT("NULL bitmap in SaveFile") );

 
 

-#if wxUSE_PALETTE
-    wxPalette *actualPalette = (wxPalette *)pal;
-    if ( !actualPalette )
-        actualPalette = bitmap->GetPalette();
-#else
-    wxPalette *actualPalette = NULL;
-#endif // wxUSE_PALETTE
+    wxDIB dib(*bitmap);

 
 

-    return wxSaveBitmap(WXSTRINGCAST name, bitmap, actualPalette) != 0;
+    return dib.Save(name);

 #else
     return false;
 #endif
 #else
     return false;
 #endif


@@ -401,16 +427,11 @@ bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap,
 
 bool wxICOFileHandler::LoadIcon(wxIcon *icon,
                                 const wxString& name,
 
 bool wxICOFileHandler::LoadIcon(wxIcon *icon,
                                 const wxString& name,

-                                long WXUNUSED(flags),
+                                wxBitmapType WXUNUSED(flags),

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

-#if wxUSE_RESOURCE_LOADING_IN_MSW

     icon->UnRef();
 
     icon->UnRef();
 

-    // actual size
-    wxSize size;
-
-#ifdef __WIN32__

     HICON hicon = NULL;
 
     // Parse the filename: it may be of the form "filename;n" in order to
     HICON hicon = NULL;
 
     // Parse the filename: it may be of the form "filename;n" in order to


@@ -448,17 +469,17 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
     }
     else
 #endif
     }
     else
 #endif

-    // were we asked for a large icon?
+        // were we asked for a large icon?

     if ( desiredWidth == ::GetSystemMetrics(SM_CXICON) &&
          desiredHeight == ::GetSystemMetrics(SM_CYICON) )
     {
         // get the specified large icon from file
     if ( desiredWidth == ::GetSystemMetrics(SM_CXICON) &&
          desiredHeight == ::GetSystemMetrics(SM_CYICON) )
     {
         // get the specified large icon from file

-        if ( !::ExtractIconEx(nameReal, iconIndex, &hicon, NULL, 1) )
+        if ( !::ExtractIconEx(nameReal.t_str(), iconIndex, &hicon, NULL, 1) )

         {
             // it is not an error, but it might still be useful to be informed
             // about it optionally
         {
             // it is not an error, but it might still be useful to be informed
             // about it optionally

-            wxLogTrace(_T("iconload"),
-                       _T("No large icons found in the file '%s'."),
+            wxLogTrace(wxT("iconload"),
+                       wxT("No large icons found in the file '%s'."),

                        name.c_str());
         }
     }
                        name.c_str());
         }
     }


@@ -466,61 +487,53 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
               desiredHeight == ::GetSystemMetrics(SM_CYSMICON) )
     {
         // get the specified small icon from file
               desiredHeight == ::GetSystemMetrics(SM_CYSMICON) )
     {
         // get the specified small icon from file

-        if ( !::ExtractIconEx(nameReal, iconIndex, NULL, &hicon, 1) )
+        if ( !::ExtractIconEx(nameReal.t_str(), iconIndex, NULL, &hicon, 1) )

         {
         {

-            wxLogTrace(_T("iconload"),
-                       _T("No small icons found in the file '%s'."),
+            wxLogTrace(wxT("iconload"),
+                       wxT("No small icons found in the file '%s'."),

                        name.c_str());
         }
     }
     //else: not standard size, load below
 
                        name.c_str());
         }
     }
     //else: not standard size, load below
 

+#ifndef __WXWINCE__

     if ( !hicon )
     {
         // take any size icon from the file by index
     if ( !hicon )
     {
         // take any size icon from the file by index

-        hicon = ::ExtractIcon(wxGetInstance(), nameReal, iconIndex);
+        hicon = ::ExtractIcon(wxGetInstance(), nameReal.t_str(), iconIndex);

     }
     }

+#endif

 
     if ( !hicon )
     {
 
     if ( !hicon )
     {

-        wxLogSysError(_T("Failed to load icon from the file '%s'"),
+        wxLogSysError(wxT("Failed to load icon from the file '%s'"),

                       name.c_str());
 
         return false;
     }
 
                       name.c_str());
 
         return false;
     }
 

-    size = wxGetHiconSize(hicon);
-#else // Win16
-    HICON hicon = ReadIconFile((wxChar *)name.c_str(),
-                               wxGetInstance(),
-                               &size.x, &size.y);
-#endif // Win32/Win16
+    if ( !icon->CreateFromHICON(hicon) )
+        return false;

 
 

-    if ( (desiredWidth != -1 && desiredWidth != size.x) ||
-         (desiredHeight != -1 && desiredHeight != size.y) )
+    if ( (desiredWidth != -1 && desiredWidth != icon->GetWidth()) ||
+         (desiredHeight != -1 && desiredHeight != icon->GetHeight()) )

     {
     {

-        wxLogTrace(_T("iconload"),
-                   _T("Returning false from wxICOFileHandler::Load because of the size mismatch: actual (%d, %d), requested (%d, %d)"),
-                   size.x, size.y,
+        wxLogTrace(wxT("iconload"),
+                   wxT("Returning false from wxICOFileHandler::Load because of the size mismatch: actual (%d, %d), requested (%d, %d)"),
+                   icon->GetWidth(), icon->GetHeight(),

                    desiredWidth, desiredHeight);
 
                    desiredWidth, desiredHeight);
 

-        ::DestroyIcon(hicon);
+        icon->UnRef();

 
         return false;
     }
 
 
         return false;
     }
 

-    icon->SetHICON((WXHICON)hicon);
-    icon->SetSize(size.x, size.y);
-
-    return icon->Ok();
-#else
-    return false;
-#endif
+    return true;

 }
 
 bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
                                     const wxString& name,
 }
 
 bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
                                     const wxString& name,

-                                    long WXUNUSED(flags),
+                                    wxBitmapType WXUNUSED(flags),

                                     int desiredWidth, int desiredHeight)
 {
     HICON hicon;
                                     int desiredWidth, int desiredHeight)
 {
     HICON hicon;


@@ -529,7 +542,7 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
     bool hasSize = desiredWidth != -1 || desiredHeight != -1;
 
     wxASSERT_MSG( !hasSize || (desiredWidth != -1 && desiredHeight != -1),
     bool hasSize = desiredWidth != -1 || desiredHeight != -1;
 
     wxASSERT_MSG( !hasSize || (desiredWidth != -1 && desiredHeight != -1),

-                  _T("width and height should be either both -1 or not") );
+                  wxT("width and height should be either both -1 or not") );

 
     // try to load the icon from this program first to allow overriding the
     // standard icons (although why one would want to do it considering that
 
     // try to load the icon from this program first to allow overriding the
     // standard icons (although why one would want to do it considering that


@@ -537,20 +550,19 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
 
     // note that we can't just always call LoadImage() because it seems to do
     // some icon rescaling internally which results in very ugly 16x16 icons
 
     // note that we can't just always call LoadImage() because it seems to do
     // some icon rescaling internally which results in very ugly 16x16 icons

-#if defined(__WIN32__) && !defined(__SC__)

     if ( hasSize )
     {
     if ( hasSize )
     {

-        hicon = (HICON)::LoadImage(wxGetInstance(), name, IMAGE_ICON,
+        hicon = (HICON)::LoadImage(wxGetInstance(), name.t_str(), IMAGE_ICON,

                                     desiredWidth, desiredHeight,
                                     LR_DEFAULTCOLOR);
     }
     else
                                     desiredWidth, desiredHeight,
                                     LR_DEFAULTCOLOR);
     }
     else

-#endif // Win32/!Win32

     {
     {

-        hicon = ::LoadIcon(wxGetInstance(), name);
+        hicon = ::LoadIcon(wxGetInstance(), name.t_str());

     }
 
     // next check if it's not a standard icon
     }
 
     // next check if it's not a standard icon

+#ifndef __WXWINCE__

     if ( !hicon && !hasSize )
     {
         static const struct
     if ( !hicon && !hasSize )
     {
         static const struct


@@ -570,29 +582,74 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
             if ( name == stdIcons[nIcon].name )
             {
                 hicon = ::LoadIcon((HINSTANCE)NULL, stdIcons[nIcon].id);
             if ( name == stdIcons[nIcon].name )
             {
                 hicon = ::LoadIcon((HINSTANCE)NULL, stdIcons[nIcon].id);

+                break;

             }
         }
     }
             }
         }
     }

+#endif
+
+    return icon->CreateFromHICON((WXHICON)hicon);
+}

 
 

-    wxSize size = wxGetHiconSize(hicon);
-    icon->SetSize(size.x, size.y);
+#if wxUSE_PNG_RESOURCE_HANDLER

 
 

-    icon->SetHICON((WXHICON)hicon);
+// ----------------------------------------------------------------------------
+// PNG handler
+// ----------------------------------------------------------------------------
+
+bool wxPNGResourceHandler::LoadFile(wxBitmap *bitmap,
+                                    const wxString& name,
+                                    wxBitmapType WXUNUSED(flags),
+                                    int WXUNUSED(desiredWidth),
+                                    int WXUNUSED(desiredHeight))
+{
+    const void* pngData = NULL;
+    size_t pngSize = 0;
+
+    // Currently we hardcode RCDATA resource type as this is what is usually
+    // used for the embedded images. We could allow specifying the type as part
+    // of the name in the future (e.g. "type:name" or something like this) if
+    // really needed.
+    if ( !wxLoadUserResource(&pngData, &pngSize,
+                             name,
+                             RT_RCDATA,
+                             wxGetInstance()) )
+    {
+        // Notice that this message is not translated because only the
+        // programmer (and not the end user) can make any use of it.
+        wxLogError(wxS("Bitmap in PNG format \"%s\" not found, check ")
+                   wxS("that the resource file contains \"RCDATA\" ")
+                   wxS("resource with this name."),
+                   name);

 
 

-    return icon->Ok();
+        return false;
+    }
+
+    *bitmap = wxBitmap::NewFromPNGData(pngData, pngSize);
+    if ( !bitmap->IsOk() )
+    {
+        wxLogError(wxS("Couldn't load resource bitmap \"%s\" as a PNG. "),
+                   wxS("Have you registered PNG image handler?"),
+                   name);
+
+        return false;
+    }
+
+    return true;

 }
 
 }
 

+#endif // wxUSE_PNG_RESOURCE_HANDLER
+

 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 

-wxSize wxGetHiconSize(HICON hicon)
+wxSize wxGetHiconSize(HICON WXUNUSED_IN_WINCE(hicon))

 {
 {

-    wxSize size(32, 32);    // default
+    wxSize size;

 
 

-#ifdef __WIN32__
-    // Win32s doesn't have GetIconInfo function...
-    if ( hicon && wxGetOsVersion() != wxWIN32S )
+#ifndef __WXWINCE__
+    if ( hicon )

     {
         ICONINFO info;
         if ( !::GetIconInfo(hicon, &info) )
     {
         ICONINFO info;
         if ( !::GetIconInfo(hicon, &info) )


@@ -616,9 +673,16 @@ wxSize wxGetHiconSize(HICON hicon)
                 ::DeleteObject(info.hbmColor);
         }
     }
                 ::DeleteObject(info.hbmColor);
         }
     }

-#endif
+
+    if ( !size.x )
+#endif // !__WXWINCE__
+    {
+        // use default icon size on this hardware
+        size.x = ::GetSystemMetrics(SM_CXICON);
+        size.y = ::GetSystemMetrics(SM_CYICON);
+    }

 
     return size;
 }
 
     return size;
 }

-#endif
-    // __WXMICROWIN__
+
+#endif // __WXMICROWIN__