Fix scrolling bug where client size was reported wrong

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

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 5bfb2f4e4b857cf17ffe7680488c06a3c34146a2..fcc84f778605550da17558f24b670e0bb9efb442 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -14,34 +14,16 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

-    #include "wx/dcmemory.h"

     #include "wx/palette.h"
     #include "wx/icon.h"
     #include "wx/math.h"
     #include "wx/palette.h"
     #include "wx/icon.h"
     #include "wx/math.h"

+    #include "wx/image.h"
+    #include "wx/colour.h"

 #endif
 
 #endif
 

-#include "wx/filefn.h"
-#include "wx/image.h"
-

 #include "wx/rawbmp.h"
 #include "wx/rawbmp.h"

-    // need this to get gdk_image_new_bitmap()
-    #define GDK_ENABLE_BROKEN

 
 

-#include <gdk/gdk.h>

 #include <gtk/gtk.h>
 #include <gtk/gtk.h>

-#include <gdk/gdkx.h>
-
-#include <gdk/gdkimage.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


@@ -95,87 +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 );
-
-    GdkColor color;
-    color.red = 65000;
-    color.green = 65000;
-    color.blue = 65000;
-    color.pixel = 1;
-    gdk_gc_set_foreground( gc, &color );
-    gdk_gc_set_fill( gc, GDK_SOLID );
-    gdk_draw_rectangle( m_bitmap, gc, TRUE, 0, 0, image.GetWidth(), image.GetHeight() );
-
-    unsigned char *data = image.GetData();
-    int index = 0;
+    const int w = bitmap.GetWidth();
+    const int h = bitmap.GetHeight();

 
 

-    unsigned char red = colour.Red();
-    unsigned char green = colour.Green();
-    unsigned char blue = colour.Blue();
+    // create mask as XBM format bitmap

 
 

-    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.red = 0;
-    color.green = 0;
-    color.blue = 0;
-    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;
 }
 


@@ -203,16 +158,15 @@ bool wxMask::Create( const wxBitmap& bitmap )
 
     if (!bitmap.Ok()) return false;
 
 
     if (!bitmap.Ok()) return false;
 

-    wxCHECK_MSG( bitmap.GetBitmap(), false, wxT("Cannot create mask from colour bitmap") );
+    wxCHECK_MSG( bitmap.GetDepth() == 1, false, wxT("Cannot create mask from colour bitmap") );

 
     m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, bitmap.GetWidth(), bitmap.GetHeight(), 1 );
 
     if (!m_bitmap) return false;
 
     GdkGC *gc = gdk_gc_new( m_bitmap );
 
     m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, bitmap.GetWidth(), bitmap.GetHeight(), 1 );
 
     if (!m_bitmap) return false;
 
     GdkGC *gc = gdk_gc_new( m_bitmap );

