remove checks for new dc code

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

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 3eca0eb586775fe096bedeb994549061597e7d04..663c9ec721a9bc1f6304409c6ca1db8e4f693f61 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -18,6 +18,7 @@
     #include "wx/icon.h"
     #include "wx/math.h"
     #include "wx/image.h"
     #include "wx/icon.h"
     #include "wx/math.h"
     #include "wx/image.h"

+    #include "wx/colour.h"

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


@@ -84,7 +85,7 @@ bool wxMask::Create( const wxBitmap& 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];
     // 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 white
+    // set bits are unmasked

     memset(out, 0xff, out_size);
     unsigned bit_index = 0;
     if (bitmap.HasPixbuf())
     memset(out, 0xff, out_size);
     unsigned bit_index = 0;
     if (bitmap.HasPixbuf())


@@ -109,8 +110,11 @@ bool wxMask::Create( const wxBitmap& bitmap,
     {
         GdkImage* image = gdk_drawable_get_image(bitmap.GetPixmap(), 0, 0, w, h);
         GdkColormap* colormap = gdk_image_get_colormap(image);
     {
         GdkImage* image = gdk_drawable_get_image(bitmap.GetPixmap(), 0, 0, w, h);
         GdkColormap* colormap = gdk_image_get_colormap(image);

-        guint32 mask_pixel = 1;
-        if (colormap != NULL)
+        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

         {
             wxColor c(colour);
             c.CalcPixel(colormap);
         {
             wxColor c(colour);
             c.CalcPixel(colormap);


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

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

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


@@ -189,7 +193,9 @@ public:
     int             m_width;
     int             m_height;
     int             m_bpp;
     int             m_width;
     int             m_height;
     int             m_bpp;

+#if wxUSE_PALETTE

     wxPalette      *m_palette;
     wxPalette      *m_palette;

+#endif // wxUSE_PALETTE

 };
 
 wxBitmapRefData::wxBitmapRefData()
 };
 
 wxBitmapRefData::wxBitmapRefData()


@@ -200,7 +206,9 @@ wxBitmapRefData::wxBitmapRefData()
     m_width = 0;
     m_height = 0;
     m_bpp = 0;
     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()


@@ -221,13 +229,43 @@ wxBitmapRefData::~wxBitmapRefData()
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
 

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

 {
 {

+    Create(width, height, depth);

 }
 
 }
 

-wxBitmap::wxBitmap( int width, int height, int depth )
+wxBitmap::wxBitmap(const wxString &filename, wxBitmapType type)
+{
+    LoadFile(filename, type);
+}
+
+wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
+{
+    wxASSERT(depth == 1);
+    if (width > 0 && height > 0 && depth == 1)
+    {
+        SetPixmap(gdk_bitmap_create_from_data(wxGetRootWindow()->window, bits, width, height));
+
+        wxASSERT_MSG( M_BMPDATA->m_pixmap, wxT("couldn't create bitmap") );
+    }
+}
+
+wxBitmap::wxBitmap(const char* const* bits)
+{
+    wxCHECK2_MSG(bits != NULL, return, wxT("invalid bitmap data"));
+
+    GdkBitmap* mask = NULL;
+    SetPixmap(gdk_pixmap_create_from_xpm_d(wxGetRootWindow()->window, &mask, NULL, wx_const_cast(char**, bits)));
+
+    if (M_BMPDATA->m_pixmap != NULL && mask != NULL)
+    {
+        M_BMPDATA->m_mask = new wxMask;
+        M_BMPDATA->m_mask->m_bitmap = mask;
+    }
+}
+
+wxBitmap::~wxBitmap()

 {
 {

-    Create( width, height, depth );

 }
 
 bool wxBitmap::Create( int width, int height, int depth )
 }
 
 bool wxBitmap::Create( int width, int height, int depth )


@@ -241,8 +279,7 @@ bool wxBitmap::Create( int width, int height, int depth )
 
     if (depth == 32)
     {
 
     if (depth == 32)
     {

-        SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, width, height));
-        M_BMPDATA->m_bpp = 32;
+        SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, width, height), 32);

     }
     else
     {
     }
     else
     {


@@ -261,208 +298,73 @@ bool wxBitmap::Create( int width, int height, int depth )
     return Ok();
 }
 
     return Ok();
 }
 

