1552971 ] Add flag for wxODComboBox::OnDrawItem to indicate selection

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

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 7b944d6738b3a26ee22db5965168c0eba1f44ffe..fcc84f778605550da17558f24b670e0bb9efb442 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -18,22 +18,13 @@
     #include "wx/icon.h"
     #include "wx/math.h"
     #include "wx/image.h"
     #include "wx/icon.h"
     #include "wx/math.h"
     #include "wx/image.h"

+    #include "wx/colour.h"

 #endif
 
 #include "wx/rawbmp.h"
 
 #include <gtk/gtk.h>
 
 #endif
 
 #include "wx/rawbmp.h"
 
 #include <gtk/gtk.h>
 

-extern void gdk_wx_draw_bitmap     (GdkDrawable  *drawable,
-                          GdkGC               *gc,
-                          GdkDrawable  *src,
-                          gint                xsrc,
-                          gint                ysrc,
-                          gint                xdest,
-                          gint                ydest,
-                          gint                width,
-                          gint                height);
-

 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------


@@ -86,80 +77,60 @@ bool wxMask::Create( const wxBitmap& bitmap,
         m_bitmap = (GdkBitmap*) NULL;
     }
 
         m_bitmap = (GdkBitmap*) NULL;
     }
 

-    wxImage image = bitmap.ConvertToImage();
-    if (!image.Ok()) return false;
-
-    m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, image.GetWidth(), image.GetHeight(), 1 );
-    GdkGC *gc = gdk_gc_new( m_bitmap );
+    const int w = bitmap.GetWidth();
+    const int h = bitmap.GetHeight();

 
 

-    GdkColor color;
-    color.pixel = 1;
-    gdk_gc_set_foreground( gc, &color );
-    gdk_draw_rectangle( m_bitmap, gc, TRUE, 0, 0, image.GetWidth(), image.GetHeight() );
-
-    unsigned char *data = image.GetData();
-    int index = 0;
+    // create mask as XBM format bitmap

 
 

-    unsigned char red = colour.Red();
-    unsigned char green = colour.Green();
-    unsigned char blue = colour.Blue();
-
-    GdkVisual *visual = wxTheApp->GetGdkVisual();
-
-    int bpp = visual->depth;
-    if ((bpp == 16) && (visual->red_mask != 0xf800))
-        bpp = 15;
-    if (bpp == 15)
-    {
-        red = red & 0xf8;
-        green = green & 0xf8;
-        blue = blue & 0xf8;
-    }
-    else if (bpp == 16)
+    // one bit per pixel, each row starts on a byte boundary
+    const size_t out_size = size_t((w + 7) / 8) * unsigned(h);
+    wxByte* out = new wxByte[out_size];
+    // set bits are unmasked
+    memset(out, 0xff, out_size);
+    unsigned bit_index = 0;
+    if (bitmap.HasPixbuf())

     {
     {

-        red = red & 0xf8;
-        green = green & 0xfc;
-        blue = blue & 0xf8;
-    }
-    else if (bpp == 12)
-    {
-        red = red & 0xf0;
-        green = green & 0xf0;
-        blue = blue & 0xf0;
+        const wxByte r_mask = colour.Red();
+        const wxByte g_mask = colour.Green();
+        const wxByte b_mask = colour.Blue();
+        GdkPixbuf* pixbuf = bitmap.GetPixbuf();
+        const wxByte* in = gdk_pixbuf_get_pixels(pixbuf);
+        const int inc = 3 + int(gdk_pixbuf_get_has_alpha(pixbuf) != 0);
+        const int rowpadding = gdk_pixbuf_get_rowstride(pixbuf) - inc * w;
+        for (int y = 0; y < h; y++, in += rowpadding)
+        {
+            for (int x = 0; x < w; x++, in += inc, bit_index++)
+                if (in[0] == r_mask && in[1] == g_mask && in[2] == b_mask)
+                    out[bit_index >> 3] ^= 1 << (bit_index & 7);
+            // move index to next byte boundary
+            bit_index = (bit_index + 7) & ~7u;
+        }

     }
     }

