don't show the I-beam cursor over text in wxHtmlListBox

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

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index 276858546f73b4344307ff9ff080422e9240a852..a8355e703a056a588813a8e77b15a8bc57a3a0be 100644 (file)
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -6,7 +6,7 @@
 // Created:     20.11.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     20.11.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -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"
 


@@ -37,23 +33,29 @@
 
 #include "wx/app.h"
 
 
 #include "wx/app.h"
 

-#include "wx/msw/dib.h"
-#include "wx/msw/bitmap.h"
-#include "wx/msw/gdiimage.h"

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

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

 
 

-#if wxUSE_XPM_IN_MSW
-#   include "wx/xpmhand.h"
-#endif // wxUSE_XPM_IN_MSW
+#if wxUSE_WXDIB
+#include "wx/msw/dib.h"
+#endif
+
+#ifdef __WXWINCE__
+#include <winreg.h>
+#include <shellapi.h>
+#endif

 
 

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

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

+#ifndef __WXMICROWIN__
+

 // all image handlers are declared/defined in this file because the outside
 // world doesn't have to know about them (but only about wxBITMAP_TYPE_XXX ids)
 
 // all image handlers are declared/defined in this file because the outside
 // world doesn't have to know about them (but only about wxBITMAP_TYPE_XXX ids)
 


@@ -109,14 +111,14 @@ public:
                         int WXUNUSED(height),
                         int WXUNUSED(depth) = 1)
     {
                         int WXUNUSED(height),
                         int WXUNUSED(depth) = 1)
     {

-        return FALSE;
+        return false;

     }
 
     virtual bool Save(wxGDIImage *WXUNUSED(image),
                       const wxString& WXUNUSED(name),
                       int WXUNUSED(type))
     {
     }
 
     virtual bool Save(wxGDIImage *WXUNUSED(image),
                       const wxString& WXUNUSED(name),
                       int WXUNUSED(type))
     {

-        return FALSE;
+        return false;

     }
 
     virtual bool Load(wxGDIImage *image,
     }
 
     virtual bool Load(wxGDIImage *image,


@@ -125,7 +127,7 @@ public:
                       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, _T("wxIconHandler only works with icons") );

 
         return LoadIcon(icon, name, flags, desiredWidth, desiredHeight);
     }
 
         return LoadIcon(icon, name, flags, desiredWidth, desiredHeight);
     }


@@ -145,6 +147,7 @@ public:
     {
     }
 
     {
     }
 

+protected:

     virtual bool LoadIcon(wxIcon *icon,
                           const wxString& name, long flags,
                           int desiredWidth = -1, int desiredHeight = -1);
     virtual bool LoadIcon(wxIcon *icon,
                           const wxString& name, long flags,
                           int desiredWidth = -1, int desiredHeight = -1);


@@ -162,6 +165,7 @@ public:
     {
     }
 
     {
     }
 

+protected:

     virtual bool LoadIcon(wxIcon *icon,
                           const wxString& name, long flags,
                           int desiredWidth = -1, int desiredHeight = -1);
     virtual bool LoadIcon(wxIcon *icon,
                           const wxString& name, long flags,
                           int desiredWidth = -1, int desiredHeight = -1);


@@ -174,22 +178,23 @@ private:
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // wxWin macros
 // ----------------------------------------------------------------------------
 

-    IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
-    IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
-    IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxGDIImageHandler)
-    IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxGDIImageHandler)
+IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
+IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
+IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxObject)

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

-static wxSize GetHiconSize(HICON hicon);
+#endif
+    // __MICROWIN__

 
 // ============================================================================
 // implementation
 // ============================================================================
 
 
 // ============================================================================
 // implementation
 // ============================================================================
 

-wxList wxGDIImage::ms_handlers;
+wxGDIImageHandlerList wxGDIImage::ms_handlers;

 
 // ----------------------------------------------------------------------------
 // wxGDIImage functions forwarded to wxGDIImageRefData
 
 // ----------------------------------------------------------------------------
 // wxGDIImage functions forwarded to wxGDIImageRefData


