]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/bitmap.cpp
Fixed compilo
[wxWidgets.git] / src / gtk / bitmap.cpp
index bdc547ac084d6121a6343844b0f8be0308a6803e..a14de5ece0c3cc956053f7b97fff3fec5b5cf718 100644 (file)
@@ -1,55 +1,28 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        bitmap.cpp
+// Name:        src/gtk/bitmap.cpp
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "bitmap.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
-#include "wx/palette.h"
 #include "wx/bitmap.h"
-#include "wx/icon.h"
-#include "wx/filefn.h"
-#include "wx/image.h"
-#include "wx/dcmemory.h"
-#include "wx/app.h"
-
-#ifdef __WXGTK20__
-    // need this to get gdk_image_new_bitmap()
-    #define GDK_ENABLE_BROKEN
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/palette.h"
+    #include "wx/icon.h"
+    #include "wx/math.h"
+    #include "wx/image.h"
 #endif
 
-#include <gdk/gdk.h>
+#include "wx/rawbmp.h"
+
 #include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-
-#ifdef __WXGTK20__
-    #include <gdk/gdkimage.h>
-#else // GTK+ 1.2
-    #include <gdk/gdkrgb.h>
-#endif // GTK+ 2.0/1.2
-
-#include <math.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
@@ -74,11 +47,13 @@ wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
     Create( bitmap, colour );
 }
 
+#if wxUSE_PALETTE
 wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex )
 {
     m_bitmap = (GdkBitmap *) NULL;
     Create( bitmap, paletteIndex );
 }
+#endif // wxUSE_PALETTE
 
 wxMask::wxMask( const wxBitmap& bitmap )
 {
@@ -89,7 +64,7 @@ wxMask::wxMask( const wxBitmap& bitmap )
 wxMask::~wxMask()
 {
     if (m_bitmap)
-        gdk_bitmap_unref( m_bitmap );
+        g_object_unref (m_bitmap);
 }
 
 bool wxMask::Create( const wxBitmap& bitmap,
@@ -97,129 +72,103 @@ bool wxMask::Create( const wxBitmap& bitmap,
 {
     if (m_bitmap)
     {
-        gdk_bitmap_unref( m_bitmap );
+        g_object_unref (m_bitmap);
         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;
-
-    unsigned char red = colour.Red();
-    unsigned char green = colour.Green();
-    unsigned char blue = colour.Blue();
+    const int w = bitmap.GetWidth();
+    const int h = bitmap.GetHeight();
 
-    GdkVisual *visual = wxTheApp->GetGdkVisual();
+    // create mask as XBM format bitmap
 
-    int bpp = visual->depth;
-    if ((bpp == 16) && (visual->red_mask != 0xf800))
-        bpp = 15;
-    if (bpp == 15)
+    // 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 & 0xf8;
-        blue = blue & 0xf8;
-    }
-    else if (bpp == 16)
-    {
-        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);
     }
-
-    gdk_gc_unref( gc );
-
-    return TRUE;
+    m_bitmap = gdk_bitmap_create_from_data(wxGetRootWindow()->window, (char*)out, w, h);
+    delete[] out;
+    return true;
 }
 
+#if wxUSE_PALETTE
 bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex )
 {
     unsigned char r,g,b;
     wxPalette *pal = bitmap.GetPalette();
 
-    wxCHECK_MSG( pal, FALSE, wxT("Cannot create mask from bitmap without palette") );
+    wxCHECK_MSG( pal, false, wxT("Cannot create mask from bitmap without palette") );
 
     pal->GetRGB(paletteIndex, &r, &g, &b);
 
     return Create(bitmap, wxColour(r, g, b));
 }
+#endif // wxUSE_PALETTE
 
 bool wxMask::Create( const wxBitmap& bitmap )
 {
     if (m_bitmap)
     {
-        gdk_bitmap_unref( m_bitmap );
+        g_object_unref (m_bitmap);
         m_bitmap = (GdkBitmap*) NULL;
     }
 
-    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;
+    if (!m_bitmap) return false;
 
     GdkGC *gc = gdk_gc_new( m_bitmap );
+    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);
 
-    gdk_wx_draw_bitmap( m_bitmap, gc, bitmap.GetBitmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight() );
-
-    gdk_gc_unref( gc );
-
-    return TRUE;
+    return true;
 }
 
 GdkBitmap *wxMask::GetBitmap() const
@@ -238,7 +187,7 @@ public:
     ~wxBitmapRefData();
 
     GdkPixmap      *m_pixmap;
-    GdkBitmap      *m_bitmap;
+    GdkPixbuf      *m_pixbuf;
     wxMask         *m_mask;
     int             m_width;
     int             m_height;
@@ -249,7 +198,7 @@ public:
 wxBitmapRefData::wxBitmapRefData()
 {
     m_pixmap = (GdkPixmap *) NULL;
-    m_bitmap = (GdkBitmap *) NULL;
+    m_pixbuf = (GdkPixbuf *) NULL;
     m_mask = (wxMask *) NULL;
     m_width = 0;
     m_height = 0;
@@ -260,16 +209,18 @@ wxBitmapRefData::wxBitmapRefData()
 wxBitmapRefData::~wxBitmapRefData()
 {
     if (m_pixmap)
-        gdk_pixmap_unref( m_pixmap );
-    if (m_bitmap)
-        gdk_bitmap_unref( m_bitmap );
+        g_object_unref (m_pixmap);
+    if (m_pixbuf)
+        g_object_unref (m_pixbuf);
     delete m_mask;
+#if wxUSE_PALETTE
     delete m_palette;
+#endif // wxUSE_PALETTE
 }
 
 //-----------------------------------------------------------------------------
 
-#define M_BMPDATA ((wxBitmapRefData *)m_refData)
+#define M_BMPDATA wx_static_cast(wxBitmapRefData*, m_refData)
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
 
@@ -291,27 +242,23 @@ bool wxBitmap::Create( int width, int height, int depth )
         return false;
     }
 