-
-    color.pixel = 0;
-    gdk_gc_set_foreground( gc, &color );
-
-    for (int j = 0; j < image.GetHeight(); j++)
+    else

     {
     {

-        int start_x = -1;
-        int i;
-        for (i = 0; i < image.GetWidth(); i++)
+        GdkImage* image = gdk_drawable_get_image(bitmap.GetPixmap(), 0, 0, w, h);
+        GdkColormap* colormap = gdk_image_get_colormap(image);
+        guint32 mask_pixel;
+        if (colormap == NULL)
+            // mono bitmap, white is pixel value 0
+            mask_pixel = guint32(colour.Red() != 255 || colour.Green() != 255 || colour.Blue() != 255);
+        else

         {
         {

-            if ((data[index] == red) &&
-                (data[index+1] == green) &&
-                (data[index+2] == blue))
-            {
-                if (start_x == -1)
-                    start_x = i;
-            }
-            else
-            {
-                if (start_x != -1)
-                {
-                    gdk_draw_line( m_bitmap, gc, start_x, j, i-1, j );
-                    start_x = -1;
-                }
-            }
-            index += 3;
+            wxColor c(colour);
+            c.CalcPixel(colormap);
+            mask_pixel = c.GetPixel();

         }
         }

-        if (start_x != -1)
-            gdk_draw_line( m_bitmap, gc, start_x, j, i, j );
+        for (int y = 0; y < h; y++)
+        {
+            for (int x = 0; x < w; x++, bit_index++)
+                if (gdk_image_get_pixel(image, x, y) == mask_pixel)
+                    out[bit_index >> 3] ^= 1 << (bit_index & 7);
+            bit_index = (bit_index + 7) & ~7u;
+        }
+        g_object_unref(image);

     }
     }

-
-    g_object_unref (gc);
-
+    m_bitmap = gdk_bitmap_create_from_data(wxGetRootWindow()->window, (char*)out, w, h);
+    delete[] out;

     return true;
 }
 
     return true;
 }
 


@@ -194,9 +165,8 @@ bool wxMask::Create( const wxBitmap& bitmap )
     if (!m_bitmap) return false;
 
     GdkGC *gc = gdk_gc_new( m_bitmap );
     if (!m_bitmap) return false;
 
     GdkGC *gc = gdk_gc_new( m_bitmap );

-
-    gdk_wx_draw_bitmap( m_bitmap, gc, bitmap.GetPixmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight() );
-
+    gdk_gc_set_function(gc, GDK_COPY_INVERT);
+    gdk_draw_drawable(m_bitmap, gc, bitmap.GetPixmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight());

     g_object_unref (gc);
 
     return true;
     g_object_unref (gc);
 
     return true;


