data_image -> mask_image, correcting some crashes in XPutImage

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

diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index ad2ae5716964907383491a21751a1d9ca7aa26f1..646ad0cb1aac58d8cdc6085e9bfd06b06beab18f 100644 (file)
--- a/src/x11/bitmap.cpp
+++ b/src/x11/bitmap.cpp
@@ -706,7 +706,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
         if (image.HasMask())
         {
             GC gc = XCreateGC( xdisplay, (Pixmap) GetMask()->GetBitmap(), 0, NULL );
         if (image.HasMask())
         {
             GC gc = XCreateGC( xdisplay, (Pixmap) GetMask()->GetBitmap(), 0, NULL );

-            XPutImage( xdisplay, (Pixmap) GetMask()->GetBitmap(), gc, data_image, 0, 0, 0, 0, width, height );
+            XPutImage( xdisplay, (Pixmap) GetMask()->GetBitmap(), gc, mask_image, 0, 0, 0, 0, width, height );

 
             XDestroyImage( mask_image );
             XFreeGC( xdisplay, gc );
 
             XDestroyImage( mask_image );
             XFreeGC( xdisplay, gc );