-    GdkVisual *visual = wxTheApp->GetGdkVisual();
-
-    if (depth == -1)
-        depth = visual->depth;
-
-    wxCHECK_MSG( (depth == visual->depth) || (depth == 1), 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;
+        SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, width, height));
+        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();
@@ -321,167 +268,95 @@ bool wxBitmap::CreateFromXpm( const char **bits )
 {
     UnRef();
 
-    wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") )
-
-    GdkVisual *visual = wxTheApp->GetGdkVisual();
-
-    m_refData = new wxBitmapRefData();
+    wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") );
 
     GdkBitmap *mask = (GdkBitmap*) NULL;
+    SetPixmap(gdk_pixmap_create_from_xpm_d(wxGetRootWindow()->window, &mask, NULL, (gchar**)bits));
 
-    M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( wxGetRootWindow()->window, &mask, NULL, (gchar **) bits );
-
-    wxCHECK_MSG( M_BMPDATA->m_pixmap, FALSE, wxT("couldn't create pixmap") );
+    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;
     }
 
-    gdk_window_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;
+    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;
-        
-    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") );
-
-    wxBitmap bmp;
-    int bpp = -1;
 
     int width = wxMax(newx, 1);
     int height = wxMax(newy, 1);
     width = wxMin(width, clipwidth);
     height = wxMin(height, clipheight);
-    
-    GdkGC *gc = NULL;
-    GdkPixmap *dstpix = NULL;
-    if (GetPixmap())
-    {
-        GdkVisual *visual = gdk_window_get_visual( GetPixmap() );
-        if (visual == NULL)
-            visual = wxTheApp->GetGdkVisual();
-
-        bpp = visual->depth;
-        bmp = wxBitmap(width,height,bpp);
-        dstpix = bmp.GetPixmap();
-        gc = gdk_gc_new( dstpix );
-    }
 
-    char *dst = NULL;
-    long dstbyteperline = 0;
-    
-    if (GetBitmap())
+    if (HasPixbuf())
     {
-        bpp = 1;
-        dstbyteperline = width/8*M_BMPDATA->m_bpp;
-        if (width*M_BMPDATA->m_bpp % 8 != 0)
-            dstbyteperline++;
-        dst = (char*) malloc(dstbyteperline*height);
+        bmp.SetDepth(GetDepth());
+        bmp.SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB,
+                                     true, //gdk_pixbuf_get_has_alpha(GetPixbuf()),
+                                     8, width, height));
+        gdk_pixbuf_scale(GetPixbuf(), bmp.GetPixbuf(),
+                         0, 0, width, height,
+                         clipx, clipy,
+                         (double)newx/GetWidth(), (double)newy/GetHeight(),
+                         GDK_INTERP_BILINEAR);
     }
-             
-    // be careful to use the right scaling factor
-    float scx = (float)M_BMPDATA->m_width/(float)newx;
-    float scy = (float)M_BMPDATA->m_height/(float)newy;
-    // prepare accel-tables
-    int *tablex = (int *)calloc(width,sizeof(int));
-    int *tabley = (int *)calloc(height,sizeof(int));
-
-    // accel table filled with clipped values
-    for (int x = 0; x < width; x++)
-        tablex[x] = (int) (scx * (x+clipx));
-    for (int y = 0; y < height; y++)
-        tabley[y] = (int) (scy * (y+clipy));
-
-    // Main rescaling routine starts here
-    for (int h = 0; h < height; h++)
+    else
     {
-        char outbyte = 0;
-        int old_x = -1;
-        guint32 old_pixval = 0;
+        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;
+        char *dst = NULL;
+        long dstbyteperline = 0;
 
-        for (int w = 0; w < width; w++)
+        if (GetDepth() != 1)
         {
-            guint32 pixval;
-            int x = tablex[w];
-            if (x == old_x)
-                pixval = old_pixval;
-            else
-            {
-                pixval = gdk_image_get_pixel( img, x, tabley[h] );
-                old_pixval = pixval;
-                old_x = x;
-            }
-                
-            if (bpp == 1)
-            {
-                if (!pixval)
-                {
-                    char bit=1;
-                    char shift = bit << w % 8;
-                    outbyte |= shift;
-                }
-                
-                if ((w+1)%8==0)
-                {
-                    dst[h*dstbyteperline+w/8] = outbyte;
-                    outbyte = 0;
-                }
-            }
-            else
-            {
-                GdkColor col;
-                col.pixel = pixval;
-                gdk_gc_set_foreground( gc, &col );
-                gdk_draw_point( dstpix, gc, w, h);
-            }
+            GdkVisual *visual = gdk_drawable_get_visual( GetPixmap() );
+            if (visual == NULL)
+                visual = wxTheApp->GetGdkVisual();
+
+            bmp = wxBitmap(width, height, visual->depth);
+            dstpix = bmp.GetPixmap();
+            gc = gdk_gc_new( dstpix );
+        }
+        else
+        {
+            dstbyteperline = (width + 7) / 8;
+            dst = (char*) malloc(dstbyteperline*height);
         }
-    
-        // do not forget the last byte
-        if ((bpp == 1) && (width % 8 != 0))
-            dst[h*dstbyteperline+width/8] = outbyte;
-    }
-    
-    gdk_image_destroy( img );
-    if (gc) gdk_gc_unref( gc );
 