@@ -215,7 +185,7 @@ class wxBitmapRefData: public wxObjectRefData
 {
 public:
     wxBitmapRefData();
 {
 public:
     wxBitmapRefData();

-    ~wxBitmapRefData();
+    virtual ~wxBitmapRefData();

 
     GdkPixmap      *m_pixmap;
     GdkPixbuf      *m_pixbuf;
 
     GdkPixmap      *m_pixmap;
     GdkPixbuf      *m_pixbuf;


@@ -333,7 +303,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
     {
         bmp.SetDepth(GetDepth());
         bmp.SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB,
     {
         bmp.SetDepth(GetDepth());
         bmp.SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB,

-                                     gdk_pixbuf_get_has_alpha(GetPixbuf()),
+                                     true, //gdk_pixbuf_get_has_alpha(GetPixbuf()),

                                      8, width, height));
         gdk_pixbuf_scale(GetPixbuf(), bmp.GetPixbuf(),
                          0, 0, width, height,
                                      8, width, height));
         gdk_pixbuf_scale(GetPixbuf(), bmp.GetPixbuf(),
                          0, 0, width, height,


@@ -343,7 +313,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
     }
     else
     {
     }
     else
     {

-        GdkImage* img = gdk_image_get(GetPixmap(), 0, 0, GetWidth(), GetHeight());
+        GdkImage* img = gdk_drawable_get_image(GetPixmap(), 0, 0, GetWidth(), GetHeight());

 
         wxCHECK_MSG(img, bmp, wxT("couldn't create image"));
 
 
         wxCHECK_MSG(img, bmp, wxT("couldn't create image"));
 


@@ -443,7 +413,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
         {
             dstbyteperline = (width + 7) / 8;
             dst = (char*) malloc(dstbyteperline*height);
         {
             dstbyteperline = (width + 7) / 8;
             dst = (char*) malloc(dstbyteperline*height);

-            img = gdk_image_get( GetMask()->GetBitmap(), 0, 0, GetWidth(), GetHeight() );
+            img = gdk_drawable_get_image(GetMask()->GetBitmap(), 0, 0, GetWidth(), GetHeight());

 
             for (int h = 0; h < height; h++)
             {
 
             for (int h = 0; h < height; h++)
             {


@@ -508,171 +478,89 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
         return false;
 
     if (depth == 1)
         return false;
 
     if (depth == 1)

-        return CreateFromImageAsBitmap(image);
+        return CreateFromImageAsPixmap(image, depth);

 
     if (image.HasAlpha())
         return CreateFromImageAsPixbuf(image);
 
 
     if (image.HasAlpha())
         return CreateFromImageAsPixbuf(image);
 

-    return CreateFromImageAsPixmap(image);
+    return CreateFromImageAsPixmap(image, depth);

 }
 
 }
 

-// conversion to mono bitmap:
-bool wxBitmap::CreateFromImageAsBitmap(const wxImage& img)
+bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth)

 {
 {

-    // convert alpha channel to mask, if it is present:
-    wxImage image(img);
-    image.ConvertAlphaToMask();
-
-    int width = image.GetWidth();
-    int height = image.GetHeight();
-
-    SetPixmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) );
-
-    // Create picture image
-
-    GdkGC* data_gc = gdk_gc_new(M_BMPDATA->m_pixmap);
-    GdkColor color;
-    color.pixel = 1;
-    gdk_gc_set_foreground(data_gc, &color);
-    gdk_draw_rectangle(M_BMPDATA->m_pixmap, data_gc, true, 0, 0, width, height);
-    GdkImage* data_image = gdk_drawable_get_image(M_BMPDATA->m_pixmap, 0, 0, width, height);
-
-    // Create mask image
-
-    GdkImage *mask_image = (GdkImage*) NULL;
-    GdkGC* mask_gc = NULL;
-
-    if (image.HasMask())
+    const int w = image.GetWidth();
+    const int h = image.GetHeight();
+    if (depth == 1)

     {
     {

-        wxMask* mask = new wxMask;
-        mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
-        mask_gc = gdk_gc_new(mask->m_bitmap);
-        gdk_gc_set_foreground(mask_gc, &color);
-        gdk_draw_rectangle(mask->m_bitmap, mask_gc, true, 0, 0, width, height);
-        mask_image = gdk_drawable_get_image(mask->m_bitmap, 0, 0, width, height);
-
-        SetMask( mask );
+        // create XBM format bitmap
+
+        // one bit per pixel, each row starts on a byte boundary
+        const size_t out_size = size_t((w + 7) / 8) * unsigned(h);
+        wxByte* out = new wxByte[out_size];
+        // set bits are black
+        memset(out, 0xff, out_size);
+        const wxByte* in = image.GetData();
+        unsigned bit_index = 0;
+        for (int y = 0; y < h; y++)
+        {
+            for (int x = 0; x < w; x++, in += 3, bit_index++)
+                if (in[0] == 255 && in[1] == 255 && in[2] == 255)
+                    out[bit_index >> 3] ^= 1 << (bit_index & 7);
+            // move index to next byte boundary
+            bit_index = (bit_index + 7) & ~7u;
+        }
+        SetPixmap(gdk_bitmap_create_from_data(wxGetRootWindow()->window, (char*)out, w, h));
+        delete[] out;
+    }
+    else
+    {
+        SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, w, h, depth));
+        GdkGC* gc = gdk_gc_new(M_BMPDATA->m_pixmap);
+        gdk_draw_rgb_image(
+            M_BMPDATA->m_pixmap, gc,
+            0, 0, w, h,
+            GDK_RGB_DITHER_NONE, image.GetData(), w * 3);
+        g_object_unref(gc);

     }
 
     }
 

-    int r_mask = image.GetMaskRed();
-    int g_mask = image.GetMaskGreen();
-    int b_mask = image.GetMaskBlue();
-
-    unsigned char* data = image.GetData();
-
-    int index = 0;
-    for (int y = 0; y < height; y++)
+    const wxByte* alpha = image.GetAlpha();
+    if (alpha != NULL || image.HasMask())

     {
     {

-        for (int x = 0; x < width; x++)
+        // create mask as XBM format bitmap
+
+        const size_t out_size = size_t((w + 7) / 8) * unsigned(h);
+        wxByte* out = new wxByte[out_size];
+        memset(out, 0xff, out_size);
+        unsigned bit_index = 0;
+        if (alpha != NULL)

         {
         {

-            int r = data[index];
-            index++;
-            int g = data[index];
-            index++;
-            int b = data[index];
-            index++;
-
-            if (mask_image != NULL)
+            for (int y = 0; y < h; y++)

             {
             {

-                if ((r == r_mask) && (b == b_mask) && (g == g_mask))
-                    gdk_image_put_pixel( mask_image, x, y, 0 );
+                for (int x = 0; x < w; x++, bit_index++)
+                    if (*alpha++ < wxIMAGE_ALPHA_THRESHOLD)
+                        out[bit_index >> 3] ^= 1 << (bit_index & 7);
+                bit_index = (bit_index + 7) & ~7u;

             }
             }

-
-            if ((r == 255) && (b == 255) && (g == 255))
-                gdk_image_put_pixel( data_image, x, y, 0 );
-
-        } // for
-    }  // for
-
-    // Blit picture
-
-    gdk_draw_image( GetPixmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
-
-    g_object_unref (data_image);
-    g_object_unref (data_gc);
-
-    // Blit mask
-
-    if (mask_image != NULL)
-    {
-        gdk_draw_image( GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
-
-        g_object_unref (mask_image);
-        g_object_unref (mask_gc);
-    }
-
-    return true;
-}
-
-// conversion to colour bitmap:
-bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image)
-{
-    // alpha is handled by CreateFromImageAsPixbuf
-    wxASSERT(!image.HasAlpha());
-
-    int width = image.GetWidth();
-    int height = image.GetHeight();
-
-    SetPixmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, -1 ) );
-
-    GdkGC *gc = gdk_gc_new( GetPixmap() );
-
-    gdk_draw_rgb_image( GetPixmap(),
-                        gc,
-                        0, 0,
-                        width, height,
-                        GDK_RGB_DITHER_NONE,
-                        image.GetData(),
-                        width*3 );
-
-    g_object_unref (gc);
-
-    // Create mask image
-
-    if (!image.HasMask())
-        return true;
-
-    wxMask* mask = new wxMask;
-    mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
-    GdkGC* mask_gc = gdk_gc_new(mask->m_bitmap);
-    GdkColor color;
-    color.pixel = 1;
-    gdk_gc_set_foreground(mask_gc, &color);
-    gdk_draw_rectangle(mask->m_bitmap, mask_gc, true, 0, 0, width, height);
-    GdkImage* mask_image = gdk_drawable_get_image(mask->m_bitmap, 0, 0, width, height);
-
-    SetMask( mask );
-
-    int r_mask = image.GetMaskRed();
-    int g_mask = image.GetMaskGreen();
-    int b_mask = image.GetMaskBlue();
-
-    unsigned char* data = image.GetData();
-
-    int index = 0;
-    for (int y = 0; y < height; y++)
-    {
-        for (int x = 0; x < width; x++)
+        }
+        else

         {
         {

-            int r = data[index];
-            index++;
-            int g = data[index];
-            index++;
-            int b = data[index];
-            index++;
-
-            if ((r == r_mask) && (b == b_mask) && (g == g_mask))
-                gdk_image_put_pixel( mask_image, x, y, 0 );
-        } // for
-    }  // for
-
-    // Blit mask
-
-    gdk_draw_image( GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
-
-    g_object_unref (mask_image);
-    g_object_unref (mask_gc);
-
+            const wxByte r_mask = image.GetMaskRed();
+            const wxByte g_mask = image.GetMaskGreen();
+            const wxByte b_mask = image.GetMaskBlue();
+            const wxByte* in = image.GetData();
+            for (int y = 0; y < h; y++)
+            {
+                for (int x = 0; x < w; x++, in += 3, bit_index++)
+                    if (in[0] == r_mask && in[1] == g_mask && in[2] == b_mask)
+                        out[bit_index >> 3] ^= 1 << (bit_index & 7);
+                bit_index = (bit_index + 7) & ~7u;
+            }
+        }
+        wxMask* mask = new wxMask;
+        mask->m_bitmap = gdk_bitmap_create_from_data(M_BMPDATA->m_pixmap, (char*)out, w, h);
+        SetMask(mask);
+        delete[] out;
+    }

     return true;
 }
 
     return true;
 }
 


