]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/bitmap.cpp
Fix toolbar background painting whem comctl32 < 6
[wxWidgets.git] / src / gtk / bitmap.cpp
index 1f62c2a11be98d0aff1282aed4a3abe3aa55ff8d..a90312de4d929811cbac317acbfe0afcc142ddfb 100644 (file)
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        bitmap.cpp
+// Name:        src/gtk/bitmap.cpp
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
@@ -7,27 +7,31 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "bitmap.h"
-#endif
-
-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
-#include "wx/palette.h"
 #include "wx/bitmap.h"
-#include "wx/icon.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/image.h"
+#endif
+
 #include "wx/filefn.h"
-#include "wx/image.h"
-#include "wx/dcmemory.h"
-#include "wx/app.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 <gdk/gdkx.h>
 
-#if (GTK_MINOR_VERSION > 0)
-#include <gdk/gdkrgb.h>
-#endif
+#include <gdk/gdkimage.h>
 
 extern void gdk_wx_draw_bitmap     (GdkDrawable  *drawable,
                           GdkGC               *gc,
@@ -62,11 +66,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 )
 {
@@ -77,7 +83,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,
@@ -85,12 +91,12 @@ 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 );
-    if (!image.Ok()) return FALSE;
+    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 );
@@ -111,23 +117,29 @@ bool wxMask::Create( const wxBitmap& bitmap,
     unsigned char green = colour.Green();
     unsigned char blue = colour.Blue();
 
-    GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
-    wxASSERT( visual );
+    GdkVisual *visual = wxTheApp->GetGdkVisual();
 
     int bpp = visual->depth;
-    if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
+    if ((bpp == 16) && (visual->red_mask != 0xf800))
+        bpp = 15;
     if (bpp == 15)
     {
         red = red & 0xf8;
         green = green & 0xf8;
         blue = blue & 0xf8;
     }
-    if (bpp == 16)
+    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;
+    }
 
     color.red = 0;
     color.green = 0;
@@ -162,46 +174,48 @@ bool wxMask::Create( const wxBitmap& bitmap,
             gdk_draw_line( m_bitmap, gc, start_x, j, i, j );
     }
 
-    gdk_gc_unref( gc );
+    g_object_unref (gc);
 
-    return TRUE;
+    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_wx_draw_bitmap( m_bitmap, gc, bitmap.GetBitmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight() );
+    gdk_wx_draw_bitmap( m_bitmap, gc, bitmap.GetPixmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight() );
 
-    gdk_gc_unref( gc );
+    g_object_unref (gc);
 
-    return TRUE;
+    return true;
 }
 
 GdkBitmap *wxMask::GetBitmap() const
@@ -220,7 +234,7 @@ public:
     ~wxBitmapRefData();
 
     GdkPixmap      *m_pixmap;
-    GdkBitmap      *m_bitmap;
+    GdkPixbuf      *m_pixbuf;
     wxMask         *m_mask;
     int             m_width;
     int             m_height;
@@ -231,7 +245,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;
@@ -241,15 +255,19 @@ wxBitmapRefData::wxBitmapRefData()
 
 wxBitmapRefData::~wxBitmapRefData()
 {
-    if (m_pixmap) gdk_pixmap_unref( m_pixmap );
-    if (m_bitmap) gdk_bitmap_unref( m_bitmap );
-    if (m_mask) delete m_mask;
-    if (m_palette) delete m_palette;
+    if (m_pixmap)
+        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)
 