-    if (bpp == 1)
-    {
-        bmp = wxBitmap( (const char *)dst, width, height, 1 );
-        free( dst );
-    }
-    
-    if (GetMask())
-    {
-        dstbyteperline = width/8;
-        if (width % 8 != 0)
-            dstbyteperline++;
-        dst = (char*) malloc(dstbyteperline*height);
-        img = gdk_image_get( GetMask()->GetBitmap(), 0, 0, GetWidth(), GetHeight() );
+        // be careful to use the right scaling factor
+        float scx = (float)M_BMPDATA->m_width/(float)newx;
+        float scy = (float)M_BMPDATA->m_height/(float)newy;
+        // prepare accel-tables
+        int *tablex = (int *)calloc(width,sizeof(int));
+        int *tabley = (int *)calloc(height,sizeof(int));
+
+        // accel table filled with clipped values
+        for (int x = 0; x < width; x++)
+            tablex[x] = (int) (scx * (x+clipx));
+        for (int y = 0; y < height; y++)
+            tabley[y] = (int) (scy * (y+clipy));
 
+        // Main rescaling routine starts here
         for (int h = 0; h < height; h++)
         {
             char outbyte = 0;
             int old_x = -1;
             guint32 old_pixval = 0;
-    
+
             for (int w = 0; w < width; w++)
             {
                 guint32 pixval;
@@ -494,541 +369,337 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
                     old_pixval = pixval;
                     old_x = x;
                 }
-                
-                if (pixval)
+
+                if ( dst )
                 {
-                    char bit=1;
-                    char shift = bit << w % 8;
-                    outbyte |= shift;
+                    if (!pixval)
+                    {
+                        char bit=1;
+                        char shift = bit << (w % 8);
+                        outbyte |= shift;
+                    }
+
+                    if ((w+1)%8==0)
+                    {
+                        dst[h*dstbyteperline+w/8] = outbyte;
+                        outbyte = 0;
+                    }
                 }
-                
-                if ((w+1)%8 == 0)
+                else
                 {
-                    dst[h*dstbyteperline+w/8] = outbyte;
-                    outbyte = 0;
+                    GdkColor col;
+                    col.pixel = pixval;
+                    gdk_gc_set_foreground( gc, &col );
+                    gdk_draw_point( dstpix, gc, w, h);
                 }
             }
-        
+
             // do not forget the last byte
-            if (width % 8 != 0)
+            if ( dst && (width % 8 != 0) )
                 dst[h*dstbyteperline+width/8] = outbyte;
         }
-        wxMask* mask = new wxMask;
-        mask->m_bitmap = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) dst, width, height );
-        bmp.SetMask(mask);
 
-        free( dst );
-        gdk_image_destroy( img );
-    }
-
-    free( tablex );
-    free( tabley );
-    
-    return bmp; 
-}
-
-bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
-{
-    UnRef();
-
-    wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") )
-    wxCHECK_MSG( depth == -1 || depth == 1, FALSE, wxT("invalid bitmap depth") )
-
-    int width = image.GetWidth();
-    int height = image.GetHeight();
-
-    if ( width <= 0 || height <= 0 )
-    {
-        return false;
-    }
-
-    m_refData = new wxBitmapRefData();
-
-    SetHeight( height );
-    SetWidth( width );
-
-    // ------
-    // conversion to mono bitmap:
-    // ------
-    if (depth == 1)
-    {
-        SetBitmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) );
-
-        SetDepth( 1 );
-
-        GdkVisual *visual = wxTheApp->GetGdkVisual();
-
-        // Create picture image
+        g_object_unref (img);
+        if (gc) g_object_unref (gc);
 
-        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())
+        if ( dst )
         {
-            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 );
+            bmp = wxBitmap( (const char *)dst, width, height, 1 );
+            free( dst );
         }
 
-        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++)
+        if (GetMask())
         {
-            for (int x = 0; x < width; x++)
+            dstbyteperline = (width + 7) / 8;
+            dst = (char*) malloc(dstbyteperline*height);
+            img = gdk_drawable_get_image(GetMask()->GetBitmap(), 0, 0, GetWidth(), GetHeight());
+
+            for (int h = 0; h < height; h++)
             {
-                int r = data[index];
-                index++;
-                int g = data[index];
-                index++;
-                int b = data[index];
-                index++;
-
-                if (image.HasMask())
+                char outbyte = 0;
+                int old_x = -1;
+                guint32 old_pixval = 0;
+
+                for (int w = 0; w < width; w++)
                 {
-                    if ((r == r_mask) && (b == b_mask) && (g == g_mask))
-                        gdk_image_put_pixel( mask_image, x, y, 1 );
+                    guint32 pixval;
+                    int x = tablex[w];
+                    if (x == old_x)
+                        pixval = old_pixval;
                     else
-                        gdk_image_put_pixel( mask_image, x, y, 0 );
+                    {
+                        pixval = gdk_image_get_pixel( img, x, tabley[h] );
+                        old_pixval = pixval;
+                        old_x = x;
+                    }
+
+                    if (pixval)
+                    {
+                        char bit=1;
+                        char shift = bit << (w % 8);
+                        outbyte |= shift;
+                    }
+
+                    if ((w+1)%8 == 0)
+                    {
+                        dst[h*dstbyteperline+w/8] = outbyte;
+                        outbyte = 0;
+                    }
                 }
 
-                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 );
+                // do not forget the last byte
+                if (width % 8 != 0)
+                    dst[h*dstbyteperline+width/8] = outbyte;
+            }
+            wxMask* mask = new wxMask;
+            mask->m_bitmap = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) dst, width, height );
+            bmp.SetMask(mask);
 
