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 aaa3df65f445f461f25eaa7c5dc256a4a7089495..8988dfa3b4c8f126a9ee9a45c68b06ec5106cd10 100644 (file)
--- 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 aaa3df65f445f461f25eaa7c5dc256a4a7089495..8988dfa3b4c8f126a9ee9a45c68b06ec5106cd10 100644 (file)
--- 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 )
 {