@@ -266,29 +284,32 @@ bool wxBitmap::Create( int width, int height, int depth )
 {
     UnRef();
 
-    wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") )
+    if ( width <= 0 || height <= 0 )
+    {
+        return false;
+    }
 
-    GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
-    wxASSERT( visual );
+    GdkVisual *visual = wxTheApp->GetGdkVisual();
 
-    if (depth == -1) depth = visual->depth;
+    if (depth == -1)
+        depth = visual->depth;
 
-    wxCHECK_MSG( (depth == visual->depth) ||
-                 (depth == 1), FALSE, wxT("invalid bitmap 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)
+    M_BMPDATA->m_bpp = depth;
+    if (depth == 32)
     {
-        M_BMPDATA->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
-        M_BMPDATA->m_bpp = 1;
+        M_BMPDATA->m_pixbuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB, true,
+                                              8, width, height);
     }
     else
     {
         M_BMPDATA->m_pixmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, depth );
-        M_BMPDATA->m_bpp = visual->depth;
     }
 
     return Ok();
@@ -296,10 +317,11 @@ bool wxBitmap::Create( int width, int height, int depth )
 
 bool wxBitmap::CreateFromXpm( const char **bits )
 {
-    wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") )
+    UnRef();
+
+    wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") );
 
-    GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
-    wxASSERT( visual );
+    GdkVisual *visual = wxTheApp->GetGdkVisual();
 
     m_refData = new wxBitmapRefData();
 
@@ -307,7 +329,7 @@ bool wxBitmap::CreateFromXpm( const char **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)
     {
@@ -315,316 +337,463 @@ bool wxBitmap::CreateFromXpm( const char **bits )
         M_BMPDATA->m_mask->m_bitmap = mask;
     }
 
-    gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
+    gdk_drawable_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
 
-    M_BMPDATA->m_bpp = visual->depth;  // ?
+    M_BMPDATA->m_bpp = visual->depth;  // Can we get a different depth from create_from_xpm_d() ?
 
-    return TRUE;
+    return true;
 }
 
-bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
+wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, int newx, int newy )
 {
-    wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") )
-    wxCHECK_MSG( depth == -1 || depth == 1, FALSE, wxT("invalid bitmap depth") )
+    wxCHECK_MSG( Ok(), wxNullBitmap, wxT("invalid bitmap") );
 
-    m_refData = new wxBitmapRefData();
+    if (newy==M_BMPDATA->m_width && newy==M_BMPDATA->m_height)
+        return *this;
 
-    // ------
-    // convertion to mono bitmap:
-    // ------
-    if (depth == 1)
-    {
-        int width = image.GetWidth();
-        int height = image.GetHeight();
+    int width = wxMax(newx, 1);
+    int height = wxMax(newy, 1);
+    width = wxMin(width, clipwidth);
+    height = wxMin(height, clipheight);
 
-        SetHeight( height );
-        SetWidth( width );
+    wxBitmap bmp;
 
-        SetBitmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) );
+    if (HasPixbuf())
+    {
+        bmp.SetWidth(width);
+        bmp.SetHeight(height);
+        bmp.SetDepth(GetDepth());
+        bmp.SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB,
+                                     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);
+    }
+    else
+    {
+        GdkImage *img = (GdkImage*) NULL;
+        if (GetPixmap())
+            img = gdk_image_get( GetPixmap(), 0, 0, GetWidth(), GetHeight() );
+        else
+            wxFAIL_MSG( wxT("Ill-formed bitmap") );
 
-        SetDepth( 1 );
+        wxCHECK_MSG( img, wxNullBitmap, wxT("couldn't create image") );
 
-        GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
-        wxASSERT( visual );
+        int bpp = -1;
 
-        // Create picture image
 
-        unsigned char *data_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
+        GdkGC *gc = NULL;
+        GdkPixmap *dstpix = NULL;
+        if (GetDepth() != 1)
+        {
+            GdkVisual *visual = gdk_drawable_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 );
+        }
 
-        GdkImage *data_image =
-            gdk_image_new_bitmap( visual, data_data, width, height );
+        char *dst = NULL;
+        long dstbyteperline = 0;
 
-        // Create mask image
+        if (GetDepth() == 1)
+        {
+            bpp = 1;
+            dstbyteperline = width/8*M_BMPDATA->m_bpp;
+            if (width*M_BMPDATA->m_bpp % 8 != 0)
+                dstbyteperline++;
+            dst = (char*) malloc(dstbyteperline*height);
+        }
 
-        GdkImage *mask_image = (GdkImage*) NULL;
+        // 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));
 
-        if (image.HasMask())
+        // 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++)
         {
-            unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
+            char outbyte = 0;
+            int old_x = -1;
+            guint32 old_pixval = 0;
 
-            mask_image =  gdk_image_new_bitmap( visual, mask_data, width, height );
+            for (int w = 0; w < width; w++)
+            {
+                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;
+                }
 
-            wxMask *mask = new wxMask();
-            mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
+                if ( dst )
+                {
+                    if (!pixval)
+                    {
+                        char bit=1;
+                        char shift = bit << (w % 8);
+                        outbyte |= shift;
+                    }
 
-            SetMask( mask );
+                    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);
+                }
+            }
+
+            // do not forget the last byte
+            if ( dst && (width % 8 != 0) )
+                dst[h*dstbyteperline+width/8] = outbyte;
         }
 