@@ -682,7 +570,7 @@ bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
     int height = image.GetHeight();
 
     GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
     int height = image.GetHeight();
 
     GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,

-                                       image.HasAlpha(),
+                                       true, //image.HasAlpha(),

                                        8 /* bits per sample */,
                                        width, height);
     if (!pixbuf)
                                        8 /* bits per sample */,
                                        width, height);
     if (!pixbuf)


@@ -693,7 +581,7 @@ bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
     wxASSERT( gdk_pixbuf_get_width(pixbuf) == width );
     wxASSERT( gdk_pixbuf_get_height(pixbuf) == height );
 
     wxASSERT( gdk_pixbuf_get_width(pixbuf) == width );
     wxASSERT( gdk_pixbuf_get_height(pixbuf) == height );
 

-    SetDepth(wxTheApp->GetGdkVisual()->depth);
+    SetDepth(32);

     SetPixbuf(pixbuf);
 
     // Copy the data:
     SetPixbuf(pixbuf);
 
     // Copy the data:


@@ -723,7 +611,9 @@ wxImage wxBitmap::ConvertToImage() const
 
     wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
 
 
     wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
 

-    image.Create(GetWidth(), GetHeight());
+    const int w = GetWidth();
+    const int h = GetHeight();
+    image.Create(w, h);

     unsigned char *data = image.GetData();
 
     wxCHECK_MSG(data != NULL, wxNullImage, wxT("couldn't create image") );
     unsigned char *data = image.GetData();
 
     wxCHECK_MSG(data != NULL, wxNullImage, wxT("couldn't create image") );


