Patch from Hartwig for wxMac implementation

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

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 170e8daf4f09e5698c25acf8ee8d160e81d9d6d7..e5f2b669d15636cd21817378bbd05095efeac93d 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        bitmap.cpp
+// Name:        src/gtk/bitmap.cpp

 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$


@@ -7,40 +7,29 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "bitmap.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include "wx/bitmap.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"
-
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>

 
 

-#if (GTK_MINOR_VERSION > 0)
-#include <gdk/gdkrgb.h>
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/palette.h"
+    #include "wx/icon.h"
+    #include "wx/math.h"
+    #include "wx/image.h"
+    #include "wx/colour.h"

 #endif
 
 #endif
 

-extern void gdk_wx_draw_bitmap     (GdkDrawable  *drawable,
-                          GdkGC               *gc,
-                          GdkDrawable  *src,
-                          gint                xsrc,
-                          gint                ysrc,
-                          gint                xdest,
-                          gint                ydest,
-                          gint                width,
-                          gint                height);
+#include "wx/rawbmp.h"
+
+#include <gtk/gtk.h>

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

-extern GtkWidget *wxRootWindow;
+extern GtkWidget *wxGetRootWindow();

 
 //-----------------------------------------------------------------------------
 // wxMask
 
 //-----------------------------------------------------------------------------
 // wxMask


@@ -59,11 +48,13 @@ wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
     Create( bitmap, colour );
 }
 
     Create( bitmap, colour );
 }
 

+#if wxUSE_PALETTE

 wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex )
 {
     m_bitmap = (GdkBitmap *) NULL;
     Create( bitmap, paletteIndex );
 }
 wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex )
 {
     m_bitmap = (GdkBitmap *) NULL;
     Create( bitmap, paletteIndex );
 }