@@ -203,10 +208,10 @@ bool wxGDIImage::FreeResource(bool WXUNUSED(force))
         GetGDIImageData()->m_handle = 0;
     }
 
         GetGDIImageData()->m_handle = 0;
     }
 

-    return TRUE;
+    return true;

 }
 
 }
 

-WXHANDLE wxGDIImage::GetResourceHandle()
+WXHANDLE wxGDIImage::GetResourceHandle() const

 {
     return GetHandle();
 }
 {
     return GetHandle();
 }


@@ -231,21 +236,21 @@ bool wxGDIImage::RemoveHandler(const wxString& name)
     if ( handler )
     {
         ms_handlers.DeleteObject(handler);
     if ( handler )
     {
         ms_handlers.DeleteObject(handler);

-        return TRUE;
+        return true;

     }
     else
     }
     else

-        return FALSE;
+        return false;

 }
 
 wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& name)
 {
 }
 
 wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& name)
 {

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

     while ( node )
     {
     while ( node )
     {

-        wxGDIImageHandler *handler = (wxGDIImageHandler *)node->Data();
+        wxGDIImageHandler *handler = node->GetData();

         if ( handler->GetName() == name )
             return handler;
         if ( handler->GetName() == name )
             return handler;

-        node = node->Next();
+        node = node->GetNext();

     }
 
     return NULL;
     }
 
     return NULL;


@@ -254,31 +259,31 @@ wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& name)
 wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& extension,
                                            long type)
 {
 wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& extension,
                                            long type)
 {

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

     while ( node )
     {
     while ( node )
     {

-        wxGDIImageHandler *handler = (wxGDIImageHandler *)node->Data();
-        if ( (handler->GetExtension() = extension) &&
+        wxGDIImageHandler *handler = node->GetData();
+        if ( (handler->GetExtension() == extension) &&

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

-        node = node->Next();
+        node = node->GetNext();

     }
     return NULL;
 }
 
 wxGDIImageHandler *wxGDIImage::FindHandler(long type)
 {
     }
     return NULL;
 }
 
 wxGDIImageHandler *wxGDIImage::FindHandler(long type)
 {

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

     while ( node )
     {
     while ( node )
     {

-        wxGDIImageHandler *handler = (wxGDIImageHandler *)node->Data();
+        wxGDIImageHandler *handler = node->GetData();

         if ( handler->GetType() == type )
             return handler;
 
         if ( handler->GetType() == type )
             return handler;
 

-        node = node->Next();
+        node = node->GetNext();

     }
 
     return NULL;
     }
 
     return NULL;


@@ -286,33 +291,29 @@ wxGDIImageHandler *wxGDIImage::FindHandler(long type)
 
 void wxGDIImage::CleanUpHandlers()
 {
 
 void wxGDIImage::CleanUpHandlers()
 {

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

     while ( node )
     {
     while ( node )
     {

-        wxGDIImageHandler *handler = (wxGDIImageHandler *)node->Data();
-        wxNode *next = node->Next();
+        wxGDIImageHandler *handler = node->GetData();
+        wxGDIImageHandlerList::compatibility_iterator next = node->GetNext();

         delete handler;
         delete handler;

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

         node = next;
     }
 }
 
 void wxGDIImage::InitStandardHandlers()
 {
         node = next;
     }
 }
 
 void wxGDIImage::InitStandardHandlers()
 {

+#ifndef __WXMICROWIN__

     AddHandler(new wxBMPResourceHandler);
     AddHandler(new wxBMPFileHandler);
     AddHandler(new wxBMPResourceHandler);
     AddHandler(new wxBMPFileHandler);

-
-    // GRG: Add these handlers by default if XPM support is enabled
-
-#if wxUSE_XPM_IN_MSW
-    AddHandler(new wxXPMFileHandler);
-    AddHandler(new wxXPMDataHandler);
-#endif // wxUSE_XPM_IN_MSW
-

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

+#endif

 }
 
 }
 

+#ifndef __WXMICROWIN__
+

 // ----------------------------------------------------------------------------
 // wxBitmap handlers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxBitmap handlers
 // ----------------------------------------------------------------------------


@@ -325,27 +326,29 @@ bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap,
     // TODO: load colourmap.
     bitmap->SetHBITMAP((WXHBITMAP)::LoadBitmap(wxGetInstance(), name));
 
     // TODO: load colourmap.
     bitmap->SetHBITMAP((WXHBITMAP)::LoadBitmap(wxGetInstance(), name));
 

-    wxBitmapRefData *data = bitmap->GetBitmapData();
-    if ( bitmap->Ok() )
-    {
-        BITMAP bm;
-        if ( !::GetObject(GetHbitmapOf(*bitmap), sizeof(BITMAP), (LPSTR) &bm) )
-        {
-            wxLogLastError(wxT("GetObject(HBITMAP)"));
-        }
-
-        data->m_width = bm.bmWidth;
-        data->m_height = bm.bmHeight;
-        data->m_depth = bm.bmBitsPixel;
-    }
-    else
+    if ( !bitmap->Ok() )

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

+
+        return false;
+    }
+
+    BITMAP bm;
+    if ( !::GetObject(GetHbitmapOf(*bitmap), sizeof(BITMAP), (LPSTR) &bm) )
+    {
+        wxLogLastError(wxT("GetObject(HBITMAP)"));

     }
 
     }
 

-    return bitmap->Ok();
+    bitmap->SetWidth(bm.bmWidth);
+    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,
 }
 
 bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap,