-
-    gdk_wx_draw_bitmap( m_bitmap, gc, bitmap.GetBitmap(), 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;


@@ -231,10 +185,9 @@ class wxBitmapRefData: public wxObjectRefData
 {
 public:
     wxBitmapRefData();
 {
 public:
     wxBitmapRefData();

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

 
     GdkPixmap      *m_pixmap;
 
     GdkPixmap      *m_pixmap;

-    GdkBitmap      *m_bitmap;

     GdkPixbuf      *m_pixbuf;
     wxMask         *m_mask;
     int             m_width;
     GdkPixbuf      *m_pixbuf;
     wxMask         *m_mask;
     int             m_width;


@@ -246,7 +199,6 @@ public:
 wxBitmapRefData::wxBitmapRefData()
 {
     m_pixmap = (GdkPixmap *) NULL;
 wxBitmapRefData::wxBitmapRefData()
 {
     m_pixmap = (GdkPixmap *) NULL;

-    m_bitmap = (GdkBitmap *) NULL;

     m_pixbuf = (GdkPixbuf *) NULL;
     m_mask = (wxMask *) NULL;
     m_width = 0;
     m_pixbuf = (GdkPixbuf *) NULL;
     m_mask = (wxMask *) NULL;
     m_width = 0;


@@ -259,8 +211,6 @@ wxBitmapRefData::~wxBitmapRefData()
 {
     if (m_pixmap)
         g_object_unref (m_pixmap);
 {
     if (m_pixmap)
         g_object_unref (m_pixmap);

-    if (m_bitmap)
-        g_object_unref (m_bitmap);

     if (m_pixbuf)
         g_object_unref (m_pixbuf);
     delete m_mask;
     if (m_pixbuf)
         g_object_unref (m_pixbuf);
     delete m_mask;


@@ -271,7 +221,7 @@ wxBitmapRefData::~wxBitmapRefData()
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 

-#define M_BMPDATA ((wxBitmapRefData *)m_refData)
+#define M_BMPDATA wx_static_cast(wxBitmapRefData*, m_refData)

 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
 


@@ -293,33 +243,23 @@ bool wxBitmap::Create( int width, int height, int depth )
         return false;
     }
 
         return false;
     }
 

-    GdkVisual *visual = wxTheApp->GetGdkVisual();
-
-    if (depth == -1)
-        depth = visual->depth;
-
-    wxCHECK_MSG( (depth == visual->depth) || (depth == 1) || (depth == 32), false,
-                    wxT("invalid bitmap depth") );
-
-    m_refData = new wxBitmapRefData();
-    M_BMPDATA->m_mask = (wxMask *) NULL;
-    M_BMPDATA->m_width = width;
-    M_BMPDATA->m_height = height;
-    if (depth == 1)
+    if (depth == 32)

     {
     {

-        M_BMPDATA->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
-        M_BMPDATA->m_bpp = 1;
-    }
-    else if (depth == 32)
-    {
-        M_BMPDATA->m_pixbuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB, true,
-                                              8, width, height);
+        SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, width, height));

         M_BMPDATA->m_bpp = 32;
     }
     else
     {
         M_BMPDATA->m_bpp = 32;
     }
     else
     {

-        M_BMPDATA->m_pixmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, depth );
-        M_BMPDATA->m_bpp = visual->depth;
+        if (depth != 1)
+        {
+            const GdkVisual* visual = wxTheApp->GetGdkVisual();
+            if (depth == -1)
+                depth = visual->depth;
+
+            wxCHECK_MSG(depth == visual->depth, false, wxT("invalid bitmap depth"));
+        }
+
+        SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, width, height, depth));

     }
 
     return Ok();
     }
 
     return Ok();


@@ -331,32 +271,25 @@ bool wxBitmap::CreateFromXpm( const char **bits )
 
     wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") );
 
 
     wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") );
 

-    GdkVisual *visual = wxTheApp->GetGdkVisual();
-
-    m_refData = new wxBitmapRefData();
-

     GdkBitmap *mask = (GdkBitmap*) NULL;
     GdkBitmap *mask = (GdkBitmap*) NULL;

-
-    M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( wxGetRootWindow()->window, &mask, NULL, (gchar **) bits );
+    SetPixmap(gdk_pixmap_create_from_xpm_d(wxGetRootWindow()->window, &mask, NULL, (gchar**)bits));

 
     wxCHECK_MSG( M_BMPDATA->m_pixmap, false, wxT("couldn't create pixmap") );
 
     if (mask)
     {
 
     wxCHECK_MSG( M_BMPDATA->m_pixmap, false, wxT("couldn't create pixmap") );
 
     if (mask)
     {

-        M_BMPDATA->m_mask = new wxMask();
+        M_BMPDATA->m_mask = new wxMask;

         M_BMPDATA->m_mask->m_bitmap = mask;
     }
 
         M_BMPDATA->m_mask->m_bitmap = mask;
     }
 