+#endif // wxUSE_PALETTE

 
 wxMask::wxMask( const wxBitmap& bitmap )
 {
 
 wxMask::wxMask( const wxBitmap& bitmap )
 {


@@ -74,7 +65,7 @@ wxMask::wxMask( const wxBitmap& bitmap )
 wxMask::~wxMask()
 {
     if (m_bitmap)
 wxMask::~wxMask()
 {
     if (m_bitmap)

-        gdk_bitmap_unref( m_bitmap );
+        g_object_unref (m_bitmap);

 }
 
 bool wxMask::Create( const wxBitmap& bitmap,
 }
 
 bool wxMask::Create( const wxBitmap& bitmap,


@@ -82,123 +73,103 @@ bool wxMask::Create( const wxBitmap& bitmap,
 {
     if (m_bitmap)
     {
 {
     if (m_bitmap)
     {

-        gdk_bitmap_unref( m_bitmap );
+        g_object_unref (m_bitmap);

         m_bitmap = (GdkBitmap*) NULL;
     }
 
         m_bitmap = (GdkBitmap*) NULL;
     }
 

-    wxImage image( bitmap );
-    if (!image.Ok()) return FALSE;
+    const int w = bitmap.GetWidth();
+    const int h = bitmap.GetHeight();

 
 

-    m_bitmap = gdk_pixmap_new( wxRootWindow->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() );
+    // create mask as XBM format bitmap

 
 

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

     {
     {

-        red = red & 0xf8;
-        green = green & 0xfc;
-        blue = blue & 0xf8;
+        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();
 
 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));
 }
     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)
     {
 
 bool wxMask::Create( const wxBitmap& bitmap )
 {
     if (m_bitmap)
     {

-        gdk_bitmap_unref( m_bitmap );
+        g_object_unref (m_bitmap);

         m_bitmap = (GdkBitmap*) NULL;
     }
 
         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( wxRootWindow->window, bitmap.GetWidth(), bitmap.GetHeight(), 1 );
+    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 );
 
     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
 }
 
 GdkBitmap *wxMask::GetBitmap() const


@@ -214,617 +185,425 @@ class wxBitmapRefData: public wxObjectRefData
 {
 public:
     wxBitmapRefData();
 {
 public:
     wxBitmapRefData();

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

 
     GdkPixmap      *m_pixmap;
 
     GdkPixmap      *m_pixmap;

-    GdkBitmap      *m_bitmap;
+    GdkPixbuf      *m_pixbuf;

     wxMask         *m_mask;
     int             m_width;
     int             m_height;
     int             m_bpp;
     wxMask         *m_mask;
     int             m_width;
     int             m_height;
     int             m_bpp;

+#if wxUSE_PALETTE

     wxPalette      *m_palette;
     wxPalette      *m_palette;

+#endif // wxUSE_PALETTE

 };
 
 wxBitmapRefData::wxBitmapRefData()
 {
     m_pixmap = (GdkPixmap *) NULL;
 };
 
 wxBitmapRefData::wxBitmapRefData()
 {
     m_pixmap = (GdkPixmap *) NULL;

-    m_bitmap = (GdkBitmap *) NULL;
+    m_pixbuf = (GdkPixbuf *) NULL;

     m_mask = (wxMask *) NULL;
     m_width = 0;
     m_height = 0;
     m_bpp = 0;
     m_mask = (wxMask *) NULL;
     m_width = 0;
     m_height = 0;
     m_bpp = 0;

+#if wxUSE_PALETTE

     m_palette = (wxPalette *) NULL;
     m_palette = (wxPalette *) NULL;

+#endif // wxUSE_PALETTE

 }
 
 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)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
 

-wxBitmap::wxBitmap()
+wxBitmap::wxBitmap(int width, int height, int depth)

 {
 {

-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+    Create(width, height, depth);

 }
 
 }
 

-wxBitmap::wxBitmap( int width, int height, int depth )
+wxBitmap::wxBitmap(const wxString &filename, wxBitmapType type)

 {
 {

-    Create( width, height, depth );
-
-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+    LoadFile(filename, type);

 }
 
 }
 

-bool wxBitmap::Create( int width, int height, int depth )
+wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)

 {
 {

-    UnRef();
-
-    wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") )
-
-    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
-    wxASSERT( visual );
-
-    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)
-    {
-        M_BMPDATA->m_bitmap = gdk_pixmap_new( wxRootWindow->window, width, height, 1 );
-        M_BMPDATA->m_bpp = 1;
-    }
-    else
+    wxASSERT(depth == 1);
+    if (width > 0 && height > 0 && depth == 1)

     {
     {

-        M_BMPDATA->m_pixmap = gdk_pixmap_new( wxRootWindow->window, width, height, depth );
-        M_BMPDATA->m_bpp = visual->depth;
-    }
+        SetPixmap(gdk_bitmap_create_from_data(wxGetRootWindow()->window, bits, width, height));

 
 

-    return Ok();
+        wxASSERT_MSG( M_BMPDATA->m_pixmap, wxT("couldn't create bitmap") );
+    }

 }
 
 }
 

-bool wxBitmap::CreateFromXpm( const char **bits )
+wxBitmap::wxBitmap(const char* const* bits)

 {
 {

-    wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") )
-
-    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
-    wxASSERT( visual );
-    
-    m_refData = new wxBitmapRefData();
-
-    GdkBitmap *mask = (GdkBitmap*) NULL;
+    wxCHECK2_MSG(bits != NULL, return, wxT("invalid bitmap data"));

 
 

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

 
 

-    wxCHECK_MSG( M_BMPDATA->m_pixmap, FALSE, wxT("couldn't create pixmap") );
-
-    if (mask)
+    if (M_BMPDATA->m_pixmap != NULL && mask != NULL)

     {
     {

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

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

-
-    gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
-
-    M_BMPDATA->m_bpp = visual->depth;  // ?
-    
-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-
-    return TRUE;

 }
 
 }
 

-extern GtkWidget *wxRootWindow;
+wxBitmap::~wxBitmap()
+{
+}

 
 

-bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
+bool wxBitmap::Create( int width, int height, int depth )

 {
 {

-    wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") )
-    wxCHECK_MSG( depth == -1 || depth == 1, FALSE, wxT("invalid bitmap depth") )
+    UnRef();

 
 

-    m_refData = new wxBitmapRefData();
-      
-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+    if ( width <= 0 || height <= 0 )
+    {
+        return false;
+    }

 
 

-    // ------
-    // convertion to mono bitmap:
-    // ------
-    if (depth == 1)
+    if (depth == 32)

     {
     {

-        int width = image.GetWidth();
-        int height = image.GetHeight();
+        SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, width, height), 32);
+    }
+    else
+    {
+        if (depth != 1)
+        {
+            const GdkVisual* visual = wxTheApp->GetGdkVisual();
+            if (depth == -1)
+                depth = visual->depth;

 
 

-        SetHeight( height );
-        SetWidth( width );
+            wxCHECK_MSG(depth == visual->depth, false, wxT("invalid bitmap depth"));
+        }

 
 

-        SetBitmap( gdk_pixmap_new( wxRootWindow->window, width, height, 1 ) );
+        SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, width, height, depth));
+    }

 
 

-        SetDepth( 1 );
+    return Ok();
+}

 
 

-        GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
-        wxASSERT( visual );
+wxBitmap wxBitmap::Rescale(int clipx, int clipy, int clipwidth, int clipheight, int newx, int newy) const
+{
+    wxBitmap bmp;

 
 

-        // Create picture image
+    wxCHECK_MSG(Ok(), bmp, wxT("invalid bitmap"));

 
 

-        unsigned char *data_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
+    int width = wxMax(newx, 1);
+    int height = wxMax(newy, 1);
+    width = wxMin(width, clipwidth);
+    height = wxMin(height, clipheight);

 
 

-        GdkImage *data_image =
-            gdk_image_new_bitmap( visual, data_data, width, height );
+    const double scale_x = double(newx) / M_BMPDATA->m_width;
+    const double scale_y = double(newy) / M_BMPDATA->m_height;

 
 

-        // Create mask image
+    // Converting to pixbuf, scaling with gdk_pixbuf_scale, and converting
+    // back, is faster than scaling pixmap ourselves.

 
 

-        GdkImage *mask_image = (GdkImage*) NULL;
+    // use pixbuf if already available,
+    // otherwise create temporary pixbuf from pixmap
+    GdkPixbuf* pixbuf = M_BMPDATA->m_pixbuf;
+    if (pixbuf)
+        g_object_ref(pixbuf);
+    else
+        pixbuf = gdk_pixbuf_get_from_drawable(
+            NULL, M_BMPDATA->m_pixmap, NULL,
+            0, 0, 0, 0, M_BMPDATA->m_width, M_BMPDATA->m_height);

 
 

-        if (image.HasMask())
-        {
-            unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
+    // new pixbuf for scaled wxBitmap
+    GdkPixbuf* pixbuf_scaled = gdk_pixbuf_new(
+        GDK_COLORSPACE_RGB, gdk_pixbuf_get_has_alpha(pixbuf), 8, width, height);

 
 

-            mask_image =  gdk_image_new_bitmap( visual, mask_data, width, height );
+    // GDK_INTERP_NEAREST is the lowest-quality method for continuous-tone
+    // images, but the only one which preserves sharp edges
+    gdk_pixbuf_scale(
+        pixbuf, pixbuf_scaled,
+        0, 0, width, height, -clipx, -clipy, scale_x, scale_y,
+        GDK_INTERP_NEAREST);

 
 

-            wxMask *mask = new wxMask();
-            mask->m_bitmap = gdk_pixmap_new( wxRootWindow->window, width, height, 1 );
+    g_object_unref(pixbuf);
+    bmp.SetPixbuf(pixbuf_scaled, M_BMPDATA->m_bpp);

 
 

-            SetMask( mask );
-        }
+    if (M_BMPDATA->m_mask)
+    {
+        pixbuf = gdk_pixbuf_get_from_drawable(
+            NULL, M_BMPDATA->m_mask->m_bitmap, NULL,
+            0, 0, 0, 0, M_BMPDATA->m_width, M_BMPDATA->m_height);

 
 

-        int r_mask = image.GetMaskRed();
-        int g_mask = image.GetMaskGreen();
-        int b_mask = image.GetMaskBlue();
+        pixbuf_scaled = gdk_pixbuf_new(
+            GDK_COLORSPACE_RGB, false, 8, width, height);

 
 

-        unsigned char* data = image.GetData();
+        gdk_pixbuf_scale(
+            pixbuf, pixbuf_scaled,
+            0, 0, width, height, -clipx, -clipy, scale_x, scale_y,
+            GDK_INTERP_NEAREST);

 
 

-        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 );
-                }
+        g_object_unref(pixbuf);

 
 

-                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 );
+        // use existing functionality to create mask from scaled pixbuf
+        wxBitmap maskbmp;
+        maskbmp.SetPixbuf(pixbuf_scaled);
+        bmp.SetMask(new wxMask(maskbmp, *wxBLACK));
+    }
+    return bmp;
+}

 
 