-            } // for
-        }  // for
+            free( dst );
+            g_object_unref (img);
+        }
+
+        free( tablex );
+        free( tabley );
+    }
 
-        // Blit picture
+    return bmp;
+}
 
-        GdkGC *data_gc = gdk_gc_new( GetBitmap() );
+bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
+{
+    UnRef();
 
-        gdk_draw_image( GetBitmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
+    wxCHECK_MSG( image.Ok(), false, wxT("invalid image") );
+    wxCHECK_MSG( depth == -1 || depth == 1, false, wxT("invalid bitmap depth") );
 
-        gdk_image_destroy( data_image );
-        gdk_gc_unref( data_gc );
+    if (image.GetWidth() <= 0 || image.GetHeight() <= 0)
+        return false;
 
-        // Blit mask
+    if (depth == 1)
+        return CreateFromImageAsPixmap(image, depth);
 
-        if (image.HasMask())
-        {
-            GdkGC *mask_gc = gdk_gc_new( GetMask()->GetBitmap() );
+    if (image.HasAlpha())
+        return CreateFromImageAsPixbuf(image);
 
-            gdk_draw_image( GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
+    return CreateFromImageAsPixmap(image, depth);
+}
 
-            gdk_image_destroy( mask_image );
-            gdk_gc_unref( mask_gc );
+bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth)
+{
+    const int w = image.GetWidth();
+    const int h = image.GetHeight();
+    if (depth == 1)
+    {
+        // 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;
     }
-
-    // ------
-    // conversion to colour bitmap:
-    // ------
     else
     {
-        SetPixmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, -1 ) );
-
-        GdkVisual *visual = wxTheApp->GetGdkVisual();
-
-        int bpp = visual->depth;
-
-        SetDepth( bpp );
+        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);
+    }
 
-        if ((bpp == 16) && (visual->red_mask != 0xf800))
-            bpp = 15;
-        else if (bpp < 8)
-            bpp = 8;
+    const wxByte* alpha = image.GetAlpha();
+    if (alpha != NULL || image.HasMask())
+    {
+        // create mask as XBM format bitmap
 
-        // We handle 8-bit bitmaps ourselves using the colour cube, 12-bit
-        // visuals are not supported by GDK so we do these ourselves, too.
-        // 15-bit and 16-bit should actually work and 24-bit certainly does.
-#ifdef __sgi
-        if (!image.HasMask() && (bpp > 16))
-#else
-        if (!image.HasMask() && (bpp > 12))
-#endif
+        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)
         {
-            static bool s_hasInitialized = FALSE;
-
-            if (!s_hasInitialized)
+            for (int y = 0; y < h; y++)
             {
-                gdk_rgb_init();
-                s_hasInitialized = TRUE;
+                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;
             }
-
-            GdkGC *gc = gdk_gc_new( GetPixmap() );
-
-            gdk_draw_rgb_image( GetPixmap(),
-                                gc,
-                                0, 0,
-                                width, height,
-                                GDK_RGB_DITHER_NONE,
-                                image.GetData(),
-                                width*3 );
-
-            gdk_gc_unref( gc );
-            return TRUE;
-        }
-
-        // Create picture image
-
-        GdkImage *data_image =
-            gdk_image_new( GDK_IMAGE_FASTEST, visual, width, height );
-
-        // Create mask image
-
-        GdkImage *mask_image = (GdkImage*) NULL;
-
-        if (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 );
         }