-bool wxBitmap::CreateFromXpm( const char **bits )
-{
-    UnRef();
-
-    wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") );
-
-    GdkBitmap *mask = (GdkBitmap*) NULL;
-    SetPixmap(gdk_pixmap_create_from_xpm_d(wxGetRootWindow()->window, &mask, NULL, (gchar**)bits));
-
-    wxCHECK_MSG( M_BMPDATA->m_pixmap, false, wxT("couldn't create pixmap") );
-
-    if (mask)
-    {
-        M_BMPDATA->m_mask = new wxMask;
-        M_BMPDATA->m_mask->m_bitmap = mask;
-    }
-
-    return true;
-}
-
-wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, int newx, int newy )
+wxBitmap wxBitmap::Rescale(int clipx, int clipy, int clipwidth, int clipheight, int newx, int newy) const

 {
     wxBitmap bmp;
 
     wxCHECK_MSG(Ok(), bmp, wxT("invalid bitmap"));
 
 {
     wxBitmap bmp;
 
     wxCHECK_MSG(Ok(), bmp, wxT("invalid bitmap"));
 

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

     int width = wxMax(newx, 1);
     int height = wxMax(newy, 1);
     width = wxMin(width, clipwidth);
     height = wxMin(height, clipheight);
 
     int width = wxMax(newx, 1);
     int height = wxMax(newy, 1);
     width = wxMin(width, clipwidth);
     height = wxMin(height, clipheight);
 

-    if (HasPixbuf())
-    {
-        bmp.SetDepth(GetDepth());
-        bmp.SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB,
-                                     true, //gdk_pixbuf_get_has_alpha(GetPixbuf()),
-                                     8, width, height));
-        gdk_pixbuf_scale(GetPixbuf(), bmp.GetPixbuf(),
-                         0, 0, width, height,
-                         clipx, clipy,
-                         (double)newx/GetWidth(), (double)newy/GetHeight(),
-                         GDK_INTERP_BILINEAR);
-    }
-    else
-    {
-        GdkImage* img = gdk_drawable_get_image(GetPixmap(), 0, 0, GetWidth(), GetHeight());
-
-        wxCHECK_MSG(img, bmp, wxT("couldn't create image"));
-
-        GdkGC *gc = NULL;
-        GdkPixmap *dstpix = NULL;
-        char *dst = NULL;
-        long dstbyteperline = 0;
+    const double scale_x = double(newx) / M_BMPDATA->m_width;
+    const double scale_y = double(newy) / M_BMPDATA->m_height;

 
 

-        if (GetDepth() != 1)
-        {
-            GdkVisual *visual = gdk_drawable_get_visual( GetPixmap() );
-            if (visual == NULL)
-                visual = wxTheApp->GetGdkVisual();
+    // Converting to pixbuf, scaling with gdk_pixbuf_scale, and converting
+    // back, is faster than scaling pixmap ourselves.

 
 

-            bmp = wxBitmap(width, height, visual->depth);
-            dstpix = bmp.GetPixmap();
-            gc = gdk_gc_new( dstpix );
-        }
-        else
-        {
-            dstbyteperline = (width + 7) / 8;
-            dst = (char*) malloc(dstbyteperline*height);
-        }
-
-        // be careful to use the right scaling factor
-        float scx = (float)M_BMPDATA->m_width/(float)newx;
-        float scy = (float)M_BMPDATA->m_height/(float)newy;
-        // prepare accel-tables
-        int *tablex = (int *)calloc(width,sizeof(int));
-        int *tabley = (int *)calloc(height,sizeof(int));
-
-        // accel table filled with clipped values
-        for (int x = 0; x < width; x++)
-            tablex[x] = (int) (scx * (x+clipx));
-        for (int y = 0; y < height; y++)
-            tabley[y] = (int) (scy * (y+clipy));
-
-        // Main rescaling routine starts here
-        for (int h = 0; h < height; h++)
-        {
-            char outbyte = 0;
-            int old_x = -1;
-            guint32 old_pixval = 0;
-
-            for (int w = 0; w < width; w++)
-            {
-                guint32 pixval;
-                int x = tablex[w];
-                if (x == old_x)
-                    pixval = old_pixval;
-                else
-                {
-                    pixval = gdk_image_get_pixel( img, x, tabley[h] );
-                    old_pixval = pixval;
-                    old_x = x;
-                }
-
-                if ( dst )
-                {
-                    if (!pixval)
-                    {
-                        char bit=1;
-                        char shift = bit << (w % 8);
-                        outbyte |= shift;
-                    }
-
-                    if ((w+1)%8==0)
-                    {
-                        dst[h*dstbyteperline+w/8] = outbyte;
-                        outbyte = 0;
-                    }
-                }
-                else
-                {
-                    GdkColor col;
-                    col.pixel = pixval;
-                    gdk_gc_set_foreground( gc, &col );
-                    gdk_draw_point( dstpix, gc, w, h);
-                }
-            }
-
-            // do not forget the last byte
-            if ( dst && (width % 8 != 0) )
-                dst[h*dstbyteperline+width/8] = outbyte;
-        }
-
-        g_object_unref (img);
-        if (gc) g_object_unref (gc);
-
-        if ( dst )
-        {
-            bmp = wxBitmap( (const char *)dst, width, height, 1 );
-            free( dst );
-        }
+    // 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 (GetMask())
-        {
-            dstbyteperline = (width + 7) / 8;
-            dst = (char*) malloc(dstbyteperline*height);
-            img = gdk_drawable_get_image(GetMask()->GetBitmap(), 0, 0, GetWidth(), GetHeight());
+    // new pixbuf for scaled wxBitmap
+    GdkPixbuf* pixbuf_scaled = gdk_pixbuf_new(
+        GDK_COLORSPACE_RGB, gdk_pixbuf_get_has_alpha(pixbuf), 8, width, height);

 
 

-            for (int h = 0; h < height; h++)
-            {
-                char outbyte = 0;
-                int old_x = -1;
-                guint32 old_pixval = 0;
+    // 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);

 
 

-                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;
-                    }
+    g_object_unref(pixbuf);
+    bmp.SetPixbuf(pixbuf_scaled, M_BMPDATA->m_bpp);

 
 

-                    if (pixval)
-                    {
-                        char bit=1;
-                        char shift = bit << (w % 8);
-                        outbyte |= shift;
-                    }
+    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);

 
 

-                    if ((w+1)%8 == 0)
-                    {
-                        dst[h*dstbyteperline+w/8] = outbyte;
-                        outbyte = 0;
-                    }
-                }
+        pixbuf_scaled = gdk_pixbuf_new(
+            GDK_COLORSPACE_RGB, false, 8, width, height);

 
 