-        int r_mask = image.GetMaskRed();
-        int g_mask = image.GetMaskGreen();
-        int b_mask = image.GetMaskBlue();
+        g_object_unref (img);
+        if (gc) g_object_unref (gc);
 
-        unsigned char* data = image.GetData();
+        if ( dst )
+        {
+            bmp = wxBitmap( (const char *)dst, width, height, 1 );
+            free( dst );
+        }
 
-        int index = 0;
-        for (int y = 0; y < height; y++)
+        if (GetMask())
         {
-            for (int x = 0; x < width; x++)
+            dstbyteperline = width/8;
+            if (width % 8 != 0)
+                dstbyteperline++;
+            dst = (char*) malloc(dstbyteperline*height);
+            img = gdk_image_get( 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 ((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 );
+                    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;
+                    }
+                }
 
-            } // for
-        }  // for
+                // 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);
 
-        // Blit picture
+            free( dst );
+            g_object_unref (img);
+        }
 
-        GdkGC *data_gc = gdk_gc_new( GetBitmap() );
+        free( tablex );
+        free( tabley );
+    }
 
-        gdk_draw_image( GetBitmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
+    return bmp;
+}
 
-        gdk_image_destroy( data_image );
-        gdk_gc_unref( data_gc );
+bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
+{
+    UnRef();
 
-        // Blit mask
+    wxCHECK_MSG( image.Ok(), false, wxT("invalid image") );
+    wxCHECK_MSG( depth == -1 || depth == 1, false, wxT("invalid bitmap depth") );
 
-        if (image.HasMask())
-        {
-            GdkGC *mask_gc = gdk_gc_new( GetMask()->GetBitmap() );
+    if (image.GetWidth() <= 0 || image.GetHeight() <= 0)
+        return false;
 
-            gdk_draw_image( GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
+    m_refData = new wxBitmapRefData();
 
-            gdk_image_destroy( mask_image );
-            gdk_gc_unref( mask_gc );
-        }
+    if (depth == 1)
+    {
+        return CreateFromImageAsBitmap(image);
     }
-
-    // ------
-    // convertion to colour bitmap:
-    // ------
     else
     {
-        int width = image.GetWidth();
-        int height = image.GetHeight();
+        if (image.HasAlpha())
+            return CreateFromImageAsPixbuf(image);
 
-        SetHeight( height );
-        SetWidth( width );
+        return CreateFromImageAsPixmap(image);
+    }
+}
 
-        SetPixmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, -1 ) );
+// conversion to mono bitmap:
+bool wxBitmap::CreateFromImageAsBitmap(const wxImage& img)
+{
+    // convert alpha channel to mask, if it is present:
+    wxImage image(img);
+    image.ConvertAlphaToMask();
 
-        // Retrieve depth
+    int width = image.GetWidth();
+    int height = image.GetHeight();
 
-        GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
-        wxASSERT( visual );
+    SetHeight( height );
+    SetWidth( width );
 
-        int bpp = visual->depth;
+    SetPixmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) );
 
-        SetDepth( bpp );
+    SetDepth( 1 );
 
-        if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
-        if (bpp < 8) bpp = 8;
+    GdkVisual *visual = wxTheApp->GetGdkVisual();
 
-#if (GTK_MINOR_VERSION > 0)
+    // Create picture image
 
-        if (!image.HasMask() && (bpp > 8))
-        {
-            static bool s_hasInitialized = FALSE;
+    unsigned char *data_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
 
-            if (!s_hasInitialized)
+    GdkImage *data_image =
+        gdk_image_new_bitmap( visual, data_data, 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 );
+    }
+
+    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++)
+        {
+            int r = data[index];
+            index++;
+            int g = data[index];
+            index++;
+            int b = data[index];
+            index++;
+
+            if (image.HasMask())
             {
-                gdk_rgb_init();
-                s_hasInitialized = TRUE;
+                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 );
             }
 
-            GdkGC *gc = gdk_gc_new( GetPixmap() );
+            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 );
 