-
-        // Render
-
-        enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
-        byte_order b_o = RGB;
-
-        if (bpp > 8)
+        else
         {
-            if ((visual->red_mask > visual->green_mask) && (visual->green_mask > visual->blue_mask))      b_o = RGB;
-            else if ((visual->red_mask > visual->blue_mask) && (visual->blue_mask > visual->green_mask))  b_o = RBG;
-            else if ((visual->blue_mask > visual->red_mask) && (visual->red_mask > visual->green_mask))   b_o = BRG;
-            else if ((visual->blue_mask > visual->green_mask) && (visual->green_mask > visual->red_mask)) b_o = BGR;
-            else if ((visual->green_mask > visual->red_mask) && (visual->red_mask > visual->blue_mask))   b_o = GRB;
-            else if ((visual->green_mask > visual->blue_mask) && (visual->blue_mask > visual->red_mask))  b_o = GBR;
-        }
-
-        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++)
+            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++)
             {
-                int r = data[index];
-                index++;
-                int g = data[index];
-                index++;
-                int b = data[index];
-                index++;
-
-                if (image.HasMask())
-                {
-                    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++, 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;
+}
 
-                switch (bpp)
-                {
-                    case 8:
-                    {
-                        int pixel = -1;
-                        if (wxTheApp->m_colorCube)
-                        {
-                            pixel = wxTheApp->m_colorCube[ ((r & 0xf8) << 7) + ((g & 0xf8) << 2) + ((b & 0xf8) >> 3) ];
-                        }
-                        else
-                        {
-                            GdkColormap *cmap = gtk_widget_get_default_colormap();
-                            GdkColor *colors = cmap->colors;
-                            int max = 3 * (65536);
-
-                            for (int i = 0; i < cmap->size; i++)
-                            {
-                                int rdiff = (r << 8) - colors[i].red;
-                                int gdiff = (g << 8) - colors[i].green;
-                                int bdiff = (b << 8) - colors[i].blue;
-                                int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
-                                if (sum < max) { pixel = i; max = sum; }
-                            }
-                        }
-
-                        gdk_image_put_pixel( data_image, x, y, pixel );
-
-                        break;
-                    }
-                    case 12:  // SGI only
-                    {
-                        guint32 pixel = 0;
-                        switch (b_o)
-                        {
-                            case RGB: pixel = ((r & 0xf0) << 4) | (g & 0xf0) | ((b & 0xf0) >> 4); break;
-                            case RBG: pixel = ((r & 0xf0) << 4) | (b & 0xf0) | ((g & 0xf0) >> 4); break;
-                            case GRB: pixel = ((g & 0xf0) << 4) | (r & 0xf0) | ((b & 0xf0) >> 4); break;
-                            case GBR: pixel = ((g & 0xf0) << 4) | (b & 0xf0) | ((r & 0xf0) >> 4); break;
-                            case BRG: pixel = ((b & 0xf0) << 4) | (r & 0xf0) | ((g & 0xf0) >> 4); break;
-                            case BGR: pixel = ((b & 0xf0) << 4) | (g & 0xf0) | ((r & 0xf0) >> 4); break;
-                        }
-                        gdk_image_put_pixel( data_image, x, y, pixel );
-                        break;
-                    }
-                    case 15:
-                    {
-                        guint32 pixel = 0;
-                        switch (b_o)
-                        {
-                            case RGB: pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3); break;
-                            case RBG: pixel = ((r & 0xf8) << 7) | ((b & 0xf8) << 2) | ((g & 0xf8) >> 3); break;
-                            case GRB: pixel = ((g & 0xf8) << 7) | ((r & 0xf8) << 2) | ((b & 0xf8) >> 3); break;
-                            case GBR: pixel = ((g & 0xf8) << 7) | ((b & 0xf8) << 2) | ((r & 0xf8) >> 3); break;
-                            case BRG: pixel = ((b & 0xf8) << 7) | ((r & 0xf8) << 2) | ((g & 0xf8) >> 3); break;
-                            case BGR: pixel = ((b & 0xf8) << 7) | ((g & 0xf8) << 2) | ((r & 0xf8) >> 3); break;
-                        }
-                        gdk_image_put_pixel( data_image, x, y, pixel );
-                        break;
-                    }
-                    case 16:
-                    {
-                        // I actually don't know if for 16-bit displays, it is alway the green
-                        // component or the second component which has 6 bits.
-                        guint32 pixel = 0;
-                        switch (b_o)
-                        {
-                            case RGB: pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3); break;
-                            case RBG: pixel = ((r & 0xf8) << 8) | ((b & 0xfc) << 3) | ((g & 0xf8) >> 3); break;
-                            case GRB: pixel = ((g & 0xf8) << 8) | ((r & 0xfc) << 3) | ((b & 0xf8) >> 3); break;
-                            case GBR: pixel = ((g & 0xf8) << 8) | ((b & 0xfc) << 3) | ((r & 0xf8) >> 3); break;
-                            case BRG: pixel = ((b & 0xf8) << 8) | ((r & 0xfc) << 3) | ((g & 0xf8) >> 3); break;
-                            case BGR: pixel = ((b & 0xf8) << 8) | ((g & 0xfc) << 3) | ((r & 0xf8) >> 3); break;
-                        }
-                        gdk_image_put_pixel( data_image, x, y, pixel );
-                        break;
-                    }
-                    case 32:
-                    case 24:
-                    {
-                        guint32 pixel = 0;
-                        switch (b_o)
-                        {
-                            case RGB: pixel = (r << 16) | (g << 8) | b; break;
-                            case RBG: pixel = (r << 16) | (b << 8) | g; break;
-                            case BRG: pixel = (b << 16) | (r << 8) | g; break;
-                            case BGR: pixel = (b << 16) | (g << 8) | r; break;
-                            case GRB: pixel = (g << 16) | (r << 8) | b; break;
-                            case GBR: pixel = (g << 16) | (b << 8) | r; break;
-                        }
-                        gdk_image_put_pixel( data_image, x, y, pixel );
-                    }
-                    default: break;
-                }
-            } // for
-        }  // for
+bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
+{
+    int width = image.GetWidth();
+    int height = image.GetHeight();
 
-        // Blit picture
+    GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
+                                       true, //image.HasAlpha(),
+                                       8 /* bits per sample */,
+                                       width, height);
+    if (!pixbuf)
+        return false;
 
-        GdkGC *data_gc = gdk_gc_new( GetPixmap() );
+    wxASSERT( image.HasAlpha() ); // for now
+    wxASSERT( gdk_pixbuf_get_n_channels(pixbuf) == 4 );
+    wxASSERT( gdk_pixbuf_get_width(pixbuf) == width );
+    wxASSERT( gdk_pixbuf_get_height(pixbuf) == height );
 