-                // 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);
+        gdk_pixbuf_scale(
+            pixbuf, pixbuf_scaled,
+            0, 0, width, height, -clipx, -clipy, scale_x, scale_y,
+            GDK_INTERP_NEAREST);

 
 

-            free( dst );
-            g_object_unref (img);
-        }
+        g_object_unref(pixbuf);

 
 

-        free( tablex );
-        free( tabley );
+        // use existing functionality to create mask from scaled pixbuf
+        wxBitmap maskbmp;
+        maskbmp.SetPixbuf(pixbuf_scaled);
+        bmp.SetMask(new wxMask(maskbmp, *wxBLACK));

     }
     }

-

     return bmp;
 }
 
     return bmp;
 }
 

+#if wxUSE_IMAGE
+

 bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
 {
     UnRef();
 bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
 {
     UnRef();


@@ -473,12 +375,11 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
     if (image.GetWidth() <= 0 || image.GetHeight() <= 0)
         return false;
 
     if (image.GetWidth() <= 0 || image.GetHeight() <= 0)
         return false;
 

-    if (depth == 1)
-        return CreateFromImageAsPixmap(image, depth);
-
-    if (image.HasAlpha())
+    // create pixbuf if image has alpha and requested depth is compatible
+    if (image.HasAlpha() && (depth == -1 || depth == 32))

         return CreateFromImageAsPixbuf(image);
 
         return CreateFromImageAsPixbuf(image);
 

+    // otherwise create pixmap, if alpha is present it will be converted to mask

     return CreateFromImageAsPixmap(image, depth);
 }
 
     return CreateFromImageAsPixmap(image, depth);
 }
 