@@ -733,9 +623,6 @@ wxImage wxBitmap::ConvertToImage() const
         GdkPixbuf *pixbuf = GetPixbuf();
         wxASSERT( gdk_pixbuf_get_has_alpha(pixbuf) );
 
         GdkPixbuf *pixbuf = GetPixbuf();
         wxASSERT( gdk_pixbuf_get_has_alpha(pixbuf) );
 

-        int w = GetWidth();
-        int h = GetHeight();
-

         image.SetAlpha();
 
         unsigned char *alpha = image.GetAlpha();
         image.SetAlpha();
 
         unsigned char *alpha = image.GetAlpha();


@@ -756,134 +643,58 @@ wxImage wxBitmap::ConvertToImage() const
     }
     else
     {
     }
     else
     {

-        // the colour used as transparent one in wxImage and the one it is
-        // replaced with when it really occurs in the bitmap
-        static const int MASK_RED = 1;
-        static const int MASK_GREEN = 2;
-        static const int MASK_BLUE = 3;
-        static const int MASK_BLUE_REPLACEMENT = 2;
-
-        GdkImage *gdk_image = (GdkImage*) NULL;
-
-        if (HasPixmap())
-        {
-            gdk_image = gdk_image_get( GetPixmap(),
-                                       0, 0,
-                                       GetWidth(), GetHeight() );
-        }
-        else
+        GdkPixmap* pixmap = GetPixmap();
+        GdkPixmap* pixmap_invert = NULL;
+        if (GetDepth() == 1)

         {
         {

-            wxFAIL_MSG( wxT("Ill-formed bitmap") );
+            // mono bitmaps are inverted, i.e. 0 is white
+            pixmap_invert = gdk_pixmap_new(pixmap, w, h, 1);
+            GdkGC* gc = gdk_gc_new(pixmap_invert);
+            gdk_gc_set_function(gc, GDK_COPY_INVERT);
+            gdk_draw_drawable(pixmap_invert, gc, pixmap, 0, 0, 0, 0, w, h);
+            g_object_unref(gc);
+            pixmap = pixmap_invert;

         }
         }

+        // create a pixbuf which shares data with the wxImage
+        GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(
+            data, GDK_COLORSPACE_RGB, false, 8, w, h, 3 * w, NULL, NULL);

 
 

-        wxCHECK_MSG( gdk_image, wxNullImage, wxT("couldn't create image") );
+        gdk_pixbuf_get_from_drawable(pixbuf, pixmap, NULL, 0, 0, 0, 0, w, h);

 
 

-        GdkImage *gdk_image_mask = (GdkImage*) NULL;
-        if (GetMask())
-        {
-            gdk_image_mask = gdk_image_get( GetMask()->GetBitmap(),
-                                            0, 0,
-                                            GetWidth(), GetHeight() );
+        g_object_unref(pixbuf);
+        if (pixmap_invert != NULL)
+            g_object_unref(pixmap_invert);

 
 

-            image.SetMaskColour( MASK_RED, MASK_GREEN, MASK_BLUE );
-        }
-
-        int bpp = -1;
-        int red_shift_right = 0;
-        int green_shift_right = 0;
-        int blue_shift_right = 0;
-        int red_shift_left = 0;
-        int green_shift_left = 0;
-        int blue_shift_left = 0;
-        bool use_shift = false;
-
-        if (GetDepth() != 1)
-        {
-            GdkVisual *visual = gdk_drawable_get_visual( GetPixmap() );
-            if (visual == NULL)
-                visual = wxTheApp->GetGdkVisual();
-
-            bpp = visual->depth;
-            if (bpp == 16)
-                bpp = visual->red_prec + visual->green_prec + visual->blue_prec;
-            red_shift_right = visual->red_shift;
-            red_shift_left = 8-visual->red_prec;
-            green_shift_right = visual->green_shift;
-            green_shift_left = 8-visual->green_prec;
-            blue_shift_right = visual->blue_shift;
-            blue_shift_left = 8-visual->blue_prec;
-
-            use_shift = (visual->type == GDK_VISUAL_TRUE_COLOR) || (visual->type == GDK_VISUAL_DIRECT_COLOR);
-        }
-        else
+        if (GetMask())

         {
         {

-            bpp = 1;
-        }
-
+            // the colour used as transparent one in wxImage and the one it is
+            // replaced with when it really occurs in the bitmap
+            const int MASK_RED = 1;
+            const int MASK_GREEN = 2;
+            const int MASK_BLUE = 3;
+            const int MASK_BLUE_REPLACEMENT = 2;

 
 

-        GdkColormap *cmap = gtk_widget_get_default_colormap();
+            image.SetMaskColour(MASK_RED, MASK_GREEN, MASK_BLUE);
+            GdkImage* image_mask = gdk_drawable_get_image(GetMask()->GetBitmap(), 0, 0, w, h);

 
 

-        long pos = 0;
-        for (int j = 0; j < GetHeight(); j++)
-        {
-            for (int i = 0; i < GetWidth(); i++)
+            for (int y = 0; y < h; y++)

             {
             {

-                wxUint32 pixel = gdk_image_get_pixel( gdk_image, i, j );
-                if (bpp == 1)
+                for (int x = 0; x < w; x++, data += 3)

                 {
                 {

-                    if (pixel == 0)
+                    if (gdk_image_get_pixel(image_mask, x, y) == 0)

                     {
                     {

-                        data[pos]   = 0;
-                        data[pos+1] = 0;
-                        data[pos+2] = 0;
+                        data[0] = MASK_RED;
+                        data[1] = MASK_GREEN;
+                        data[2] = MASK_BLUE;

                     }
                     }

-                    else
+                    else if (data[0] == MASK_RED && data[1] == MASK_GREEN && data[2] == MASK_BLUE)

                     {
                     {

-                        data[pos]   = 255;
-                        data[pos+1] = 255;
-                        data[pos+2] = 255;
+                        data[2] = MASK_BLUE_REPLACEMENT;

                     }
                 }
                     }
                 }

-                else if (use_shift)
-                {
-                    data[pos] =   (pixel >> red_shift_right)   << red_shift_left;
-                    data[pos+1] = (pixel >> green_shift_right) << green_shift_left;
-                    data[pos+2] = (pixel >> blue_shift_right)  << blue_shift_left;
-                }
-                else if (cmap->colors)
-                {
-                    data[pos] =   cmap->colors[pixel].red   >> 8;
-                    data[pos+1] = cmap->colors[pixel].green >> 8;
-                    data[pos+2] = cmap->colors[pixel].blue  >> 8;
-                }
-                else
-                {
-                    wxFAIL_MSG( wxT("Image conversion failed. Unknown visual type.") );
-                }
-
-                if (gdk_image_mask)
-                {
-                    int mask_pixel = gdk_image_get_pixel( gdk_image_mask, i, j );
-                    if (mask_pixel == 0)
-                    {
-                        data[pos] = MASK_RED;
-                        data[pos+1] = MASK_GREEN;
-                        data[pos+2] = MASK_BLUE;
-                    }
-                    else if ( data[pos] == MASK_RED &&
-                                data[pos+1] == MASK_GREEN &&
-                                    data[pos+2] == MASK_BLUE )
-                    {
-                        data[pos+2] = MASK_BLUE_REPLACEMENT;
-                    }
-                }
-
-                pos += 3;

             }
             }

+            g_object_unref(image_mask);

         }
         }

-
-        g_object_unref (gdk_image);
-        if (gdk_image_mask) g_object_unref (gdk_image_mask);

     }
 
     return image;
     }
 
     return image;