-            gdk_draw_rgb_image( GetPixmap(),
-                                gc,
-                                0, 0,
-                                width, height,
-                                GDK_RGB_DITHER_NONE,
-                                image.GetData(),
-                                width*3 );
+        } // for
+    }  // for
 
-            gdk_gc_unref( gc );
-            return TRUE;
-        }
+    // Blit picture
 
-#endif
+    GdkGC *data_gc = gdk_gc_new( GetPixmap() );
 
-        // Create picture image
+    gdk_draw_image( GetPixmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
 
-        GdkImage *data_image =
-            gdk_image_new( GDK_IMAGE_FASTEST, visual, width, height );
+    g_object_unref (data_image);
+    g_object_unref (data_gc);
 
-        // Create mask image
+    // Blit mask
 
-        GdkImage *mask_image = (GdkImage*) NULL;
+    if (image.HasMask())
+    {
+        GdkGC *mask_gc = gdk_gc_new( GetMask()->GetBitmap() );
 
-        if (image.HasMask())
-        {
-            unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
+        gdk_draw_image( GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
 
-            mask_image =  gdk_image_new_bitmap( visual, mask_data, width, height );
+        g_object_unref (mask_image);
+        g_object_unref (mask_gc);
+    }
 
-            wxMask *mask = new wxMask();
-            mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
+    return true;
+}
 
-            SetMask( mask );
-        }
+// conversion to colour bitmap:
+bool wxBitmap::CreateFromImageAsPixmap(const wxImage& img)
+{
+    // convert alpha channel to mask, if it is present:
+    wxImage image(img);
+    image.ConvertAlphaToMask();
 
-        // Render
+    int width = image.GetWidth();
+    int height = image.GetHeight();
 
-        enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
-        byte_order b_o = RGB;
+    SetHeight( height );
+    SetWidth( width );
 
-        if (bpp >= 24)
-        {
-            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 = RGB;
-            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;
-        }
+    SetPixmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, -1 ) );
 
-        int r_mask = image.GetMaskRed();
-        int g_mask = image.GetMaskGreen();
-        int b_mask = image.GetMaskBlue();
+    GdkVisual *visual = wxTheApp->GetGdkVisual();
 
-        unsigned char* data = image.GetData();
+    int bpp = visual->depth;
 
-        int index = 0;
-        for (int y = 0; y < height; y++)
-        {
-            for (int x = 0; x < width; x++)
-            {
-                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 );
-                }
+    SetDepth( bpp );
 
-                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 15:
-                    {
-                        guint32 pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
-                        gdk_image_put_pixel( data_image, x, y, pixel );
-                        break;
-                    }
-                case 16:
-                    {
-                        guint32 pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3);
-                        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
+    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 );
 
-        // Blit picture
+    mask_image =  gdk_image_new_bitmap( visual, mask_data, width, height );
 
-        GdkGC *data_gc = gdk_gc_new( GetPixmap() );
+    wxMask *mask = new wxMask();
+    mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
 