@@ -493,7 +394,7 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth)
         // 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];
         // 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 white
+        // set bits are black

         memset(out, 0xff, out_size);
         const wxByte* in = image.GetData();
         unsigned bit_index = 0;
         memset(out, 0xff, out_size);
         const wxByte* in = image.GetData();
         unsigned bit_index = 0;


@@ -562,32 +463,24 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth)
 
 bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
 {
 
 bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
 {

+    wxASSERT(image.HasAlpha());
+

     int width = image.GetWidth();
     int height = image.GetHeight();
 
     int width = image.GetWidth();
     int height = image.GetHeight();
 

-    GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
-                                       true, //image.HasAlpha(),
-                                       8 /* bits per sample */,
-                                       width, height);
+    Create(width, height, 32);
+    GdkPixbuf* pixbuf = M_BMPDATA->m_pixbuf;

     if (!pixbuf)
         return false;
 
     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 );
-
-    SetDepth(wxTheApp->GetGdkVisual()->depth);
-    SetPixbuf(pixbuf);
-

     // Copy the data:
     // Copy the data:

-    unsigned char *in = image.GetData();
+    const unsigned char* in = image.GetData();

     unsigned char *out = gdk_pixbuf_get_pixels(pixbuf);
     unsigned char *alpha = image.GetAlpha();
 
     unsigned char *out = gdk_pixbuf_get_pixels(pixbuf);
     unsigned char *alpha = image.GetAlpha();
 

-    int rowinc = gdk_pixbuf_get_rowstride(pixbuf) - 4 * width;
+    int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - 4 * width;

 
 