-        gdk_draw_image( GetPixmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
+    SetDepth(32);
+    SetPixbuf(pixbuf);
 
-        gdk_image_destroy( data_image );
-        gdk_gc_unref( data_gc );
+    // Copy the data:
+    unsigned char *in = image.GetData();
+    unsigned char *out = gdk_pixbuf_get_pixels(pixbuf);
+    unsigned char *alpha = image.GetAlpha();
 
-        // Blit mask
+    int rowinc = gdk_pixbuf_get_rowstride(pixbuf) - 4 * width;
 
-        if (image.HasMask())
+    for (int y = 0; y < height; y++, out += rowinc)
+    {
+        for (int x = 0; x < width; x++, alpha++, out += 4, in += 3)
         {
-            GdkGC *mask_gc = gdk_gc_new( GetMask()->GetBitmap() );
-
-            gdk_draw_image( GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
-
-            gdk_image_destroy( mask_image );
-            gdk_gc_unref( mask_gc );
+            out[0] = in[0];
+            out[1] = in[1];
+            out[2] = in[2];
+            out[3] = *alpha;
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 wxImage wxBitmap::ConvertToImage() const
 {
-    // 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;
-
     wxImage image;
 
     wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
 
-    GdkImage *gdk_image = (GdkImage*) NULL;
-    if (GetPixmap())
-    {
-        gdk_image = gdk_image_get( GetPixmap(),
-                                   0, 0,
-                                   GetWidth(), GetHeight() );
-    }
-    else if (GetBitmap())
-    {
-        gdk_image = gdk_image_get( GetBitmap(),
-                                   0, 0,
-                                   GetWidth(), GetHeight() );
-    }
-    else
-    {
-        wxFAIL_MSG( wxT("Ill-formed bitmap") );
-    }
-
-    wxCHECK_MSG( gdk_image, wxNullImage, wxT("couldn't create image") );
+    const int w = GetWidth();
+    const int h = GetHeight();
+    image.Create(w, h);
+    unsigned char *data = image.GetData();
 
-    image.Create( GetWidth(), GetHeight() );
-    char unsigned *data = image.GetData();
+    wxCHECK_MSG(data != NULL, wxNullImage, wxT("couldn't create image") );
 
-    if (!data)
+    if (HasPixbuf())
     {
-        gdk_image_destroy( gdk_image );
-        wxFAIL_MSG( wxT("couldn't create image") );
-        return wxNullImage;
-    }
+        GdkPixbuf *pixbuf = GetPixbuf();
+        wxASSERT( gdk_pixbuf_get_has_alpha(pixbuf) );
 
-    GdkImage *gdk_image_mask = (GdkImage*) NULL;
-    if (GetMask())
-    {
-        gdk_image_mask = gdk_image_get( GetMask()->GetBitmap(),
-                                        0, 0,
-                                        GetWidth(), GetHeight() );
+        image.SetAlpha();
 
-        image.SetMaskColour( MASK_RED, MASK_GREEN, MASK_BLUE );
-    }
+        unsigned char *alpha = image.GetAlpha();
+        unsigned char *in = gdk_pixbuf_get_pixels(pixbuf);
+        unsigned char *out = data;
+        int rowinc = gdk_pixbuf_get_rowstride(pixbuf) - 4 * w;
 
-    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 (GetPixmap())
-    {
-        GdkVisual *visual = gdk_window_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);
+        for (int y = 0; y < h; y++, in += rowinc)
+        {
+            for (int x = 0; x < w; x++, in += 4, out += 3, alpha++)
+            {
+                out[0] = in[0];
+                out[1] = in[1];
+                out[2] = in[2];
+                *alpha = in[3];
+            }
+        }
     }
-    if (GetBitmap())
+    else
     {
-        bpp = 1;
-    }
+        GdkPixmap* pixmap = GetPixmap();
+        GdkPixmap* pixmap_invert = NULL;
+        if (GetDepth() == 1)
+        {
+            // 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);
 
+        gdk_pixbuf_get_from_drawable(pixbuf, pixmap, NULL, 0, 0, 0, 0, w, h);
 
-    GdkColormap *cmap = gtk_widget_get_default_colormap();
+        g_object_unref(pixbuf);
+        if (pixmap_invert != NULL)
+            g_object_unref(pixmap_invert);
 
-    long pos = 0;
-    for (int j = 0; j < GetHeight(); j++)
-    {
-        for (int i = 0; i < GetWidth(); i++)
+        if (GetMask())
         {
-            wxUint32 pixel = gdk_image_get_pixel( gdk_image, i, j );
-            if (bpp == 1)
-            {
-                if (pixel == 0)
-                {
-                    data[pos]   = 0;
-                    data[pos+1] = 0;
-                    data[pos+2] = 0;
-                }
-                else
-                {
-                    data[pos]   = 255;
-                    data[pos+1] = 255;
-                    data[pos+2] = 255;
-                }
-            }
-            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.") );
-            }
+            // 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);
 
-            if (gdk_image_mask)
+            for (int y = 0; y < h; y++)
             {
-                int mask_pixel = gdk_image_get_pixel( gdk_image_mask, i, j );
-                if (mask_pixel == 0)
+                for (int x = 0; x < w; x++, data += 3)
                 {
-                    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;
+                    if (gdk_image_get_pixel(image_mask, x, y) == 0)
+                    {
+                        data[0] = MASK_RED;
+                        data[1] = MASK_GREEN;
+                        data[2] = MASK_BLUE;
+                    }
+                    else if (data[0] == MASK_RED && data[1] == MASK_GREEN && data[2] == MASK_BLUE)
+                    {
+                        data[2] = MASK_BLUE_REPLACEMENT;
+                    }
                 }
             }
-
-            pos += 3;
+            g_object_unref(image_mask);
         }
     }
 
-    gdk_image_destroy( gdk_image );
-    if (gdk_image_mask) gdk_image_destroy( gdk_image_mask );
-
     return image;
 }
 
-wxBitmap::wxBitmap( const wxBitmap& bmp )
-        : wxGDIObject()
-{
-    Ref( bmp );
-}
-
-wxBitmap::wxBitmap( const wxString &filename, int type )
+wxBitmap::wxBitmap( const wxString &filename, wxBitmapType type )
 {
     LoadFile( filename, type );
 }
@@ -1037,21 +708,9 @@ wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth
 {
     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") );
     }
 }
 
@@ -1059,14 +718,6 @@ wxBitmap::~wxBitmap()
 {
 }
 
-wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp )
-{
-    if ( m_refData != bmp.m_refData )
-        Ref( bmp );
-
-    return *this;
-}
-
 bool wxBitmap::operator == ( const wxBitmap& bmp ) const
 {
     return m_refData == bmp.m_refData;
@@ -1079,7 +730,11 @@ bool wxBitmap::operator != ( const wxBitmap& bmp ) const
 
 bool wxBitmap::Ok() const
 {
-    return (m_refData != NULL) && (M_BMPDATA->m_bitmap || M_BMPDATA->m_pixmap);
+    return (m_refData != NULL) &&
+           (
+              M_BMPDATA->m_pixbuf ||
+              M_BMPDATA->m_pixmap
+           );
 }
 
 int wxBitmap::GetHeight() const
@@ -1122,35 +777,35 @@ void wxBitmap::SetMask( wxMask *mask )
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
     *this = icon;
-    return TRUE;
+    return Ok();
 }
 
 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),