@@ -353,35 +356,30 @@ bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap,
                                 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 ( success && palette )
-    {
-        bitmap->SetPalette(*palette);
-    }
+#if wxUSE_WXDIB
+    wxCHECK_MSG( bitmap, false, _T("NULL bitmap in LoadFile") );

 
 

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

 
 

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

 #else
 #else

-    return FALSE;
+    return false;

 #endif
 }
 
 bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap,
                                 const wxString& name,
                                 int WXUNUSED(type),
 #endif
 }
 
 bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap,
                                 const wxString& name,
                                 int WXUNUSED(type),

-                                const wxPalette *pal)
+                                const wxPalette * WXUNUSED(pal))

 {
 {

-#if wxUSE_IMAGE_LOADING_IN_MSW
-    wxPalette *actualPalette = (wxPalette *)pal;
-    if ( !actualPalette )
-        actualPalette = bitmap->GetPalette();
-    return wxSaveBitmap(WXSTRINGCAST name, bitmap, actualPalette) != 0;
+#if wxUSE_WXDIB
+    wxCHECK_MSG( bitmap, false, _T("NULL bitmap in SaveFile") );
+
+    wxDIB dib(*bitmap);
+
+    return dib.Save(name);

 #else
 #else

-    return FALSE;
+    return false;

 #endif
 }
 
 #endif
 }
 