-    gdk_drawable_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
-
-    M_BMPDATA->m_bpp = visual->depth;  // Can we get a different depth from create_from_xpm_d() ?
-

     return true;
 }
 
 wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, int newx, int newy )
 {
     return true;
 }
 
 wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, int newx, int newy )
 {

-    wxCHECK_MSG( Ok(), wxNullBitmap, wxT("invalid bitmap") );
+    wxBitmap bmp;
+
+    wxCHECK_MSG(Ok(), bmp, wxT("invalid bitmap"));

 
     if (newy==M_BMPDATA->m_width && newy==M_BMPDATA->m_height)
         return *this;
 
     if (newy==M_BMPDATA->m_width && newy==M_BMPDATA->m_height)
         return *this;


@@ -366,15 +299,11 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
     width = wxMin(width, clipwidth);
     height = wxMin(height, clipheight);
 
     width = wxMin(width, clipwidth);
     height = wxMin(height, clipheight);
 

-    wxBitmap bmp;
-

     if (HasPixbuf())
     {
     if (HasPixbuf())
     {

-        bmp.SetWidth(width);
-        bmp.SetHeight(height);

         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,


@@ -384,42 +313,28 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
     }
     else
     {
     }
     else
     {

-        GdkImage *img = (GdkImage*) NULL;
-        if (GetPixmap())
-            img = gdk_image_get( GetPixmap(), 0, 0, GetWidth(), GetHeight() );
-        else if (GetBitmap())
-            img = gdk_image_get( GetBitmap(), 0, 0, GetWidth(), GetHeight() );
-        else
-            wxFAIL_MSG( wxT("Ill-formed bitmap") );
-
-        wxCHECK_MSG( img, wxNullBitmap, wxT("couldn't create image") );
-
-        int bpp = -1;
+        GdkImage* img = gdk_drawable_get_image(GetPixmap(), 0, 0, GetWidth(), GetHeight());

 
 

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

 
         GdkGC *gc = NULL;
         GdkPixmap *dstpix = NULL;
 
         GdkGC *gc = NULL;
         GdkPixmap *dstpix = NULL;

-        if (GetPixmap())
+        char *dst = NULL;
+        long dstbyteperline = 0;
+
+        if (GetDepth() != 1)

         {
             GdkVisual *visual = gdk_drawable_get_visual( GetPixmap() );
             if (visual == NULL)
                 visual = wxTheApp->GetGdkVisual();
 
         {
             GdkVisual *visual = gdk_drawable_get_visual( GetPixmap() );
             if (visual == NULL)
                 visual = wxTheApp->GetGdkVisual();
 

-            bpp = visual->depth;
-            bmp = wxBitmap(width,height,bpp);
+            bmp = wxBitmap(width, height, visual->depth);

             dstpix = bmp.GetPixmap();
             gc = gdk_gc_new( dstpix );
         }
             dstpix = bmp.GetPixmap();
             gc = gdk_gc_new( dstpix );
         }

-
-        char *dst = NULL;
-        long dstbyteperline = 0;
-
-        if (GetBitmap())
+        else

         {
         {

-            bpp = 1;
-            dstbyteperline = width/8*M_BMPDATA->m_bpp;
-            if (width*M_BMPDATA->m_bpp % 8 != 0)
-                dstbyteperline++;
+            dstbyteperline = (width + 7) / 8;

             dst = (char*) malloc(dstbyteperline*height);
         }
 
             dst = (char*) malloc(dstbyteperline*height);
         }
 


@@ -496,11 +411,9 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
 
         if (GetMask())
         {
 
         if (GetMask())
         {

-            dstbyteperline = width/8;
-            if (width % 8 != 0)
-                dstbyteperline++;
+            dstbyteperline = (width + 7) / 8;

             dst = (char*) malloc(dstbyteperline*height);
             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++)
             {


@@ -564,204 +477,90 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
     if (image.GetWidth() <= 0 || image.GetHeight() <= 0)
         return false;
 
     if (image.GetWidth() <= 0 || image.GetHeight() <= 0)
         return false;
 

-    m_refData = new wxBitmapRefData();
+    if (depth == 1)
+        return CreateFromImageAsPixmap(image, depth);
+
+    if (image.HasAlpha())
+        return CreateFromImageAsPixbuf(image);

 
 

+    return CreateFromImageAsPixmap(image, depth);
+}
+
+bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth)
+{
+    const int w = image.GetWidth();
+    const int h = image.GetHeight();

     if (depth == 1)
     {
     if (depth == 1)
     {

-        return CreateFromImageAsBitmap(image);
+        // 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
     {
     }
     else
     {

-        if (image.HasAlpha())
-            return CreateFromImageAsPixbuf(image);
-
-        return CreateFromImageAsPixmap(image);
+        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);

     }
     }

-}
-
-// conversion to mono bitmap:
-bool wxBitmap::CreateFromImageAsBitmap(const wxImage& img)
-{
-    // convert alpha channel to mask, if it is present:
-    wxImage image(img);
-    image.ConvertAlphaToMask();
-
-    int width = image.GetWidth();
-    int height = image.GetHeight();
-
-    SetHeight( height );
-    SetWidth( width );
-
-    SetBitmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) );
-
-    SetDepth( 1 );
-
-    GdkVisual *visual = wxTheApp->GetGdkVisual();
-
-    // Create picture image
-
-    unsigned char *data_data = (unsigned char*)malloc( ((width >> 3)+8) * height );

 
 

-    GdkImage *data_image =
-        gdk_image_new_bitmap( visual, data_data, width, height );
-
-    // Create mask image
-
-    GdkImage *mask_image = (GdkImage*) NULL;
-
-    if (image.HasMask())
+    const wxByte* alpha = image.GetAlpha();
+    if (alpha != NULL || image.HasMask())

     {
     {

-        unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
-
-        mask_image =  gdk_image_new_bitmap( visual, mask_data, width, height );
-
-        wxMask *mask = new wxMask();
-        mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
-
-        SetMask( mask );
-    }
-
-    int r_mask = image.GetMaskRed();
-    int g_mask = image.GetMaskGreen();
-    int b_mask = image.GetMaskBlue();
+        // create mask as XBM format bitmap

 
 

-    unsigned char* data = image.GetData();
-
-    int index = 0;
-    for (int y = 0; y < height; y++)
-    {
-        for (int x = 0; x < width; x++)
+        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 (image.HasMask())
+            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, 1 );
-                else
-                    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, 1 );
-            else
-                gdk_image_put_pixel( data_image, x, y, 0 );
-
-        } // for
-    }  // for
-
-    // Blit picture
-
-    GdkGC *data_gc = gdk_gc_new( GetBitmap() );
-
-    gdk_draw_image( GetBitmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
-
-    g_object_unref (data_image);
-    g_object_unref (data_gc);
-
-    // Blit mask
-
-    if (image.HasMask())
-    {
-        GdkGC *mask_gc = gdk_gc_new( GetMask()->GetBitmap() );
-
-        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& img)
-{
-    // convert alpha channel to mask, if it is present:
-    wxImage image(img);
-    image.ConvertAlphaToMask();
-
-    int width = image.GetWidth();
-    int height = image.GetHeight();
-
-    SetHeight( height );
-    SetWidth( width );
-
-    SetPixmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, -1 ) );
-
-    GdkVisual *visual = wxTheApp->GetGdkVisual();
-
-    int bpp = visual->depth;
-
-    SetDepth( bpp );
-
-    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
-
-    GdkImage *mask_image = (GdkImage*) NULL;
-
-    if (!image.HasMask())
-        return true;
-
-    unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
-
-    mask_image =  gdk_image_new_bitmap( visual, mask_data, width, height );
-
-    wxMask *mask = new wxMask();
-    mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
-
-    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, 1 );
-            else
-                gdk_image_put_pixel( mask_image, x, y, 0 );
-        } // for
-    }  // for
-
-    // Blit mask
-
-    GdkGC *mask_gc = gdk_gc_new( GetMask()->GetBitmap() );
-
-    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;
 }
 