@@ -982,7 +793,7 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
     if (HasPixbuf())
     {
         GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
     if (HasPixbuf())
     {
         GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,

-                                           gdk_pixbuf_get_has_alpha(GetPixbuf()),
+                                           true, //gdk_pixbuf_get_has_alpha(GetPixbuf()),

                                            8, rect.width, rect.height);
         ret.SetPixbuf(pixbuf);
         ret.SetDepth(M_BMPDATA->m_bpp);
                                            8, rect.width, rect.height);
         ret.SetPixbuf(pixbuf);
         ret.SetDepth(M_BMPDATA->m_bpp);


@@ -993,23 +804,9 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
     else
     {
         ret = wxBitmap(rect.width, rect.height, M_BMPDATA->m_bpp);
     else
     {
         ret = wxBitmap(rect.width, rect.height, M_BMPDATA->m_bpp);

-        if (M_BMPDATA->m_bpp != 1)
-        {
-            GdkGC *gc = gdk_gc_new( ret.GetPixmap() );
-            gdk_draw_drawable( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
-            g_object_unref (gc);
-        }
-        else
-        {
-            GdkGC *gc = gdk_gc_new( ret.GetPixmap() );
-            GdkColor col;
-            col.pixel = 0xFFFFFF;
-            gdk_gc_set_foreground( gc, &col );
-            col.pixel = 0;
-            gdk_gc_set_background( gc, &col );
-            gdk_wx_draw_bitmap( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
-            g_object_unref (gc);
-        }
+        GdkGC *gc = gdk_gc_new( ret.GetPixmap() );
+        gdk_draw_drawable( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
+        g_object_unref (gc);

     }
 
     if (GetMask())
     }
 
     if (GetMask())


@@ -1018,12 +815,7 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
         mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, rect.width, rect.height, 1 );
 
         GdkGC *gc = gdk_gc_new( mask->m_bitmap );
         mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, rect.width, rect.height, 1 );
 
         GdkGC *gc = gdk_gc_new( mask->m_bitmap );

-        GdkColor col;
-        col.pixel = 0xFFFFFF;
-        gdk_gc_set_foreground( gc, &col );
-        col.pixel = 0;
-        gdk_gc_set_background( gc, &col );
-        gdk_wx_draw_bitmap( mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, rect.x, rect.y, 0, 0, rect.width, rect.height );
+        gdk_draw_drawable(mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, rect.x, rect.y, 0, 0, rect.width, rect.height);

         g_object_unref (gc);
 
         ret.SetMask( mask );
         g_object_unref (gc);
 
         ret.SetMask( mask );


@@ -1151,8 +943,10 @@ GdkPixbuf *wxBitmap::GetPixbuf() const
         int width = GetWidth();
         int height = GetHeight();
 
         int width = GetWidth();
         int height = GetHeight();
 

+        // always create the alpha channel so raw bitmap access will work
+        // correctly

         GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
         GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,

-                                           GetMask() != NULL,
+                                           true, // GetMask() != NULL,

                                            8, width, height);
         M_BMPDATA->m_pixbuf =
             gdk_pixbuf_get_from_drawable(pixbuf, M_BMPDATA->m_pixmap, NULL,
                                            8, width, height);
         M_BMPDATA->m_pixbuf =
             gdk_pixbuf_get_from_drawable(pixbuf, M_BMPDATA->m_pixmap, NULL,


@@ -1233,11 +1027,14 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
     if (!pixbuf)
         return NULL;
 
     if (!pixbuf)
         return NULL;
 

+    if (!gdk_pixbuf_get_has_alpha( pixbuf ))
+        return NULL;
+

 #if 0
     if (gdk_pixbuf_get_has_alpha( pixbuf ))
 #if 0
     if (gdk_pixbuf_get_has_alpha( pixbuf ))

-        wxPrintf( wxT("Has alpha\n") );
+        wxPrintf( wxT("Has alpha, %d channels\n"), gdk_pixbuf_get_n_channels(pixbuf) );

     else
     else

-        wxPrintf( wxT("No alpha.\n") );
+        wxPrintf( wxT("No alpha, %d channels.\n"), gdk_pixbuf_get_n_channels(pixbuf) );

 #endif
 
     data.m_height = gdk_pixbuf_get_height( pixbuf );
 #endif
 
     data.m_height = gdk_pixbuf_get_height( pixbuf );