@@ -394,21 +392,54 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
                                 long WXUNUSED(flags),
                                 int desiredWidth, int desiredHeight)
 {
                                 long WXUNUSED(flags),
                                 int desiredWidth, int desiredHeight)
 {

-#if wxUSE_RESOURCE_LOADING_IN_MSW

     icon->UnRef();
 
     // actual size
     wxSize size;
 
     icon->UnRef();
 
     // actual size
     wxSize size;
 

-#ifdef __WIN32__

     HICON hicon = NULL;
 
     HICON hicon = NULL;
 

-    // were we asked for a large icon?
+    // Parse the filename: it may be of the form "filename;n" in order to
+    // specify the nth icon in the file.
+    //
+    // For the moment, ignore the issue of possible semicolons in the
+    // filename.
+    int iconIndex = 0;
+    wxString nameReal(name);
+    wxString strIconIndex = name.AfterLast(wxT(';'));
+    if (strIconIndex != name)
+    {
+        iconIndex = wxAtoi(strIconIndex);
+        nameReal = name.BeforeLast(wxT(';'));
+    }
+
+#if 0
+    // If we don't know what size icon we're looking for,
+    // try to find out what's there.
+    // Unfortunately this doesn't work, because ExtractIconEx
+    // will scale the icon to the 'desired' size, even if that
+    // size of icon isn't explicitly stored. So we would have
+    // to parse the icon file outselves.
+    if ( desiredWidth == -1 &&
+         desiredHeight == -1)
+    {
+        // Try loading a large icon first
+        if ( ::ExtractIconEx(nameReal, iconIndex, &hicon, NULL, 1) == 1)
+        {
+        }
+        // Then try loading a small icon
+        else if ( ::ExtractIconEx(nameReal, iconIndex, NULL, &hicon, 1) == 1)
+        {
+        }
+    }
+    else
+#endif
+        // were we asked for a large icon?

     if ( desiredWidth == ::GetSystemMetrics(SM_CXICON) &&
          desiredHeight == ::GetSystemMetrics(SM_CYICON) )
     {
     if ( desiredWidth == ::GetSystemMetrics(SM_CXICON) &&
          desiredHeight == ::GetSystemMetrics(SM_CYICON) )
     {

-        // get the first large icon from file
-        if ( !::ExtractIconEx(name, 0, &hicon, NULL, 1) )
+        // get the specified large icon from file
+        if ( !::ExtractIconEx(nameReal, 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


@@ -420,8 +451,8 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
     else if ( desiredWidth == ::GetSystemMetrics(SM_CXSMICON) &&
               desiredHeight == ::GetSystemMetrics(SM_CYSMICON) )
     {
     else if ( desiredWidth == ::GetSystemMetrics(SM_CXSMICON) &&
               desiredHeight == ::GetSystemMetrics(SM_CYSMICON) )
     {

-        // get the first small icon from file
-        if ( !::ExtractIconEx(name, 0, NULL, &hicon, 1) )
+        // get the specified small icon from file
+        if ( !::ExtractIconEx(nameReal, iconIndex, NULL, &hicon, 1) )

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


@@ -430,47 +461,41 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
     }
     //else: not standard size, load below
 
     }
     //else: not standard size, load below
 

+#ifndef __WXWINCE__

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

-        // take any (the first one) icon from the file by default
-        hicon = ::ExtractIcon(wxGetInstance(), name, 0 /* first */);
+        // take any size icon from the file by index
+        hicon = ::ExtractIcon(wxGetInstance(), nameReal, iconIndex);

     }
     }

+#endif

 
     if ( !hicon )
     {
         wxLogSysError(_T("Failed to load icon from the file '%s'"),
                       name.c_str());
 
 
     if ( !hicon )
     {
         wxLogSysError(_T("Failed to load icon from the file '%s'"),
                       name.c_str());
 

-        return FALSE;
+        return false;

     }
 
     }
 

-    size = GetHiconSize(hicon);
-#else // Win16
-    HICON hicon = ReadIconFile((wxChar *)name.c_str(),
-                               wxGetInstance(),
-                               &size.x, &size.y);
-#endif // Win32/Win16
+    size = wxGetHiconSize(hicon);

 
     if ( (desiredWidth != -1 && desiredWidth != size.x) ||
          (desiredHeight != -1 && desiredHeight != size.y) )
     {
         wxLogTrace(_T("iconload"),
 
     if ( (desiredWidth != -1 && desiredWidth != size.x) ||
          (desiredHeight != -1 && desiredHeight != size.y) )
     {
         wxLogTrace(_T("iconload"),

-                   _T("Returning FALSE from wxICOFileHandler::Load because of the size mismatch: actual (%d, %d), requested (%d, %d)"),
+                   _T("Returning false from wxICOFileHandler::Load because of the size mismatch: actual (%d, %d), requested (%d, %d)"),

                    size.x, size.y,
                    desiredWidth, desiredHeight);
 
         ::DestroyIcon(hicon);
 
                    size.x, size.y,
                    desiredWidth, desiredHeight);
 
         ::DestroyIcon(hicon);
 

-        return FALSE;
+        return false;

     }
 
     icon->SetHICON((WXHICON)hicon);
     icon->SetSize(size.x, size.y);
 
     return icon->Ok();
     }
 
     icon->SetHICON((WXHICON)hicon);
     icon->SetSize(size.x, size.y);
 
     return icon->Ok();

-#else
-    return FALSE;
-#endif

 }
 
 bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
 }
 
 bool wxICOResourceHandler::LoadIcon(wxIcon *icon,


@@ -480,27 +505,57 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
 {
     HICON hicon;
 
 {
     HICON hicon;
 

-#if defined(__WIN32__) && !defined(__SC__)
-    if ( desiredWidth != -1 && desiredHeight != -1 )
+    // do we need the icon of the specific size or would any icon do?
+    bool hasSize = desiredWidth != -1 || desiredHeight != -1;
+
+    wxASSERT_MSG( !hasSize || (desiredWidth != -1 && desiredHeight != -1),
+                  _T("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
+    // we already have wxApp::GetStdIcon() is unclear)
+
+    // 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 ( hasSize )

     {
         hicon = (HICON)::LoadImage(wxGetInstance(), name, IMAGE_ICON,
                                     desiredWidth, desiredHeight,
                                     LR_DEFAULTCOLOR);
     }
     else
     {
         hicon = (HICON)::LoadImage(wxGetInstance(), name, IMAGE_ICON,
                                     desiredWidth, desiredHeight,
                                     LR_DEFAULTCOLOR);
     }
     else

-#endif // Win32

     {
         hicon = ::LoadIcon(wxGetInstance(), name);
     }
 
     {
         hicon = ::LoadIcon(wxGetInstance(), name);
     }
 

-    wxSize size = GetHiconSize(hicon);
-    icon->SetSize(size.x, size.y);
-
-    // Override the found values with desired values
-    if ( desiredWidth > -1 && desiredHeight > -1 )
+    // next check if it's not a standard icon
+#ifndef __WXWINCE__
+    if ( !hicon && !hasSize )

     {
     {

-        icon->SetSize(desiredWidth, desiredHeight);
+        static const struct
+        {
+            const wxChar *name;
+            LPTSTR id;
+        } stdIcons[] =
+        {
+            { wxT("wxICON_QUESTION"),   IDI_QUESTION    },
+            { wxT("wxICON_WARNING"),    IDI_EXCLAMATION },
+            { wxT("wxICON_ERROR"),      IDI_HAND        },
+            { wxT("wxICON_INFORMATION"),       IDI_ASTERISK    },
+        };
+
+        for ( size_t nIcon = 0; !hicon && nIcon < WXSIZEOF(stdIcons); nIcon++ )
+        {
+            if ( name == stdIcons[nIcon].name )
+            {
+                hicon = ::LoadIcon((HINSTANCE)NULL, stdIcons[nIcon].id);
+            }
+        }

     }
     }

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

 
     icon->SetHICON((WXHICON)hicon);
 
 
     icon->SetHICON((WXHICON)hicon);
 


@@ -511,12 +566,13 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
 // private functions
 // ----------------------------------------------------------------------------
 
 // private functions
 // ----------------------------------------------------------------------------
 

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

 {
 {

-    wxSize size(32, 32);    // default
+    // default icon size on this hardware
+    // usually 32x32 but can be other (smaller) on pocket devices
+    wxSize size(::GetSystemMetrics(SM_CXICON), ::GetSystemMetrics(SM_CYICON));

 
 

-#ifdef __WIN32__
-    // Win32s doesn't have GetIconInfo function...
+#ifndef __WXWINCE__

     if ( hicon && wxGetOsVersion() != wxWIN32S )
     {
         ICONINFO info;
     if ( hicon && wxGetOsVersion() != wxWIN32S )
     {
         ICONINFO info;


@@ -545,3 +601,6 @@ static wxSize GetHiconSize(HICON hicon)
 
     return size;
 }
 
     return size;
 }

+
+#endif // __WXMICROWIN__
+