wxUSE_TOOLTIPS fix (good grief I think I just did this a couple days ago...)

[wxWidgets.git] / src / mac / carbon / taskbar.cpp

diff --git a/src/mac/carbon/taskbar.cpp b/src/mac/carbon/taskbar.cpp
index 7cce1813fd9b29394af799d3536ff23937a7adf2..74490f125cccc129b2da9e8091fb1510ecd6b8a0 100644 (file)
--- a/src/mac/carbon/taskbar.cpp
+++ b/src/mac/carbon/taskbar.cpp
@@ -181,11 +181,14 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
 
     CGImageRef pImage;
     
-#if wxMAC_USE_CORE_GRAPHICS        
+#if 1 // is always available under OSX now       
     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());
@@ -195,12 +198,10 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
         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
-    WXHBITMAP iconport ;
-    WXHBITMAP maskport ;
-    iconport = bmp.GetHBITMAP( &maskport ) ;
     err = CreateCGImageFromPixMaps(
                                             GetGWorldPixMap(MAC_WXHBITMAP(iconport)),
                                             GetGWorldPixMap(MAC_WXHBITMAP(maskport)),