-    for (int y = 0; y < height; y++, out += rowinc)
+    for (int y = 0; y < height; y++, out += rowpad)

     {
         for (int x = 0; x < width; x++, alpha++, out += 4, in += 3)
         {
     {
         for (int x = 0; x < width; x++, alpha++, out += 4, in += 3)
         {


@@ -603,37 +496,39 @@ bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
 
 wxImage wxBitmap::ConvertToImage() const
 {
 
 wxImage wxBitmap::ConvertToImage() const
 {

-    wxImage image;
-

     wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
 
     const int w = GetWidth();
     const int h = GetHeight();
     wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
 
     const int w = GetWidth();
     const int h = GetHeight();

-    image.Create(w, h);
+    wxImage image(w, h, false);

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

+    // prefer pixbuf if available, it will preserve alpha and should be quicker

     if (HasPixbuf())
     {
         GdkPixbuf *pixbuf = GetPixbuf();
     if (HasPixbuf())
     {
         GdkPixbuf *pixbuf = GetPixbuf();

-        wxASSERT( gdk_pixbuf_get_has_alpha(pixbuf) );
-
-        image.SetAlpha();
-
-        unsigned char *alpha = image.GetAlpha();
-        unsigned char *in = gdk_pixbuf_get_pixels(pixbuf);
+        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;
         unsigned char *out = data;

-        int rowinc = gdk_pixbuf_get_rowstride(pixbuf) - 4 * w;
+        const int inc = 3 + int(alpha != NULL);
+        const int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - inc * w;

 
 

-        for (int y = 0; y < h; y++, in += rowinc)
+        for (int y = 0; y < h; y++, in += rowpad)

         {
         {

-            for (int x = 0; x < w; x++, in += 4, out += 3, alpha++)
+            for (int x = 0; x < w; x++, in += inc, out += 3)

             {
                 out[0] = in[0];
                 out[1] = in[1];
                 out[2] = in[2];
             {
                 out[0] = in[0];
                 out[1] = in[1];
                 out[2] = in[2];

-                *alpha = in[3];
+                if (alpha != NULL)
+                    *alpha++ = in[3];

             }
         }
     }
             }
         }
     }


@@ -643,7 +538,7 @@ wxImage wxBitmap::ConvertToImage() const
         GdkPixmap* pixmap_invert = NULL;
         if (GetDepth() == 1)
         {
         GdkPixmap* pixmap_invert = NULL;
         if (GetDepth() == 1)
         {

-            // mono bitmaps are inverted
+            // 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);
             pixmap_invert = gdk_pixmap_new(pixmap, w, h, 1);
             GdkGC* gc = gdk_gc_new(pixmap_invert);
             gdk_gc_set_function(gc, GDK_COPY_INVERT);


@@ -660,72 +555,49 @@ wxImage wxBitmap::ConvertToImage() const
         g_object_unref(pixbuf);
         if (pixmap_invert != NULL)
             g_object_unref(pixmap_invert);
         g_object_unref(pixbuf);
         if (pixmap_invert != NULL)
             g_object_unref(pixmap_invert);

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

 
 

-        if (GetMask())
+        for (int y = 0; y < h; y++)

         {
         {

-            // the colour used as transparent one in wxImage and the one it is
-            // replaced with when it really occurs in the bitmap
-            const int MASK_RED = 1;
-            const int MASK_GREEN = 2;
-            const int MASK_BLUE = 3;
-            const int MASK_BLUE_REPLACEMENT = 2;
-
-            image.SetMaskColour(MASK_RED, MASK_GREEN, MASK_BLUE);
-            GdkImage* image_mask = gdk_drawable_get_image(GetMask()->GetBitmap(), 0, 0, w, h);
-
-            for (int y = 0; y < h; y++)
+            for (int x = 0; x < w; x++, data += 3)

             {
             {

-                for (int x = 0; x < w; x++, data += 3)
+                if (gdk_image_get_pixel(image_mask, x, y) == 0)

                 {
                 {

-                    if (gdk_image_get_pixel(image_mask, x, y) == 0)
-                    {
-                        data[0] = MASK_RED;
-                        data[1] = MASK_GREEN;
-                        data[2] = MASK_BLUE;
-                    }
-                    else if (data[0] == MASK_RED && data[1] == MASK_GREEN && data[2] == MASK_BLUE)
-                    {
-                        data[2] = MASK_BLUE_REPLACEMENT;
-                    }
+                    data[0] = MASK_RED;
+                    data[1] = MASK_GREEN;
+                    data[2] = MASK_BLUE;
+                }
+                else if (data[0] == MASK_RED && data[1] == MASK_GREEN && data[2] == MASK_BLUE)
+                {
+                    // we have to fudge the colour a bit to prevent
+                    // this pixel from appearing transparent
+                    data[2] = MASK_BLUE_REPLACEMENT;

                 }
             }
                 }
             }

-            g_object_unref(image_mask);

         }
         }

+        g_object_unref(image_mask);

     }
 
     return image;
 }
 
     }
 
     return image;
 }
 

-wxBitmap::wxBitmap( const wxString &filename, wxBitmapType type )
-{
-    LoadFile( filename, type );
-}
+#endif // wxUSE_IMAGE

 
 

-wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth))
-{
-    if ( width > 0 && height > 0 )
-    {
-        SetPixmap(gdk_bitmap_create_from_data(wxGetRootWindow()->window, bits, width, height));
-
-        wxASSERT_MSG( M_BMPDATA->m_pixmap, wxT("couldn't create bitmap") );
-    }
-}
-
-wxBitmap::~wxBitmap()
-{
-}
-
-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
+bool wxBitmap::IsOk() const

 {
     return (m_refData != NULL) &&
            (
 {
     return (m_refData != NULL) &&
            (


@@ -766,8 +638,8 @@ 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;
 }
 


@@ -781,31 +653,31 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
 {
     wxBitmap ret;
 
 {
     wxBitmap ret;
 

-    wxCHECK_MSG( Ok() &&
-                 (rect.x >= 0) && (rect.y >= 0) &&
-                 (rect.x+rect.width <= M_BMPDATA->m_width) && (rect.y+rect.height <= M_BMPDATA->m_height),
-                 ret, wxT("invalid bitmap or bitmap region") );
+    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 (HasPixbuf())
+    if (HasPixbuf() || M_BMPDATA->m_bpp == 32)

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

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

                                            8, rect.width, rect.height);
                                            8, rect.width, rect.height);

-        ret.SetPixbuf(pixbuf);
-        ret.SetDepth(M_BMPDATA->m_bpp);
+        ret.SetPixbuf(pixbuf, M_BMPDATA->m_bpp);

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

-        ret = wxBitmap(rect.width, rect.height, M_BMPDATA->m_bpp);
+        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);
     }
         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;
         mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, rect.width, rect.height, 1 );
     {
         wxMask *mask = new wxMask;
         mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, rect.width, rect.height, 1 );


@@ -824,9 +696,16 @@ bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalett
 {
     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:
     wxImage image = ConvertToImage();
     return image.Ok() && image.SaveFile(name, type);
     // Try to save the bitmap via wxImage handlers:
     wxImage image = ConvertToImage();
     return image.Ok() && image.SaveFile(name, type);

+#else // !wxUSE_IMAGE
+    wxUnusedVar(name);
+    wxUnusedVar(type);
+
+    return false;
+#endif // wxUSE_IMAGE

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


@@ -844,12 +723,14 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
             M_BMPDATA->m_mask->m_bitmap = mask;
         }
     }
             M_BMPDATA->m_mask->m_bitmap = mask;
         }
     }

