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 a18a4473bbadb1317138c7f618252d5425baec56..03f2b4b36e5a8dafdca33dedd06cd52ea7ff1467 100644 (file)
--- 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 );