-                 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 (ret.GetPixmap())
+    if (HasPixbuf())
     {
-        GdkGC *gc = gdk_gc_new( ret.GetPixmap() );
-        gdk_draw_pixmap( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
-        gdk_gc_destroy( gc );
+        GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
+                                           true, //gdk_pixbuf_get_has_alpha(GetPixbuf()),
+                                           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
     {
-        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 );
-        gdk_gc_destroy( 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())
@@ -1159,13 +814,8 @@ 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 );
-        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_gc_destroy( gc );
+        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 );
     }
@@ -1173,64 +823,41 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
     return ret;
 }
 
-bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) )
+bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalette *WXUNUSED(palette) ) const
 {
-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") );
+    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, int type )
+bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
 {
     UnRef();
 
-    if (!wxFileExists(name))
-        return FALSE;
-
-    GdkVisual *visual = wxTheApp->GetGdkVisual();
-
     if (type == wxBITMAP_TYPE_XPM)
     {
-        m_refData = new wxBitmapRefData();
-
         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)
         {
-           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_window_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;
-        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
 wxPalette *wxBitmap::GetPalette() const
 {
     if (!Ok())
@@ -1239,10 +866,16 @@ wxPalette *wxBitmap::GetPalette() const
     return M_BMPDATA->m_palette;
 }
 
+void wxBitmap::SetPalette(const wxPalette& WXUNUSED(palette))
+{
+    // TODO
+}
+#endif // wxUSE_PALETTE
+
 void wxBitmap::SetHeight( int height )
 {
     if (!m_refData)
-        m_refData = new wxBitmapRefData();
+        m_refData = new wxBitmapRefData;
 
     M_BMPDATA->m_height = height;
 }
@@ -1250,7 +883,7 @@ void wxBitmap::SetHeight( int height )
 void wxBitmap::SetWidth( int width )
 {
     if (!m_refData)
-        m_refData = new wxBitmapRefData();
+        m_refData = new wxBitmapRefData;
 
     M_BMPDATA->m_width = width;
 }
@@ -1258,7 +891,7 @@ void wxBitmap::SetWidth( int width )
 void wxBitmap::SetDepth( int depth )
 {
     if (!m_refData)
-        m_refData = new wxBitmapRefData();
+        m_refData = new wxBitmapRefData;
 
     M_BMPDATA->m_bpp = depth;
 }
@@ -1266,29 +899,209 @@ void wxBitmap::SetDepth( int depth )
 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;
+    gdk_drawable_get_size(pixmap, &M_BMPDATA->m_width, &M_BMPDATA->m_height);
+    M_BMPDATA->m_bpp = gdk_drawable_get_depth(pixmap);
+    PurgeOtherRepresentations(Pixmap);
+}
+
+GdkPixmap *wxBitmap::GetPixmap() const
+{
+    wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, wxT("invalid bitmap") );
+
+    // create the pixmap on the fly if we use Pixbuf representation:
+    if (M_BMPDATA->m_pixmap == NULL)
+    {
+        delete M_BMPDATA->m_mask;
+        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,
+                                          128 /*threshold*/);
+    }
+
+    return M_BMPDATA->m_pixmap;
+}
+
+bool wxBitmap::HasPixmap() const
+{
+    wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );
+
+    return M_BMPDATA->m_pixmap != NULL;
+}
+
+GdkPixbuf *wxBitmap::GetPixbuf() const
+{
+    wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );
+
+    if (M_BMPDATA->m_pixbuf == NULL)
+    {
+        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,
+                                           true, // GetMask() != NULL,
+                                           8, width, height);
+        M_BMPDATA->m_pixbuf =
+            gdk_pixbuf_get_from_drawable(pixbuf, M_BMPDATA->m_pixmap, NULL,
+                                         0, 0, 0, 0, width, height);
+
+        // apply the mask to created pixbuf:
+        if (M_BMPDATA->m_pixbuf && M_BMPDATA->m_mask)
+        {
+            GdkPixbuf *pmask =
+                gdk_pixbuf_get_from_drawable(NULL,
+                                             M_BMPDATA->m_mask->GetBitmap(),
+                                             NULL,
+                                             0, 0, 0, 0, width, height);
+            if (pmask)
+            {
+                guchar *bmp = gdk_pixbuf_get_pixels(pixbuf);
+                guchar *mask = gdk_pixbuf_get_pixels(pmask);
+                int bmprowinc = gdk_pixbuf_get_rowstride(pixbuf) - 4 * width;
+                int maskrowinc = gdk_pixbuf_get_rowstride(pmask) - 3 * width;
+
+                for (int y = 0; y < height;
+                     y++, bmp += bmprowinc, mask += maskrowinc)
+                {
+                    for (int x = 0; x < width; x++, bmp += 4, mask += 3)
+                    {
+                        if (mask[0] == 0 /*black pixel*/)
+                            bmp[3] = 0;
+                    }
+                }
+
+                g_object_unref (pmask);
+            }
+        }
+    }
+
+    return M_BMPDATA->m_pixbuf;
+}
+
+bool wxBitmap::HasPixbuf() const
+{
+    wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );
+
+    return M_BMPDATA->m_pixbuf != NULL;
 }
 