-        gdk_draw_image( GetPixmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
+    SetMask( mask );
 
-        gdk_image_destroy( data_image );
-        gdk_gc_unref( data_gc );
+    int r_mask = image.GetMaskRed();
+    int g_mask = image.GetMaskGreen();
+    int b_mask = image.GetMaskBlue();
 
-        // Blit mask
+    unsigned char* data = image.GetData();
 
-        if (image.HasMask())
+    int index = 0;
+    for (int y = 0; y < height; y++)
+    {
+        for (int x = 0; x < width; x++)
         {
-            GdkGC *mask_gc = gdk_gc_new( GetMask()->GetBitmap() );
+            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 );
+    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 );
+    g_object_unref (mask_image);
+    g_object_unref (mask_gc);
+
+    return true;
+}
+
+bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
+{
+    int width = image.GetWidth();
+    int height = image.GetHeight();
+
+    GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
+                                       image.HasAlpha(),
+                                       8 /* bits per sample */,
+                                       width, height);
+    if (!pixbuf)
+        return false;
+
+    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 );
+
+    M_BMPDATA->m_pixbuf = pixbuf;
+    SetHeight(height);
+    SetWidth(width);
+    SetDepth(wxTheApp->GetGdkVisual()->depth);
+
+    // Copy the data:
+    unsigned char *in = image.GetData();
+    unsigned char *out = gdk_pixbuf_get_pixels(pixbuf);
+    unsigned char *alpha = image.GetAlpha();
+
+    int rowinc = gdk_pixbuf_get_rowstride(pixbuf) - 4 * width;
+
+    for (int y = 0; y < height; y++, out += rowinc)
+    {
+        for (int x = 0; x < width; x++, alpha++, out += 4, in += 3)
+        {
+            out[0] = in[0];
+            out[1] = in[1];
+            out[2] = in[2];
+            out[3] = *alpha;
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 wxImage wxBitmap::ConvertToImage() const
@@ -633,173 +802,207 @@ wxImage wxBitmap::ConvertToImage() const
 
     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") );
-
-    image.Create( GetWidth(), GetHeight() );
-    char unsigned *data = image.GetData();
+    image.Create(GetWidth(), GetHeight());
+    unsigned char *data = image.GetData();
 
     if (!data)
     {
-        gdk_image_destroy( gdk_image );
         wxFAIL_MSG( wxT("couldn't create image") );
         return wxNullImage;
     }
 
-    GdkImage *gdk_image_mask = (GdkImage*) NULL;
-    if (GetMask())
+    if (HasPixbuf())
     {
-        gdk_image_mask = gdk_image_get( GetMask()->GetBitmap(),
-            0, 0,
-            GetWidth(), GetHeight() );
+        GdkPixbuf *pixbuf = GetPixbuf();
+        wxASSERT( gdk_pixbuf_get_has_alpha(pixbuf) );
 
-        image.SetMaskColour( 16, 16, 16 );  // anything unlikely and dividable
-    }
+        int w = GetWidth();
+        int h = GetHeight();
+
+        image.SetAlpha();
+
+        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 = gdk_window_get_visual( wxGetRootWindow()->window );
-        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;
-    }
+        // 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;
 
-    GdkColormap *cmap = gtk_widget_get_default_colormap();
+        if (HasPixmap())
+        {
+            gdk_image = gdk_image_get( GetPixmap(),
+                                       0, 0,
+                                       GetWidth(), GetHeight() );
+        }
+        else
+        {
+            wxFAIL_MSG( wxT("Ill-formed bitmap") );
+        }
 
-    long pos = 0;
-    for (int j = 0; j < GetHeight(); j++)
-    {
-        for (int i = 0; i < GetWidth(); i++)
+        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() );
+
+            image.SetMaskColour( MASK_RED, MASK_GREEN, MASK_BLUE );
+        }
+
+        int bpp = -1;
+        int red_shift_right = 0;
+        int green_shift_right = 0;
+        int blue_shift_right = 0;
+        int red_shift_left = 0;
+        int green_shift_left = 0;
+        int blue_shift_left = 0;
+        bool use_shift = false;
+
+        if (GetDepth() != 1)
+        {
+            GdkVisual *visual = gdk_drawable_get_visual( GetPixmap() );
+            if (visual == NULL)
+                visual = wxTheApp->GetGdkVisual();
+
+            bpp = visual->depth;
+            if (bpp == 16)
+                bpp = visual->red_prec + visual->green_prec + visual->blue_prec;
+            red_shift_right = visual->red_shift;
+            red_shift_left = 8-visual->red_prec;
+            green_shift_right = visual->green_shift;
+            green_shift_left = 8-visual->green_prec;
+            blue_shift_right = visual->blue_shift;
+            blue_shift_left = 8-visual->blue_prec;
+
+            use_shift = (visual->type == GDK_VISUAL_TRUE_COLOR) || (visual->type == GDK_VISUAL_DIRECT_COLOR);
+        }
+        else
+        {
+            bpp = 1;
+        }
+
+
+        GdkColormap *cmap = gtk_widget_get_default_colormap();
+
+        long pos = 0;
+        for (int j = 0; j < GetHeight(); j++)
         {
-            wxUint32 pixel = gdk_image_get_pixel( gdk_image, i, j );
+            for (int i = 0; i < GetWidth(); i++)
+            {
+                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;
+                    {
+                        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.") );
                 }
-            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)
+                if (gdk_image_mask)
                 {
-                    data[pos] = 16;
-                    data[pos+1] = 16;
-                    data[pos+2] = 16;
+                    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;
+                pos += 3;
+            }
         }