-            } // for
-        }  // for
+#if wxUSE_IMAGE

 
 

-        // Blit picture
+bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
+{
+    UnRef();

 
 

-        GdkGC *data_gc = gdk_gc_new( GetBitmap() );
+    wxCHECK_MSG( image.Ok(), false, wxT("invalid image") );
+    wxCHECK_MSG( depth == -1 || depth == 1, false, wxT("invalid bitmap depth") );

 
 

-        gdk_draw_image( GetBitmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
+    if (image.GetWidth() <= 0 || image.GetHeight() <= 0)
+        return false;

 
 

-        gdk_image_destroy( data_image );
-        gdk_gc_unref( data_gc );
+    // create pixbuf if image has alpha and requested depth is compatible
+    if (image.HasAlpha() && (depth == -1 || depth == 32))
+        return CreateFromImageAsPixbuf(image);

 
 

-        // Blit mask
+    // otherwise create pixmap, if alpha is present it will be converted to mask
+    return CreateFromImageAsPixmap(image, depth);
+}

 
 

-        if (image.HasMask())
+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++)

         {
         {

-            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 );
+            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;

     }
     }

-    
-    // ------
-    // convertion to colour bitmap:
-    // ------

     else
     {
     else
     {

-        int width = image.GetWidth();
-        int height = image.GetHeight();
-
-        SetHeight( height );
-        SetWidth( width );
-
-        SetPixmap( gdk_pixmap_new( wxRootWindow->window, width, height, -1 ) );
-
-        // Retrieve depth
-
-        GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
-        wxASSERT( visual );
-
-        int bpp = visual->depth;
-
-        SetDepth( bpp );
-
-        if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
-        if (bpp < 8) bpp = 8;
+        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 (GTK_MINOR_VERSION > 0)
+    const wxByte* alpha = image.GetAlpha();
+    if (alpha != NULL || image.HasMask())
+    {
+        // create mask as XBM format bitmap

 
 

-        if (!image.HasMask() && (bpp > 8))
+        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;
-        }
-
-#endif
-
-        // 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( wxRootWindow->window, width, height, 1 );
-
-            SetMask( mask );

         }
         }

