implement GetBestSize() (patch 1386199)

[wxWidgets.git] / src / x11 / bitmap.cpp

diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index 3abc8df228a7c4f6b6ad27352bcd4d6d68e25f39..2af78decca5f1d4caf8047979cdb6e2841cfb3e4 100644 (file)
--- a/src/x11/bitmap.cpp
+++ b/src/x11/bitmap.cpp
@@ -593,10 +593,11 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
 
         M_BMPDATA->m_pixmap = XCreatePixmap( xdisplay, xroot, width, height, depth );
 
-        // Create mask
+        // Create mask if necessary
+        const bool hasMask = image.HasMask();
 
         XImage *mask_image = (XImage*) NULL;
-        if (image.HasMask())
+        if ( hasMask )
         {
             mask_image = XCreateImage( xdisplay, xvisual, 1, ZPixmap, 0, 0, width, height, 32, 0 );
             mask_image->data = (char*) malloc( mask_image->bytes_per_line * mask_image->height );
@@ -646,8 +647,6 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
         unsigned char *colorCube =
             wxTheApp->GetVisualInfo(M_BMPDATA->m_display)->m_colorCube;
 
-        bool hasMask = image.HasMask();
-
         int index = 0;
         for (int y = 0; y < height; y++)
         {
@@ -1372,7 +1371,7 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
 
         XpmFreeAttributes(&xpmAttr);
 
-        M_BMPHANDLERDATA->m_bitmap = (WXPixmap) pixmap;
+        M_BMPHANDLERDATA->m_bitmap = (Pixmap) pixmap;
 
         if (mask)
         {
@@ -1497,7 +1496,7 @@ bool wxXPMDataHandler::Create(wxBitmap *bitmap, const void* bits,
 
         XpmFreeAttributes(&xpmAttr);
 
-        M_BMPHANDLERDATA->m_pixmap = (WXPixmap) pixmap;
+        M_BMPHANDLERDATA->m_pixmap = (Pixmap) pixmap;
 
         if (mask)
         {