+#if wxUSE_IMAGE

     else // try if wxImage can load it
     {
         wxImage image;
         if (image.LoadFile(name, type) && image.Ok())
     else // try if wxImage can load it
     {
         wxImage image;
         if (image.LoadFile(name, type) && image.Ok())

-            *this = wxBitmap(image);
+            CreateFromImage(image, -1);

     }
     }

+#endif // wxUSE_IMAGE

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


@@ -857,8 +738,7 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
 #if wxUSE_PALETTE
 wxPalette *wxBitmap::GetPalette() const
 {
 #if wxUSE_PALETTE
 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;
 }


@@ -871,25 +751,19 @@ void wxBitmap::SetPalette(const wxPalette& WXUNUSED(palette))
 
 void wxBitmap::SetHeight( int height )
 {
 
 void wxBitmap::SetHeight( int height )
 {

-    if (!m_refData)
-        m_refData = new wxBitmapRefData;
-
+    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;
 }
 
     M_BMPDATA->m_bpp = depth;
 }
 


@@ -898,6 +772,8 @@ 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;
     gdk_drawable_get_size(pixmap, &M_BMPDATA->m_width, &M_BMPDATA->m_height);
     wxASSERT(M_BMPDATA->m_pixmap == NULL);
     M_BMPDATA->m_pixmap = pixmap;
     gdk_drawable_get_size(pixmap, &M_BMPDATA->m_width, &M_BMPDATA->m_height);


@@ -912,12 +788,18 @@ GdkPixmap *wxBitmap::GetPixmap() const
     // create the pixmap on the fly if we use Pixbuf representation:
     if (M_BMPDATA->m_pixmap == NULL)
     {
     // create the pixmap on the fly if we use Pixbuf representation:
     if (M_BMPDATA->m_pixmap == NULL)
     {

-        delete M_BMPDATA->m_mask;
-        M_BMPDATA->m_mask = new wxMask;
+        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,
         gdk_pixbuf_render_pixmap_and_mask(M_BMPDATA->m_pixbuf,
                                           &M_BMPDATA->m_pixmap,

-                                          &M_BMPDATA->m_mask->m_bitmap,
-                                          128 /*threshold*/);
+                                          pmask,
+                                          0x80 /* alpha threshold */);

     }
 
     return M_BMPDATA->m_pixmap;
     }
 
     return M_BMPDATA->m_pixmap;


@@ -939,14 +821,12 @@ GdkPixbuf *wxBitmap::GetPixbuf() const
         int width = GetWidth();
         int height = GetHeight();
 
         int width = GetWidth();
         int height = GetHeight();
 

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

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

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

                                            8, width, height);
                                            8, width, height);

-        M_BMPDATA->m_pixbuf =
-            gdk_pixbuf_get_from_drawable(pixbuf, M_BMPDATA->m_pixmap, NULL,
-                                         0, 0, 0, 0, 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)
 
         // apply the mask to created pixbuf:
         if (M_BMPDATA->m_pixbuf && M_BMPDATA->m_mask)