-
-        // Render
-
-        enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
-        byte_order b_o = RGB;
-
-        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;
-        }
-
-        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++)
+        else

         {
         {

-            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 );
-                }
-
-                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
+                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;
+}

 
 

-        // Blit picture
+bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
+{
+    wxASSERT(image.HasAlpha());

 
 

-        GdkGC *data_gc = gdk_gc_new( GetPixmap() );
+    int width = image.GetWidth();
+    int height = image.GetHeight();

 
 

-        gdk_draw_image( GetPixmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
+    Create(width, height, 32);
+    GdkPixbuf* pixbuf = M_BMPDATA->m_pixbuf;
+    if (!pixbuf)
+        return false;

 
 

-        gdk_image_destroy( data_image );
-        gdk_gc_unref( data_gc );
+    // Copy the data:
+    const unsigned char* in = image.GetData();
+    unsigned char *out = gdk_pixbuf_get_pixels(pixbuf);
+    unsigned char *alpha = image.GetAlpha();

 
 

-        // Blit mask
+    int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - 4 * width;

 
 

-        if (image.HasMask())
+    for (int y = 0; y < height; y++, out += rowpad)
+    {
+        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
 {
 }
 
 wxImage wxBitmap::ConvertToImage() const
 {

-    wxImage image;
-    

     wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
 
     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();
+    const int w = GetWidth();
+    const int h = GetHeight();
+    wxImage image(w, h, false);
+    unsigned char *data = image.GetData();

 
 

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

 
 

-    GdkImage *gdk_image_mask = (GdkImage*) NULL;
-    if (GetMask())
+    // prefer pixbuf if available, it will preserve alpha and should be quicker
+    if (HasPixbuf())

     {
     {

-        gdk_image_mask = gdk_image_get( GetMask()->GetBitmap(),
-            0, 0,
-            GetWidth(), GetHeight() );
-
-        image.SetMaskColour( 16, 16, 16 );  // anything unlikely and dividable
-    }
-
-    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;
+        GdkPixbuf *pixbuf = GetPixbuf();
+        unsigned char* alpha = NULL;
+        if (gdk_pixbuf_get_has_alpha(pixbuf))
+        {
+            image.SetAlpha();
+            alpha = image.GetAlpha();
+        }
+        const unsigned char* in = gdk_pixbuf_get_pixels(pixbuf);
+        unsigned char *out = data;
+        const int inc = 3 + int(alpha != NULL);
+        const int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - inc * w;

 
 

-    if (GetPixmap())
-    {
-        GdkVisual *visual = gdk_window_get_visual( GetPixmap() );
-
-        if (visual == NULL) visual = gdk_window_get_visual( wxRootWindow->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 += rowpad)
+        {
+            for (int x = 0; x < w; x++, in += inc, out += 3)
+            {
+                out[0] = in[0];
+                out[1] = in[1];
+                out[2] = in[2];
+                if (alpha != NULL)
+                    *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);

 
 

-    GdkColormap *cmap = gtk_widget_get_default_colormap();
+        gdk_pixbuf_get_from_drawable(pixbuf, pixmap, NULL, 0, 0, 0, 0, w, h);

 
 

-    long pos = 0;
-    for (int j = 0; j < GetHeight(); j++)
+        g_object_unref(pixbuf);
+        if (pixmap_invert != NULL)
+            g_object_unref(pixmap_invert);
+    }
+    // convert mask, unless there is already alpha
+    if (GetMask() && !image.HasAlpha())

     {
     {

-        for (int i = 0; i < GetWidth(); i++)
+        // we hard code the mask colour for now but we could also make an
+        // effort (and waste time) to choose a colour not present in the
+        // image already to avoid having to fudge the pixels below --
+        // whether it's worth to do it is unclear however
+        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);
+
+        for (int y = 0; y < h; y++)

         {
         {

-            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)
+            for (int x = 0; x < w; x++, data += 3)

             {
             {

-                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;
+                if (gdk_image_get_pixel(image_mask, x, y) == 0)
+                {
+                    data[0] = MASK_RED;
+                    data[1] = MASK_GREEN;
+                    data[2] = MASK_BLUE;

                 }
                 }

-            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)
+                else if (data[0] == MASK_RED && data[1] == MASK_GREEN && data[2] == MASK_BLUE)

                 {
                 {

-                    data[pos] = 16;
-                    data[pos+1] = 16;
-                    data[pos+2] = 16;
+                    // we have to fudge the colour a bit to prevent
+                    // this pixel from appearing transparent
+                    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;
 }
 
     return image;
 }
 

-wxBitmap::wxBitmap( const wxBitmap& bmp )
-{
-    Ref( bmp );
-
-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-}
-
-wxBitmap::wxBitmap( const wxString &filename, int type )
-{
-    LoadFile( filename, type );
-
-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-}
-
-wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth))
-{
-    m_refData = new wxBitmapRefData();
-
-    M_BMPDATA->m_mask = (wxMask *) NULL;
-    M_BMPDATA->m_bitmap =
-      gdk_bitmap_create_from_data( wxRootWindow->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") );
-
-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-}
-
-wxBitmap::~wxBitmap()
-{
-    if (wxTheBitmapList) wxTheBitmapList->DeleteObject(this);
-}
+#endif // wxUSE_IMAGE

 
 

-wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp )
+bool wxBitmap::IsOk() const

 {
 {

-    if (*this == bmp) return (*this);
-    Ref( bmp );
-    return *this;
-}
-
-bool wxBitmap::operator == ( const wxBitmap& bmp ) const
-{
-    return m_refData == bmp.m_refData;
-}
-
-bool wxBitmap::operator != ( const wxBitmap& bmp ) const
-{
-    return m_refData != bmp.m_refData;
-}
-
-bool wxBitmap::Ok() const
-{
-    return (m_refData != NULL);
+    return (m_refData != NULL) &&
+           (
+              M_BMPDATA->m_pixbuf ||
+              M_BMPDATA->m_pixmap
+           );

 }
 
 int wxBitmap::GetHeight() const
 }
 
 int wxBitmap::GetHeight() const


@@ -859,42 +638,53 @@ void wxBitmap::SetMask( wxMask *mask )
 {
     wxCHECK_RET( Ok(), wxT("invalid bitmap") );
 
 {
     wxCHECK_RET( Ok(), wxT("invalid bitmap") );
 

-    if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
-
+    AllocExclusive();
+    delete M_BMPDATA->m_mask;

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

+bool wxBitmap::CopyFromIcon(const wxIcon& icon)
+{
+    *this = icon;
+    return Ok();
+}
+

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

-    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;

 
 

-    wxBitmap ret( rect.width, rect.height, M_BMPDATA->m_bpp );
-    wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
+    wxCHECK_MSG(Ok(), ret, wxT("invalid bitmap"));
+    wxCHECK_MSG(rect.x >= 0 && rect.y >= 0 &&
+                rect.x + rect.width <= M_BMPDATA->m_width &&
+                rect.y + rect.height <= M_BMPDATA->m_height,
+                ret, wxT("invalid bitmap region"));

 
 

-    if (ret.GetPixmap())
+    if (HasPixbuf() || M_BMPDATA->m_bpp == 32)

     {
     {

-        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, M_BMPDATA->m_bpp);
+        gdk_pixbuf_copy_area(GetPixbuf(),
+                             rect.x, rect.y, rect.width, rect.height,
+                             pixbuf, 0, 0);

     }
     else
     {
     }
     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 );
+        ret.Create(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())
+    // make mask, unless there is already alpha
+    if (GetMask() && !HasAlpha())

     {
         wxMask *mask = new wxMask;
     {
         wxMask *mask = new wxMask;

-        mask->m_bitmap = gdk_pixmap_new( wxRootWindow->window, rect.width, rect.height, 1 );
+        mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, rect.width, rect.height, 1 );

 
         GdkGC *gc = gdk_gc_new( mask->m_bitmap );
 
         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 );
+        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 );
     }
 
         ret.SetMask( mask );
     }


@@ -902,109 +692,293 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
     return ret;
 }
 
     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") );

 
 

+#if wxUSE_IMAGE

     // Try to save the bitmap via wxImage handlers:
     // Try to save the bitmap via wxImage handlers:

-    {
-        wxImage image( *this );
-        if (image.Ok()) return image.SaveFile( name, type );
-    }
-
-    return FALSE;
+    wxImage image = ConvertToImage();
+    return image.Ok() && image.SaveFile(name, type);
+#else // !wxUSE_IMAGE
+    return false;
+#endif // wxUSE_IMAGE

 }
 
 }
 

-bool wxBitmap::LoadFile( const wxString &name, int type )
+bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )

 {
     UnRef();
 
 {
     UnRef();
 

-    if (!wxFileExists(name)) return FALSE;
-
-    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
-    wxASSERT( visual );
-    

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

-        m_refData = new wxBitmapRefData();
-

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

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

 
         if (mask)
         {
 
         if (mask)
         {

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

         }
         }

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

     }
     }

