From 7890a36c9c34b5626ceada90956d0c69941a56af Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 1 Mar 2005 05:21:06 +0000 Subject: [PATCH] fix for non-quartz branch git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/taskbar.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mac/carbon/taskbar.cpp b/src/mac/carbon/taskbar.cpp index 7cce1813fd..a38447a3e4 100644 --- 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 - 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)), -- 2.50.0