@@ -771,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)


@@ -782,10 +581,8 @@ 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 );
 

-    M_BMPDATA->m_pixbuf = pixbuf;
-    SetHeight(height);
-    SetWidth(width);
-    SetDepth(wxTheApp->GetGdkVisual()->depth);
+    SetDepth(32);
+    SetPixbuf(pixbuf);

 
     // Copy the data:
     unsigned char *in = image.GetData();
 
     // Copy the data:
     unsigned char *in = image.GetData();


@@ -814,23 +611,18 @@ 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();
 
     unsigned char *data = image.GetData();
 

-    if (!data)
-    {
-        wxFAIL_MSG( wxT("couldn't create image") );
-        return wxNullImage;
-    }
+    wxCHECK_MSG(data != NULL, wxNullImage, wxT("couldn't create image") );

 
     if (HasPixbuf())
     {
         GdkPixbuf *pixbuf = GetPixbuf();
         wxASSERT( gdk_pixbuf_get_has_alpha(pixbuf) );
 
 
     if (HasPixbuf())
     {
         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();


@@ -851,140 +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 if (GetBitmap())
+        GdkPixmap* pixmap = GetPixmap();
+        GdkPixmap* pixmap_invert = NULL;
+        if (GetDepth() == 1)

         {
         {

-            gdk_image = gdk_image_get( GetBitmap(),
-                                       0, 0,
-                                       GetWidth(), GetHeight() );
+            // 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;

         }
         }

-        else
-        {
-            wxFAIL_MSG( wxT("Ill-formed bitmap") );
-        }
-
-        wxCHECK_MSG( gdk_image, wxNullImage, wxT("couldn't create image") );
-
-        GdkImage *gdk_image_mask = (GdkImage*) NULL;
-        if (GetMask())
-        {
-            gdk_image_mask = gdk_image_get( GetMask()->GetBitmap(),
-                                            0, 0,
-                                            GetWidth(), GetHeight() );
+        // 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);

 
 

-            image.SetMaskColour( MASK_RED, MASK_GREEN, MASK_BLUE );
-        }
+        gdk_pixbuf_get_from_drawable(pixbuf, pixmap, NULL, 0, 0, 0, 0, w, h);

 
 

-        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;
+        g_object_unref(pixbuf);
+        if (pixmap_invert != NULL)
+            g_object_unref(pixmap_invert);

 
 

-        if (GetPixmap())
-        {
-            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);
-        }
-        if (GetBitmap())
+        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;

 
 

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

 
 

-        GdkColormap *cmap = gtk_widget_get_default_colormap();
-
-        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;


@@ -999,21 +709,9 @@ wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth
 {
     if ( width > 0 && height > 0 )
     {
 {
     if ( width > 0 && height > 0 )
     {

-        m_refData = new wxBitmapRefData();
-
-        M_BMPDATA->m_mask = (wxMask *) NULL;
-        M_BMPDATA->m_bitmap = gdk_bitmap_create_from_data
-                              (
-                                wxGetRootWindow()->window,
-                                (gchar *) bits,
-                                width,
-                                height
-                              );
-        M_BMPDATA->m_width = width;
-        M_BMPDATA->m_height = height;
-        M_BMPDATA->m_bpp = 1;
-
-        wxASSERT_MSG( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") );
+        SetPixmap(gdk_bitmap_create_from_data(wxGetRootWindow()->window, bits, width, height));
+
+        wxASSERT_MSG( M_BMPDATA->m_pixmap, wxT("couldn't create bitmap") );

     }
 }
 
     }
 }
 


@@ -1036,7 +734,7 @@ bool wxBitmap::Ok() const
     return (m_refData != NULL) &&
            (
               M_BMPDATA->m_pixbuf ||
     return (m_refData != NULL) &&
            (
               M_BMPDATA->m_pixbuf ||

-              M_BMPDATA->m_bitmap || M_BMPDATA->m_pixmap
+              M_BMPDATA->m_pixmap

            );
 }
 
            );
 }
 


