Various changes to make pop up menus work

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

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index 80fb47d87683278b14cd23ff1a179f2e645fca5b..75be5af8526257f7a88c98e4df3f2d14fc941115 100644 (file)
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -35,6 +35,7 @@
     #include "wx/app.h"
     #include "wx/icon.h"
     #include "wx/bitmap.h"
+    #include "wx/log.h"
 #endif
 
 #include "wx/msw/private.h"
@@ -48,7 +49,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxIconBase)
+IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject)
 
 // ============================================================================
 // implementation
@@ -62,7 +63,9 @@ void wxIconRefData::Free()
 {
     if ( m_hIcon )
     {
+#ifndef __WXMICROWIN__
         ::DestroyIcon((HICON) m_hIcon);
+#endif
 
         m_hIcon = 0;
     }
@@ -93,6 +96,7 @@ wxIcon::~wxIcon()
 
 void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
 {
+#ifndef __WXMICROWIN__
 #ifdef __WIN32__
     wxMask *mask = bmp.GetMask();
     if ( !mask )
@@ -107,26 +111,25 @@ 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);
+    // 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.
+    {
+        MemoryHDC dcSrc, dcDst;
+        SelectInHDC selectMask(dcSrc, (HBITMAP)mask->GetMaskBitmap()),
+                    selectBitmap(dcDst, iconInfo.hbmColor);
+
+        if ( !::BitBlt(dcDst, 0, 0, bmp.GetWidth(), bmp.GetHeight(),
+                       dcSrc, 0, 0, SRCAND) )
+        {
+            wxLogLastError(_T("BitBlt"));
+        }
+    }
 
     HICON hicon = ::CreateIconIndirect(&iconInfo);
     if ( !hicon )
     {
-        wxLogLastError("CreateIconIndirect");
+        wxLogLastError(wxT("CreateIconIndirect"));
     }
     else
     {
@@ -139,6 +142,9 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
         // we created the mask, now delete it
         delete mask;
     }
+
+    // delete the inverted mask bitmap we created as well
+    ::DeleteObject(iconInfo.hbmMask);
 #else // Win16
     // there are some functions in curico.cpp which probably could be used
     // here...
@@ -153,6 +159,7 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
 
 //    wxFAIL_MSG("Bitmap to icon conversion (including use of XPMs for icons) not implemented");
 #endif // Win32/16
+#endif
 }
 
 void wxIcon::CreateIconFromXpm(const char **data)