-    }
 
-    gdk_image_destroy( gdk_image );
-    if (gdk_image_mask) gdk_image_destroy( gdk_image_mask );
+        g_object_unref (gdk_image);
+        if (gdk_image_mask) g_object_unref (gdk_image_mask);
+    }
 
     return image;
 }
 
-wxBitmap::wxBitmap( const wxBitmap& bmp )
-{
-    Ref( bmp );
-}
-
-wxBitmap::wxBitmap( const wxString &filename, int type )
+wxBitmap::wxBitmap( const wxString &filename, wxBitmapType type )
 {
     LoadFile( filename, type );
 }
 
 wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth))
 {
-    m_refData = new wxBitmapRefData();
+    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;
+        M_BMPDATA->m_mask = (wxMask *) NULL;
+        M_BMPDATA->m_pixmap = 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;
 
-    wxCHECK_RET( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") );
+        wxASSERT_MSG( M_BMPDATA->m_pixmap, wxT("couldn't create bitmap") );
+    }
 }
 
 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;
@@ -812,7 +1015,11 @@ bool wxBitmap::operator != ( const wxBitmap& bmp ) const
 
 bool wxBitmap::Ok() const
 {
-    return (m_refData != NULL);
+    return (m_refData != NULL) &&
+           (
+              M_BMPDATA->m_pixbuf ||
+              M_BMPDATA->m_pixmap
+           );
 }
 
 int wxBitmap::GetHeight() const
@@ -855,7 +1062,7 @@ void wxBitmap::SetMask( wxMask *mask )
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
     *this = icon;
-    return TRUE;
+    return true;
 }
 
 wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
@@ -868,17 +1075,35 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
     wxBitmap ret( rect.width, rect.height, M_BMPDATA->m_bpp );
     wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
 
-    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,
+                                           gdk_pixbuf_get_has_alpha(GetPixbuf()),
+                                           8, rect.width, rect.height);
+        ret.SetPixbuf(pixbuf);
+        gdk_pixbuf_copy_area(GetPixbuf(),
+                             rect.x, rect.y, rect.width, rect.height,
+                             pixbuf, 0, 0);
     }
     else
     {
-        GdkGC *gc = gdk_gc_new( ret.GetBitmap() );
-        gdk_wx_draw_bitmap( ret.GetBitmap(), gc, GetBitmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
-        gdk_gc_destroy( gc );
+        if (ret.GetDepth() != 1)
+        {
+            GdkGC *gc = gdk_gc_new( ret.GetPixmap() );
+            gdk_draw_drawable( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
+            g_object_unref (gc);
+        }
+        else
+        {
+            GdkGC *gc = gdk_gc_new( ret.GetPixmap() );
+            GdkColor col;
+            col.pixel = 0xFFFFFF;
+            gdk_gc_set_foreground( gc, &col );
+            col.pixel = 0;
+            gdk_gc_set_background( gc, &col );
+            gdk_wx_draw_bitmap( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
+            g_object_unref (gc);
+        }
     }
 
     if (GetMask())
@@ -887,8 +1112,13 @@ 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 );
-        gdk_wx_draw_bitmap( mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, 0, 0, rect.x, rect.y, rect.width, rect.height );
-        gdk_gc_destroy( gc );
+        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 );
+        g_object_unref (gc);
 
         ret.SetMask( mask );
     }
@@ -896,27 +1126,27 @@ 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( *this );
+        wxImage image = ConvertToImage();
         if (image.Ok()) return image.SaveFile( name, type );
     }
 
-    return FALSE;
+    return false;
 }
 