+#if wxUSE_IMAGE

     else // try if wxImage can load it
     {
         wxImage image;
     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())
+            CreateFromImage(image, -1);

     }
     }

+#endif // wxUSE_IMAGE

 
 

-    return TRUE;
+    return Ok();

 }
 
 }
 

+#if wxUSE_PALETTE

 wxPalette *wxBitmap::GetPalette() const
 {
 wxPalette *wxBitmap::GetPalette() const
 {

-    if (!Ok()) return (wxPalette *) NULL;
+    wxCHECK_MSG(Ok(), NULL, wxT("invalid bitmap"));

 
     return M_BMPDATA->m_palette;
 }
 
 
     return M_BMPDATA->m_palette;
 }
 

-void wxBitmap::SetHeight( int height )
+void wxBitmap::SetPalette(const wxPalette& WXUNUSED(palette))

 {
 {

-    if (!m_refData) m_refData = new wxBitmapRefData();
+    // TODO
+}
+#endif // wxUSE_PALETTE

 
 

+void wxBitmap::SetHeight( int height )
+{
+    AllocExclusive();

     M_BMPDATA->m_height = height;
 }
 
 void wxBitmap::SetWidth( int width )
 {
     M_BMPDATA->m_height = height;
 }
 
 void wxBitmap::SetWidth( int width )
 {

-    if (!m_refData) m_refData = new wxBitmapRefData();
-
+    AllocExclusive();

     M_BMPDATA->m_width = width;
 }
 
 void wxBitmap::SetDepth( int depth )
 {
     M_BMPDATA->m_width = width;
 }
 
 void wxBitmap::SetDepth( int depth )
 {

-    if (!m_refData) m_refData = new wxBitmapRefData();
-
+    AllocExclusive();

     M_BMPDATA->m_bpp = depth;
 }
 
 void wxBitmap::SetPixmap( GdkPixmap *pixmap )
 {
     M_BMPDATA->m_bpp = depth;
 }
 
 void wxBitmap::SetPixmap( GdkPixmap *pixmap )
 {

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

 
 

+    // AllocExclusive should not be needed for this internal function
+    wxASSERT(m_refData->GetRefCount() == 1);
+    wxASSERT(M_BMPDATA->m_pixmap == NULL);

     M_BMPDATA->m_pixmap = pixmap;
     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);

 }
 
 }
 