@@ -988,15 +868,23 @@ bool wxBitmap::HasPixbuf() const
     return M_BMPDATA->m_pixbuf != NULL;
 }
 
     return M_BMPDATA->m_pixbuf != NULL;
 }
 

-void wxBitmap::SetPixbuf( GdkPixbuf *pixbuf )
+void wxBitmap::SetPixbuf(GdkPixbuf* pixbuf, int depth)

 {
     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_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);
     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);
 }
 
     PurgeOtherRepresentations(Pixbuf);
 }
 


@@ -1016,87 +904,82 @@ void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep)
 
 void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
 {
 
 void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
 {

-    if (bpp != 32)
-        return NULL;
-
+    void* bits = NULL;

     GdkPixbuf *pixbuf = GetPixbuf();
     GdkPixbuf *pixbuf = GetPixbuf();

-    if (!pixbuf)
-        return NULL;
-
-    if (!gdk_pixbuf_get_has_alpha( pixbuf ))
-        return NULL;
-
-#if 0
-    if (gdk_pixbuf_get_has_alpha( pixbuf ))
-        wxPrintf( wxT("Has alpha, %d channels\n"), gdk_pixbuf_get_n_channels(pixbuf) );
-    else
-        wxPrintf( wxT("No alpha, %d channels.\n"), gdk_pixbuf_get_n_channels(pixbuf) );
-#endif
-
-    data.m_height = gdk_pixbuf_get_height( pixbuf );
-    data.m_width = gdk_pixbuf_get_width( pixbuf );
-    data.m_stride = gdk_pixbuf_get_rowstride( pixbuf );
-
-    return gdk_pixbuf_get_pixels( pixbuf );
+    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))
 {
 }
 
 }
 
 void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data))
 {
 }
 

-

 bool wxBitmap::HasAlpha() const
 {
 bool wxBitmap::HasAlpha() const
 {

-    return HasPixbuf();
-}
-
-void wxBitmap::UseAlpha()
-{
-    GetPixbuf();
-}
-
-//-----------------------------------------------------------------------------
-// wxBitmapHandler
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler,wxBitmapHandlerBase)
-
-wxBitmapHandler::~wxBitmapHandler()
-{
+    return m_refData != NULL && M_BMPDATA->m_pixbuf != NULL &&
+        gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbuf);

 }
 
 }
 

-bool wxBitmapHandler::Create(wxBitmap * WXUNUSED(bitmap),
-                             void * WXUNUSED(data),
-                             long WXUNUSED(type),
-                             int WXUNUSED(width),
-                             int WXUNUSED(height),
-                             int WXUNUSED(depth))
+wxObjectRefData* wxBitmap::CreateRefData() const

 {
 {

-    wxFAIL_MSG( _T("not implemented") );
-
-    return false;
+    return new wxBitmapRefData;

 }
 
 }
 

-bool wxBitmapHandler::LoadFile(wxBitmap * WXUNUSED(bitmap),
-                               const wxString& WXUNUSED(name),
-                               long WXUNUSED(flags),
-                               int WXUNUSED(desiredWidth),
-                               int WXUNUSED(desiredHeight))
+wxObjectRefData* wxBitmap::CloneRefData(const wxObjectRefData* data) const

 {
 {

-    wxFAIL_MSG( _T("not implemented") );
+    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 false;
+    return newRef;

 }
 
 }
 

-bool wxBitmapHandler::SaveFile(const wxBitmap * WXUNUSED(bitmap),
-                               const wxString& WXUNUSED(name),
-                               int WXUNUSED(type),
-                               const wxPalette * WXUNUSED(palette))
-{
-    wxFAIL_MSG( _T("not implemented") );
+//-----------------------------------------------------------------------------
+// wxBitmapHandler
+//-----------------------------------------------------------------------------

 
 

-    return false;
-}
+IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase)

 
 /* static */ void wxBitmap::InitStandardHandlers()
 {
 
 /* static */ void wxBitmap::InitStandardHandlers()
 {