From: Robert Roebling <robert@roebling.de>
Date: Wed, 22 May 2002 21:01:54 +0000 (+0000)
Subject:   wxImage::Copy() didn't really just copy the
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fdbb06ba2cf7e82e5a9c325c60da1772050cbf33?ds=inline

  wxImage::Copy() didn't really just copy the
     image, it sometimes changed the mask
     colour, when it was unused. This patch
     makes life easier.


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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index a18a4473bb..03f2b4b36e 100644
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -199,8 +199,8 @@ wxImage wxImage::Copy() const
 
     wxCHECK_MSG( data, image, wxT("unable to create image") );
 
-    if (M_IMGDATA->m_hasMask)
-        image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
+    image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
+    image.SetMask( M_IMGDATA->m_hasMask );
 
     memcpy( data, GetData(), M_IMGDATA->m_width*M_IMGDATA->m_height*3 );