-bool wxBitmap::LoadFile( const wxString &name, int type )
+bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
 {
     UnRef();
 
-    if (!wxFileExists(name)) return FALSE;
+    if (!wxFileExists(name))
+        return false;
 
-    GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
-    wxASSERT( visual );
+    GdkVisual *visual = wxTheApp->GetGdkVisual();
 
     if (type == wxBITMAP_TYPE_XPM)
     {
@@ -924,7 +1154,13 @@ bool wxBitmap::LoadFile( const wxString &name, int type )
 
         GdkBitmap *mask = (GdkBitmap*) NULL;
 
-        M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm( wxGetRootWindow()->window, &mask, NULL, name.fn_str() );
+        M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm
+                              (
+                                wxGetRootWindow()->window,
+                                &mask,
+                                NULL,
+                                name.fn_str()
+                              );
 
         if (mask)
         {
@@ -932,73 +1168,256 @@ bool wxBitmap::LoadFile( const wxString &name, int type )
            M_BMPDATA->m_mask->m_bitmap = mask;
         }
 
-        gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
+        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;
-        if (!image.LoadFile( name, type )) return FALSE;
-        if (image.Ok()) *this = image.ConvertToBitmap();
-        else return FALSE;
+        if ( !image.LoadFile( name, type ) || !image.Ok() )
+            return false;
+
+        *this = wxBitmap(image);
     }
 
-    return TRUE;
+    return true;
 }
 
+#if wxUSE_PALETTE
 wxPalette *wxBitmap::GetPalette() const
 {
-    if (!Ok()) return (wxPalette *) NULL;
+    if (!Ok())
+        return (wxPalette *) NULL;
 
     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();
+    if (!m_refData)
+        m_refData = new wxBitmapRefData();
 
     M_BMPDATA->m_height = height;
 }
 
 void wxBitmap::SetWidth( int width )
 {
-    if (!m_refData) m_refData = new wxBitmapRefData();
+    if (!m_refData)
+        m_refData = new wxBitmapRefData();
 
     M_BMPDATA->m_width = width;
 }
 
 void wxBitmap::SetDepth( int depth )
 {
-    if (!m_refData) m_refData = new wxBitmapRefData();
+    if (!m_refData)
+        m_refData = new wxBitmapRefData();
 
     M_BMPDATA->m_bpp = depth;
 }
 
 void wxBitmap::SetPixmap( GdkPixmap *pixmap )
 {
-    if (!m_refData) m_refData = new wxBitmapRefData();
+    if (!m_refData)
+        m_refData = new wxBitmapRefData();
 
     M_BMPDATA->m_pixmap = 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 (HasPixbuf() && !HasPixmap())
+    {
+        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;
 }
 
-void wxBitmap::SetBitmap( GdkPixmap *bitmap )
+bool wxBitmap::HasPixmap() const
 {
-    if (!m_refData) m_refData = new wxBitmapRefData();
+    wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );
 
-    M_BMPDATA->m_bitmap = bitmap;
+    return M_BMPDATA->m_pixmap != NULL;
 }
 
-GdkPixmap *wxBitmap::GetPixmap() const
+GdkPixbuf *wxBitmap::GetPixbuf() const
 {
-    wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, wxT("invalid bitmap") );
+    wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );
 
-    return M_BMPDATA->m_pixmap;
+    if (HasPixmap() && !HasPixbuf())
+    {
+        int width = GetWidth();
+        int height = GetHeight();
+
+        GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
+                                           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;
 }
 
-GdkBitmap *wxBitmap::GetBitmap() const
+void wxBitmap::SetPixbuf( GdkPixbuf *pixbuf )
 {
-    wxCHECK_MSG( Ok(), (GdkBitmap *) NULL, wxT("invalid bitmap") );
+    if (!m_refData)
+        m_refData = new wxBitmapRefData();
 
-    return M_BMPDATA->m_bitmap;
+    M_BMPDATA->m_pixbuf = pixbuf;
+    PurgeOtherRepresentations(Pixbuf);
+}
+
+void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep)
+{
+    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;
+    }
+}
+
+void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
+{
+    if (bpp != 32)
+        return NULL;
+
+    GdkPixbuf *pixbuf = GetPixbuf();
+    if (!pixbuf)
+        return NULL;
+
+#if 0
+    if (gdk_pixbuf_get_has_alpha( pixbuf ))
+        wxPrintf( wxT("Has alpha\n") );
+    else
+        wxPrintf( wxT("No alpha.\n") );
+#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()
+{
+}
+
+bool wxBitmapHandler::Create(wxBitmap * WXUNUSED(bitmap),
+                             void * WXUNUSED(data),
+                             long WXUNUSED(type),
+                             int WXUNUSED(width),
+                             int WXUNUSED(height),
+                             int WXUNUSED(depth))
+{
+    wxFAIL_MSG( _T("not implemented") );
+
+    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
 }