-void wxBitmap::SetBitmap( GdkPixmap *bitmap )
+GdkPixmap *wxBitmap::GetPixmap() const

 {
 {

-    if (!m_refData) m_refData = new wxBitmapRefData();
+    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)
+    {
+        GdkPixmap** pmask = NULL;
+        if (gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbuf))
+        {
+            // make new mask from alpha
+            delete M_BMPDATA->m_mask;
+            M_BMPDATA->m_mask = new wxMask;
+            pmask = &M_BMPDATA->m_mask->m_bitmap;
+        }
+        gdk_pixbuf_render_pixmap_and_mask(M_BMPDATA->m_pixbuf,
+                                          &M_BMPDATA->m_pixmap,
+                                          pmask,
+                                          0x80 /* alpha threshold */);
+    }

 
 

-    M_BMPDATA->m_bitmap = bitmap;
+    return M_BMPDATA->m_pixmap;

 }
 
 }
 

-GdkPixmap *wxBitmap::GetPixmap() const
+bool wxBitmap::HasPixmap() const

 {
 {

-    wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, wxT("invalid bitmap") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );

 
 

-    return M_BMPDATA->m_pixmap;
+    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();
+
+        GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
+                                           GetMask() != NULL,
+                                           8, width, height);
+        M_BMPDATA->m_pixbuf = 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::SetPixbuf(GdkPixbuf* pixbuf, int depth)
+{
+    if (!m_refData)
+        m_refData = new wxBitmapRefData;
+
+    // AllocExclusive should not be needed for this internal function
+    wxASSERT(m_refData->GetRefCount() == 1);
+    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);
+    // if depth specified
+    if (depth != 0)
+        M_BMPDATA->m_bpp = depth;
+    else if (M_BMPDATA->m_bpp == 0)
+        // use something reasonable
+        M_BMPDATA->m_bpp = wxTheApp->GetGdkVisual()->depth;
+    PurgeOtherRepresentations(Pixbuf);

 }
 
 }
 

