fix for non-quartz branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/taskbar.cpp b/src/mac/carbon/taskbar.cpp
index 7cce1813fd9b29394af799d3536ff23937a7adf2..a38447a3e44367b48122c8a9553e1bf9a7dd6f71 100644 (file)
--- a/src/mac/carbon/taskbar.cpp
+++ b/src/mac/carbon/taskbar.cpp
@@ -184,8 +184,11 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
 #if wxMAC_USE_CORE_GRAPHICS        
     pImage = (CGImageRef) bmp.CGImageCreate() ;
 #else
 #if wxMAC_USE_CORE_GRAPHICS        
     pImage = (CGImageRef) bmp.CGImageCreate() ;
 #else

-    wxMask* mask = bmp.GetMask();
-    if (!mask)
+    WXHBITMAP iconport ;
+    WXHBITMAP maskport ;
+    iconport = bmp.GetHBITMAP( &maskport ) ;
+
+    if (!maskport)

     {
         // Make a mask with no transparent pixels
         wxBitmap   mbmp(icon.GetWidth(), icon.GetHeight());
     {
         // Make a mask with no transparent pixels
         wxBitmap   mbmp(icon.GetWidth(), icon.GetHeight());


@@ -195,12 +198,10 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
         dc.Clear();
         dc.SelectObject(wxNullBitmap);
         bmp.SetMask( new wxMask(mbmp, *wxWHITE) ) ;
         dc.Clear();
         dc.SelectObject(wxNullBitmap);
         bmp.SetMask( new wxMask(mbmp, *wxWHITE) ) ;

+        iconport = bmp.GetHBITMAP( &maskport ) ;

     } 
     
     //create the icon from the bitmap and mask bitmap contained within
     } 
     
     //create the icon from the bitmap and mask bitmap contained within

-    WXHBITMAP iconport ;
-    WXHBITMAP maskport ;
-    iconport = bmp.GetHBITMAP( &maskport ) ;

     err = CreateCGImageFromPixMaps(
                                             GetGWorldPixMap(MAC_WXHBITMAP(iconport)),
                                             GetGWorldPixMap(MAC_WXHBITMAP(maskport)),
     err = CreateCGImageFromPixMaps(
                                             GetGWorldPixMap(MAC_WXHBITMAP(iconport)),
                                             GetGWorldPixMap(MAC_WXHBITMAP(maskport)),