@@ -1080,48 +778,35 @@ void wxBitmap::SetMask( wxMask *mask )
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
     *this = icon;
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
     *this = icon;

-    return true;
+    return Ok();

 }
 
 wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
 {
 }
 
 wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
 {

+    wxBitmap ret;
+

     wxCHECK_MSG( Ok() &&
                  (rect.x >= 0) && (rect.y >= 0) &&
                  (rect.x+rect.width <= M_BMPDATA->m_width) && (rect.y+rect.height <= M_BMPDATA->m_height),
     wxCHECK_MSG( Ok() &&
                  (rect.x >= 0) && (rect.y >= 0) &&
                  (rect.x+rect.width <= M_BMPDATA->m_width) && (rect.y+rect.height <= M_BMPDATA->m_height),

-                 wxNullBitmap, wxT("invalid bitmap or bitmap region") );
-
-    wxBitmap ret( rect.width, rect.height, M_BMPDATA->m_bpp );
-    wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
+                 ret, wxT("invalid bitmap or bitmap region") );

 
     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);
                                            8, rect.width, rect.height);
         ret.SetPixbuf(pixbuf);

+        ret.SetDepth(M_BMPDATA->m_bpp);

         gdk_pixbuf_copy_area(GetPixbuf(),
                              rect.x, rect.y, rect.width, rect.height,
                              pixbuf, 0, 0);
     }
     else
     {
         gdk_pixbuf_copy_area(GetPixbuf(),
                              rect.x, rect.y, rect.width, rect.height,
                              pixbuf, 0, 0);
     }
     else
     {

-        if (ret.GetPixmap())
-        {
-            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.GetBitmap() );
-            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.GetBitmap(), gc, GetBitmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
-            g_object_unref (gc);
-        }
+        ret = wxBitmap(rect.width, rect.height, M_BMPDATA->m_bpp);
+        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())