-GdkBitmap *wxBitmap::GetBitmap() const
+void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep)

 {
 {

-    wxCHECK_MSG( Ok(), (GdkBitmap *) 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_bitmap;
+void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
+{
+    void* bits = NULL;
+    GdkPixbuf *pixbuf = GetPixbuf();
+    const bool hasAlpha = HasAlpha();
+    // allow access if bpp is valid and matches existence of alpha
+    if (pixbuf != NULL && (
+        bpp == 24 && !hasAlpha ||
+        bpp == 32 && hasAlpha))
+    {
+        data.m_height = gdk_pixbuf_get_height( pixbuf );
+        data.m_width = gdk_pixbuf_get_width( pixbuf );
+        data.m_stride = gdk_pixbuf_get_rowstride( pixbuf );
+        bits = gdk_pixbuf_get_pixels(pixbuf);
+    }
+    return bits;
+}
+
+void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data))
+{
+}
+
+bool wxBitmap::HasAlpha() const
+{
+    return m_refData != NULL && M_BMPDATA->m_pixbuf != NULL &&
+        gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbuf);
+}
+
+wxObjectRefData* wxBitmap::CreateRefData() const
+{
+    return new wxBitmapRefData;
+}
+
+wxObjectRefData* wxBitmap::CloneRefData(const wxObjectRefData* data) const
+{
+    const wxBitmapRefData* oldRef = wx_static_cast(const wxBitmapRefData*, data);
+    wxBitmapRefData* newRef = new wxBitmapRefData;
+    newRef->m_width = oldRef->m_width;
+    newRef->m_height = oldRef->m_height;
+    newRef->m_bpp = oldRef->m_bpp;
+    if (oldRef->m_pixmap != NULL)
+    {
+        newRef->m_pixmap = gdk_pixmap_new(
+            oldRef->m_pixmap, oldRef->m_width, oldRef->m_height,
+            // use pixmap depth, m_bpp may not match
+            gdk_drawable_get_depth(oldRef->m_pixmap));
+        GdkGC* gc = gdk_gc_new(newRef->m_pixmap);
+        gdk_draw_drawable(
+            newRef->m_pixmap, gc, oldRef->m_pixmap, 0, 0, 0, 0, -1, -1);
+        g_object_unref(gc);
+    }
+    if (oldRef->m_pixbuf != NULL)
+    {
+        newRef->m_pixbuf = gdk_pixbuf_copy(oldRef->m_pixbuf);
+    }
+    if (oldRef->m_mask != NULL)
+    {
+        newRef->m_mask = new wxMask;
+        newRef->m_mask->m_bitmap = gdk_pixmap_new(
+            oldRef->m_mask->m_bitmap, oldRef->m_width, oldRef->m_height, 1);
+        GdkGC* gc = gdk_gc_new(newRef->m_mask->m_bitmap);
+        gdk_draw_drawable(newRef->m_mask->m_bitmap,
+            gc, oldRef->m_mask->m_bitmap, 0, 0, 0, 0, -1, -1);
+        g_object_unref(gc);
+    }
+#if wxUSE_PALETTE
+    // implement this if SetPalette is ever implemented
+    wxASSERT(oldRef->m_palette == NULL);
+#endif
+
+    return newRef;
+}
+
+//-----------------------------------------------------------------------------
+// wxBitmapHandler
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase)
+
+/* static */ void wxBitmap::InitStandardHandlers()
+{
+    // TODO: Insert handler based on GdkPixbufs handler later

 }
 }