-void wxBitmap::SetBitmap( GdkPixmap *bitmap )
+void wxBitmap::SetPixbuf( GdkPixbuf *pixbuf )
 {
     if (!m_refData)
-        m_refData = new wxBitmapRefData();
+        m_refData = new wxBitmapRefData;
 
-    M_BMPDATA->m_bitmap = bitmap;
+    wxASSERT(M_BMPDATA->m_pixbuf == NULL);
+    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);
 }
 
-GdkPixmap *wxBitmap::GetPixmap() const
+void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep)
 {
-    wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, wxT("invalid bitmap") );
+    if (keep == Pixmap && HasPixbuf())
+    {
+        g_object_unref (M_BMPDATA->m_pixbuf);
+        M_BMPDATA->m_pixbuf = NULL;
+    }
+    if (keep == Pixbuf && HasPixmap())
+    {
+        g_object_unref (M_BMPDATA->m_pixmap);
+        M_BMPDATA->m_pixmap = NULL;
+    }
+}
 
-    return M_BMPDATA->m_pixmap;
+void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
+{
+    if (bpp != 32)
+        return NULL;
+
+    GdkPixbuf *pixbuf = GetPixbuf();
+    if (!pixbuf)
+        return NULL;
+
+    if (!gdk_pixbuf_get_has_alpha( pixbuf ))
+        return NULL;
+
+#if 0
+    if (gdk_pixbuf_get_has_alpha( pixbuf ))
+        wxPrintf( wxT("Has alpha, %d channels\n"), gdk_pixbuf_get_n_channels(pixbuf) );
+    else
+        wxPrintf( wxT("No alpha, %d channels.\n"), gdk_pixbuf_get_n_channels(pixbuf) );
+#endif
+
+    data.m_height = gdk_pixbuf_get_height( pixbuf );
+    data.m_width = gdk_pixbuf_get_width( pixbuf );
+    data.m_stride = gdk_pixbuf_get_rowstride( pixbuf );
+
+    return gdk_pixbuf_get_pixels( pixbuf );
+}
+
+void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data))
+{
+}
+
+
+bool wxBitmap::HasAlpha() const
+{
+    return HasPixbuf();
+}
+
+void wxBitmap::UseAlpha()
+{
+    GetPixbuf();
+}
+
+//-----------------------------------------------------------------------------
+// wxBitmapHandler
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler,wxBitmapHandlerBase)
+
+wxBitmapHandler::~wxBitmapHandler()
+{
 }
 
-GdkBitmap *wxBitmap::GetBitmap() const
+bool wxBitmapHandler::Create(wxBitmap * WXUNUSED(bitmap),
+                             void * WXUNUSED(data),
+                             long WXUNUSED(type),
+                             int WXUNUSED(width),
+                             int WXUNUSED(height),
+                             int WXUNUSED(depth))
 {
-    wxCHECK_MSG( Ok(), (GdkBitmap *) NULL, wxT("invalid bitmap") );
+    wxFAIL_MSG( _T("not implemented") );
 
-    return M_BMPDATA->m_bitmap;
+    return false;
+}
+
+bool wxBitmapHandler::LoadFile(wxBitmap * WXUNUSED(bitmap),
+                               const wxString& WXUNUSED(name),
+                               long WXUNUSED(flags),
+                               int WXUNUSED(desiredWidth),
+                               int WXUNUSED(desiredHeight))
+{
+    wxFAIL_MSG( _T("not implemented") );
+
+    return false;
+}
+
+bool wxBitmapHandler::SaveFile(const wxBitmap * WXUNUSED(bitmap),
+                               const wxString& WXUNUSED(name),
+                               int WXUNUSED(type),
+                               const wxPalette * WXUNUSED(palette))
+{
+    wxFAIL_MSG( _T("not implemented") );
+
+    return false;
+}
+
+/* static */ void wxBitmap::InitStandardHandlers()
+{
+    // TODO: Insert handler based on GdkPixbufs handler later
 }