@@ -1130,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 );


@@ -1149,57 +829,33 @@ bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalett
     wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );
 
     // Try to save the bitmap via wxImage handlers:
     wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );
 
     // Try to save the bitmap via wxImage handlers:

-    {
-        wxImage image = ConvertToImage();
-        if (image.Ok()) return image.SaveFile( name, type );
-    }
-
-    return false;
+    wxImage image = ConvertToImage();
+    return image.Ok() && image.SaveFile(name, type);

 }
 
 bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
 {
     UnRef();
 
 }
 
 bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
 {
     UnRef();
 

-    if (!wxFileExists(name))
-        return false;
-
-    GdkVisual *visual = wxTheApp->GetGdkVisual();
-

     if (type == wxBITMAP_TYPE_XPM)
     {
     if (type == wxBITMAP_TYPE_XPM)
     {

-        m_refData = new wxBitmapRefData();
-

         GdkBitmap *mask = (GdkBitmap*) NULL;
         GdkBitmap *mask = (GdkBitmap*) NULL;

-
-        M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm
-                              (
-                                wxGetRootWindow()->window,
-                                &mask,
-                                NULL,
-                                name.fn_str()
-                              );
+        SetPixmap(gdk_pixmap_create_from_xpm(wxGetRootWindow()->window, &mask, NULL, name.fn_str()));

 
         if (mask)
         {
 
         if (mask)
         {

-           M_BMPDATA->m_mask = new wxMask();
-           M_BMPDATA->m_mask->m_bitmap = mask;
+            M_BMPDATA->m_mask = new wxMask;
+            M_BMPDATA->m_mask->m_bitmap = mask;

         }
         }

-
-        gdk_drawable_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
-
-        M_BMPDATA->m_bpp = visual->depth;

     }
     else // try if wxImage can load it
     {
         wxImage image;
     }
     else // try if wxImage can load it
     {
         wxImage image;

-        if ( !image.LoadFile( name, type ) || !image.Ok() )
-            return false;
-
-        *this = wxBitmap(image);
+        if (image.LoadFile(name, type) && image.Ok())
+            *this = wxBitmap(image);

     }
 
     }
 

-    return true;
+    return Ok();

 }
 
 #if wxUSE_PALETTE
 }
 
 #if wxUSE_PALETTE


@@ -1220,7 +876,7 @@ void wxBitmap::SetPalette(const wxPalette& WXUNUSED(palette))
 void wxBitmap::SetHeight( int height )
 {
     if (!m_refData)
 void wxBitmap::SetHeight( int height )
 {
     if (!m_refData)

-        m_refData = new wxBitmapRefData();
+        m_refData = new wxBitmapRefData;

 
     M_BMPDATA->m_height = height;
 }
 
     M_BMPDATA->m_height = height;
 }


@@ -1228,7 +884,7 @@ void wxBitmap::SetHeight( int height )
 void wxBitmap::SetWidth( int width )
 {
     if (!m_refData)
 void wxBitmap::SetWidth( int width )
 {
     if (!m_refData)

-        m_refData = new wxBitmapRefData();
+        m_refData = new wxBitmapRefData;

 
     M_BMPDATA->m_width = width;
 }
 
     M_BMPDATA->m_width = width;
 }


@@ -1236,7 +892,7 @@ void wxBitmap::SetWidth( int width )
 void wxBitmap::SetDepth( int depth )
 {
     if (!m_refData)
 void wxBitmap::SetDepth( int depth )
 {
     if (!m_refData)

-        m_refData = new wxBitmapRefData();
+        m_refData = new wxBitmapRefData;

 
     M_BMPDATA->m_bpp = depth;
 }
 
     M_BMPDATA->m_bpp = depth;
 }


