fatal bug in wxSplitPath fixed

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

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index 03fe2ebb138cc94e87fe9865491257b2d9fcda3d..30edc93816afacb514a48342a274cc8baf3a7b34 100644 (file)
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -107,6 +107,22 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
     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 )
     {