From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sat, 26 May 2001 12:44:46 +0000 (+0000)
Subject: corrected transparency in DoDrawIcon , if there is a mask in the icon, it's used
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a2f94f406e22c0af8a8e0f695569fe8b765be8ac

corrected transparency in DoDrawIcon , if there is a mask in the icon, it's used


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

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index aaa3df65f4..8988dfa3b4 100644
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -239,7 +239,7 @@ void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
  
      wxCHECK_RET(icon.Ok(), wxT("Invalid icon wxDC::DoDrawIcon"));
  
-    DoDrawBitmap( icon , x , y ) ;
+    DoDrawBitmap( icon , x , y , icon.GetMask() != NULL ) ;
 }
 void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 {
diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp
index aaa3df65f4..8988dfa3b4 100644
--- a/src/mac/dc.cpp
+++ b/src/mac/dc.cpp
@@ -239,7 +239,7 @@ void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
  
      wxCHECK_RET(icon.Ok(), wxT("Invalid icon wxDC::DoDrawIcon"));
  
-    DoDrawBitmap( icon , x , y ) ;
+    DoDrawBitmap( icon , x , y , icon.GetMask() != NULL ) ;
 }
 void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 {