use Windows standard icons instead of our own (patch 443856)

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

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index 0c2187db94c2f03f995c0a6a929630a189494bae..8f27b61324cc5c1ff31636b0591e08296c2a4a04 100644 (file)
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -34,6 +34,8 @@
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/icon.h"
+    #include "wx/bitmap.h"
+    #include "wx/log.h"
 #endif
 
 #include "wx/msw/private.h"
@@ -47,9 +49,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARIES
-    IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxIconBase)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxIconBase)
 
 // ============================================================================
 // implementation
@@ -62,21 +62,23 @@
 void wxIconRefData::Free()
 {
     if ( m_hIcon )
+    {
+#ifndef __WXMICROWIN__
         ::DestroyIcon((HICON) m_hIcon);
+#endif
+
+        m_hIcon = 0;
+    }
 }
 
 // ----------------------------------------------------------------------------
 // wxIcon
 // ----------------------------------------------------------------------------
 
-wxIcon::wxIcon()
-{
-}
-
-wxIcon::wxIcon(const char WXUNUSED(bits)[],
-               int WXUNUSED(width),
-               int WXUNUSED(height))
+wxIcon::wxIcon(const char bits[], int width, int height)
 {
+    wxBitmap bmp(bits, width, height);
+    CopyFromBitmap(bmp);
 }
 
 wxIcon::wxIcon(const wxString& iconfile,
@@ -92,6 +94,78 @@ wxIcon::~wxIcon()
 {
 }
 
+void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
+{
+#ifndef __WXMICROWIN__
+#ifdef __WIN32__
+    wxMask *mask = bmp.GetMask();
+    if ( !mask )
+    {
+        // we must have a mask for an icon, so even if it's probably incorrect,
+        // do create it (grey is the "standard" transparent colour)
+        mask = new wxMask(bmp, *wxLIGHT_GREY);
+    }
+
+    ICONINFO iconInfo;
+    iconInfo.fIcon = TRUE;  // we want an icon, not a cursor
+    iconInfo.hbmMask = wxInvertMask((HBITMAP)mask->GetMaskBitmap());
+    iconInfo.hbmColor = GetHbitmapOf(bmp);
+
+    /* GRG: black out the transparent area to preserve background
+     * colour, because Windows blits the original bitmap using
+     * SRCINVERT (XOR) after applying the mask to the dest rect.
+     */
+    HDC dcSrc = ::CreateCompatibleDC(NULL);
+    HDC dcDst = ::CreateCompatibleDC(NULL);
+    SelectObject(dcSrc, (HBITMAP)mask->GetMaskBitmap());
+    SelectObject(dcDst, iconInfo.hbmColor);
+
+    BitBlt(dcDst, 0, 0, bmp.GetWidth(), bmp.GetHeight(), dcSrc, 0, 0, SRCAND);
+
+    SelectObject(dcDst, NULL);
+    SelectObject(dcSrc, NULL);
+    DeleteDC(dcDst);
+    DeleteDC(dcSrc);
+
+    HICON hicon = ::CreateIconIndirect(&iconInfo);
+    if ( !hicon )
+    {
+        wxLogLastError(wxT("CreateIconIndirect"));
+    }
+    else
+    {
+        SetHICON((WXHICON)hicon);
+        SetSize(bmp.GetWidth(), bmp.GetHeight());
+    }
+
+    if ( !bmp.GetMask() )
+    {
+        // we created the mask, now delete it
+        delete mask;
+    }
+#else // Win16
+    // there are some functions in curico.cpp which probably could be used
+    // here...
+    // This probably doesn't work.
+    HBITMAP hBitmap = (HBITMAP) bmp.GetHBITMAP();
+    HICON hIcon = MakeIconFromBitmap((HINSTANCE) wxGetInstance(), hBitmap);
+    if (hIcon)
+    {
+        SetHICON((WXHICON)hIcon);
+        SetSize(bmp.GetWidth(), bmp.GetHeight());
+    }
+
+//    wxFAIL_MSG("Bitmap to icon conversion (including use of XPMs for icons) not implemented");
+#endif // Win32/16
+#endif
+}
+
+void wxIcon::CreateIconFromXpm(const char **data)
+{
+    wxBitmap bmp(data);
+    CopyFromBitmap(bmp);
+}
+
 bool wxIcon::LoadFile(const wxString& filename,
                       long type,
                       int desiredWidth, int desiredHeight)