@@ -1244,18 +900,12 @@ void wxBitmap::SetDepth( int depth )
 void wxBitmap::SetPixmap( GdkPixmap *pixmap )
 {
     if (!m_refData)
 void wxBitmap::SetPixmap( GdkPixmap *pixmap )
 {
     if (!m_refData)

-        m_refData = new wxBitmapRefData();
+        m_refData = new wxBitmapRefData;

 
 

+    wxASSERT(M_BMPDATA->m_pixmap == NULL);

     M_BMPDATA->m_pixmap = pixmap;
     M_BMPDATA->m_pixmap = pixmap;

-    PurgeOtherRepresentations(Pixmap);
-}
-
-void wxBitmap::SetBitmap( GdkPixmap *bitmap )
-{
-    if (!m_refData)
-        m_refData = new wxBitmapRefData();
-
-    M_BMPDATA->m_bitmap = bitmap;
+    gdk_drawable_get_size(pixmap, &M_BMPDATA->m_width, &M_BMPDATA->m_height);
+    M_BMPDATA->m_bpp = gdk_drawable_get_depth(pixmap);

     PurgeOtherRepresentations(Pixmap);
 }
 
     PurgeOtherRepresentations(Pixmap);
 }
 


@@ -1264,10 +914,10 @@ GdkPixmap *wxBitmap::GetPixmap() const
     wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, wxT("invalid bitmap") );
 
     // create the pixmap on the fly if we use Pixbuf representation:
     wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, wxT("invalid bitmap") );
 
     // create the pixmap on the fly if we use Pixbuf representation:

-    if (HasPixbuf() && !HasPixmap())
+    if (M_BMPDATA->m_pixmap == NULL)

     {
         delete M_BMPDATA->m_mask;
     {
         delete M_BMPDATA->m_mask;

-        M_BMPDATA->m_mask = new wxMask();
+        M_BMPDATA->m_mask = new wxMask;

         gdk_pixbuf_render_pixmap_and_mask(M_BMPDATA->m_pixbuf,
                                           &M_BMPDATA->m_pixmap,
                                           &M_BMPDATA->m_mask->m_bitmap,
         gdk_pixbuf_render_pixmap_and_mask(M_BMPDATA->m_pixbuf,
                                           &M_BMPDATA->m_pixmap,
                                           &M_BMPDATA->m_mask->m_bitmap,


@@ -1284,24 +934,19 @@ bool wxBitmap::HasPixmap() const
     return M_BMPDATA->m_pixmap != NULL;
 }
 
     return M_BMPDATA->m_pixmap != NULL;
 }
 

-GdkBitmap *wxBitmap::GetBitmap() const
-{
-    wxCHECK_MSG( Ok(), (GdkBitmap *) NULL, wxT("invalid bitmap") );
-
-    return M_BMPDATA->m_bitmap;
-}
-

 GdkPixbuf *wxBitmap::GetPixbuf() const
 {
     wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );
 
 GdkPixbuf *wxBitmap::GetPixbuf() const
 {
     wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );
 

-    if (HasPixmap() && !HasPixbuf())
+    if (M_BMPDATA->m_pixbuf == NULL)

     {
         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,


@@ -1350,9 +995,12 @@ bool wxBitmap::HasPixbuf() const
 void wxBitmap::SetPixbuf( GdkPixbuf *pixbuf )
 {
     if (!m_refData)
 void wxBitmap::SetPixbuf( GdkPixbuf *pixbuf )
 {
     if (!m_refData)

-        m_refData = new wxBitmapRefData();
+        m_refData = new wxBitmapRefData;

 
 

+    wxASSERT(M_BMPDATA->m_pixbuf == NULL);

     M_BMPDATA->m_pixbuf = pixbuf;
     M_BMPDATA->m_pixbuf = pixbuf;

+    M_BMPDATA->m_width = gdk_pixbuf_get_width(pixbuf);
+    M_BMPDATA->m_height = gdk_pixbuf_get_height(pixbuf);

     PurgeOtherRepresentations(Pixbuf);
 }
 
     PurgeOtherRepresentations(Pixbuf);
 }
 


@@ -1379,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 );