Fixed wxRichTextCtrl base class

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

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 019d6cd213a51c98dff0d2324719162f92829203..8a2785bbd82abe6b8b014477347e22df3473774a 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -23,6 +23,8 @@
 
 #include "wx/rawbmp.h"
 
 
 #include "wx/rawbmp.h"
 

+#include "wx/gtk/private/object.h"
+

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


@@ -39,26 +41,26 @@ IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject)
 
 wxMask::wxMask()
 {
 
 wxMask::wxMask()
 {

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

 }
 
 wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
 {
 }
 
 wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
 {

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

     Create( bitmap, colour );
 }
 
 #if wxUSE_PALETTE
 wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex )
 {
     Create( bitmap, colour );
 }
 
 #if wxUSE_PALETTE
 wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex )
 {

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

     Create( bitmap, paletteIndex );
 }
 #endif // wxUSE_PALETTE
 
 wxMask::wxMask( const wxBitmap& bitmap )
 {
     Create( bitmap, paletteIndex );
 }
 #endif // wxUSE_PALETTE
 
 wxMask::wxMask( const wxBitmap& bitmap )
 {

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

     Create( bitmap );
 }
 
     Create( bitmap );
 }
 


@@ -74,7 +76,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
     if (m_bitmap)
     {
         g_object_unref (m_bitmap);
     if (m_bitmap)
     {
         g_object_unref (m_bitmap);

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

     }
 
     const int w = bitmap.GetWidth();
     }
 
     const int w = bitmap.GetWidth();


@@ -153,10 +155,10 @@ bool wxMask::Create( const wxBitmap& bitmap )
     if (m_bitmap)
     {
         g_object_unref (m_bitmap);
     if (m_bitmap)
     {
         g_object_unref (m_bitmap);

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

     }
 
     }
 

-    if (!bitmap.Ok()) return false;
+    if (!bitmap.IsOk()) return false;

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


@@ -164,10 +166,9 @@ bool wxMask::Create( const wxBitmap& bitmap )
 
     if (!m_bitmap) return false;
 
 
     if (!m_bitmap) return false;
 

-    GdkGC *gc = gdk_gc_new( m_bitmap );
+    wxGtkObject<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());
     gdk_gc_set_function(gc, GDK_COPY_INVERT);
     gdk_draw_drawable(m_bitmap, gc, bitmap.GetPixmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight());

-    g_object_unref (gc);

 
     return true;
 }
 
     return true;
 }


@@ -181,12 +182,14 @@ GdkBitmap *wxMask::GetBitmap() const
 // wxBitmap
 //-----------------------------------------------------------------------------
 
 // wxBitmap
 //-----------------------------------------------------------------------------
 

-class wxBitmapRefData: public wxObjectRefData
+class wxBitmapRefData: public wxGDIRefData

 {
 public:
     wxBitmapRefData();
     virtual ~wxBitmapRefData();
 
 {
 public:
     wxBitmapRefData();
     virtual ~wxBitmapRefData();
 

+    virtual bool IsOk() const { return m_pixmap || m_pixbuf; }
+

     GdkPixmap      *m_pixmap;
     GdkPixbuf      *m_pixbuf;
     wxMask         *m_mask;
     GdkPixmap      *m_pixmap;
     GdkPixbuf      *m_pixbuf;
     wxMask         *m_mask;


@@ -200,14 +203,14 @@ public:
 
 wxBitmapRefData::wxBitmapRefData()
 {
 
 wxBitmapRefData::wxBitmapRefData()
 {

-    m_pixmap = (GdkPixmap *) NULL;
-    m_pixbuf = (GdkPixbuf *) NULL;
-    m_mask = (wxMask *) NULL;
+    m_pixmap = NULL;
+    m_pixbuf = NULL;
+    m_mask = NULL;

     m_width = 0;
     m_height = 0;
     m_bpp = 0;
 #if wxUSE_PALETTE
     m_width = 0;
     m_height = 0;
     m_bpp = 0;
 #if wxUSE_PALETTE

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

 #endif // wxUSE_PALETTE
 }
 
 #endif // wxUSE_PALETTE
 }
 


@@ -225,7 +228,7 @@ wxBitmapRefData::~wxBitmapRefData()
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 

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

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


@@ -245,8 +248,6 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
     if (width > 0 && height > 0 && depth == 1)
     {
         SetPixmap(gdk_bitmap_create_from_data(wxGetRootWindow()->window, bits, width, height));
     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") );

     }
 }
 
     }
 }
 


@@ -255,7 +256,9 @@ wxBitmap::wxBitmap(const char* const* bits)
     wxCHECK2_MSG(bits != NULL, return, wxT("invalid bitmap data"));
 
     GdkBitmap* mask = NULL;
     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)));
+    SetPixmap(gdk_pixmap_create_from_xpm_d(wxGetRootWindow()->window, &mask, NULL, const_cast<char**>(bits)));
+    if (!M_BMPDATA)
+        return;

 
     if (M_BMPDATA->m_pixmap != NULL && mask != NULL)
     {
 
     if (M_BMPDATA->m_pixmap != NULL && mask != NULL)
     {


@@ -277,212 +280,46 @@ bool wxBitmap::Create( int width, int height, int depth )
         return false;
     }
 
         return false;
     }
 

+    const GdkVisual* visual = wxTheApp->GetGdkVisual();
+

     if (depth == 32)
     {
         SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, width, height), 32);
     if (depth == 32)
     {
         SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, width, height), 32);

+
+        if (!M_BMPDATA)
+            return false;
+
+        // must initialize alpha, otherwise GetPixmap()
+        // will create a mask out of garbage
+        gdk_pixbuf_fill(M_BMPDATA->m_pixbuf, 0x000000ff);
+    }
+    else if (depth == 24)
+    {
+        if (visual->depth == depth)
+            SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, width, height, depth));
+        else
+            SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB, false, 8, width, height), 24);

     }
     else
     {
         if (depth != 1)
         {
     }
     else
     {
         if (depth != 1)
         {

-            const GdkVisual* visual = wxTheApp->GetGdkVisual();

             if (depth == -1)
                 depth = visual->depth;
             if (depth == -1)
                 depth = visual->depth;

-
-            wxCHECK_MSG(depth == visual->depth, false, wxT("invalid bitmap depth"));

         }
         }

-

         SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, width, height, depth));
     }
 
         SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, width, height, depth));
     }
 

-    return Ok();
+    return IsOk();

 }
 
 }
 

-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"));
-
-    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);
-
-    // scale pixbuf if available and it has alpha or there is no mask
-    if (M_BMPDATA->m_pixbuf != NULL && (
-        M_BMPDATA->m_mask == NULL || gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbuf)))
-    {
-        bmp.SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB,
-                                     gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbuf),
-                                     8, width, height), M_BMPDATA->m_bpp);
-        gdk_pixbuf_scale(M_BMPDATA->m_pixbuf, bmp.GetPixbuf(),
-                         0, 0, width, height,
-                         clipx, clipy,
-                         (double)newx/GetWidth(), (double)newy/GetHeight(),
-                         GDK_INTERP_BILINEAR);
-    }
-    else
-    {
-        GdkImage* img = gdk_drawable_get_image(
-            M_BMPDATA->m_pixmap, 0, 0, M_BMPDATA->m_width, M_BMPDATA->m_height);
-
-        wxCHECK_MSG(img, bmp, wxT("couldn't create image"));
-
-        GdkGC *gc = NULL;
-        GdkPixmap *dstpix = NULL;
-        char *dst = NULL;
-        long dstbyteperline = 0;
-
-        if (GetDepth() != 1)
-        {
-            bmp.Create(width, height, gdk_drawable_get_depth(M_BMPDATA->m_pixmap));
-            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(dst, width, height, 1);
-            free( dst );
-        }
-
-        if (GetMask())
-        {
-            dstbyteperline = (width + 7) / 8;
-            dst = (char*) malloc(dstbyteperline*height);
-            img = gdk_drawable_get_image(GetMask()->GetBitmap(), 0, 0, GetWidth(), GetHeight());
-
-            for (int h = 0; h < height; h++)
-            {
-                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 (pixval)
-                    {
-                        char bit=1;
-                        char shift = bit << (w % 8);
-                        outbyte |= shift;
-                    }
-
-                    if ((w+1)%8 == 0)
-                    {
-                        dst[h*dstbyteperline+w/8] = outbyte;
-                        outbyte = 0;
-                    }
-                }
-
-                // do not forget the last byte
-                if (width % 8 != 0)
-                    dst[h*dstbyteperline+width/8] = outbyte;
-            }
-            wxMask* mask = new wxMask;
-            mask->m_bitmap = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) dst, width, height );
-            bmp.SetMask(mask);
-
-            free( dst );
-            g_object_unref (img);
-        }
-
-        free( tablex );
-        free( tabley );
-    }
-
-    return bmp;
-}
+#if wxUSE_IMAGE

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

-    wxCHECK_MSG( image.Ok(), false, wxT("invalid image") );
+    wxCHECK_MSG( image.IsOk(), false, wxT("invalid image") );

     wxCHECK_MSG( depth == -1 || depth == 1, false, wxT("invalid bitmap depth") );
 
     if (image.GetWidth() <= 0 || image.GetHeight() <= 0)
     wxCHECK_MSG( depth == -1 || depth == 1, false, wxT("invalid bitmap depth") );
 
     if (image.GetWidth() <= 0 || image.GetHeight() <= 0)


@@ -521,16 +358,21 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth)
         }
         SetPixmap(gdk_bitmap_create_from_data(wxGetRootWindow()->window, (char*)out, w, h));
         delete[] out;
         }
         SetPixmap(gdk_bitmap_create_from_data(wxGetRootWindow()->window, (char*)out, w, h));
         delete[] out;

+
+        if (!M_BMPDATA)     // SetPixmap may have failed
+            return false;

     }
     else
     {
         SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, w, h, depth));
     }
     else
     {
         SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, w, h, depth));

-        GdkGC* gc = gdk_gc_new(M_BMPDATA->m_pixmap);
+        if (!M_BMPDATA)
+            return false;
+
+        wxGtkObject<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);
         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);

     }
 
     const wxByte* alpha = image.GetAlpha();
     }
 
     const wxByte* alpha = image.GetAlpha();


@@ -571,7 +413,7 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth)
         SetMask(mask);
         delete[] out;
     }
         SetMask(mask);
         delete[] out;
     }

-    return true;
+    return IsOk();

 }
 
 bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
 }
 
 bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)


@@ -609,7 +451,7 @@ bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
 
 wxImage wxBitmap::ConvertToImage() const
 {
 
 wxImage wxBitmap::ConvertToImage() const
 {

-    wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") );

 
     const int w = GetWidth();
     const int h = GetHeight();
 
     const int w = GetWidth();
     const int h = GetHeight();


@@ -653,10 +495,9 @@ wxImage wxBitmap::ConvertToImage() const
         {
             // mono bitmaps are inverted, i.e. 0 is white
             pixmap_invert = gdk_pixmap_new(pixmap, w, h, 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);
+            wxGtkObject<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);
             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
             pixmap = pixmap_invert;
         }
         // create a pixbuf which shares data with the wxImage


@@ -708,52 +549,41 @@ wxImage wxBitmap::ConvertToImage() const
     return image;
 }
 
     return image;
 }
 

-bool wxBitmap::operator == ( const wxBitmap& bmp ) const
-{
-    return m_refData == bmp.m_refData;
-}
-
-bool wxBitmap::Ok() const
-{
-    return (m_refData != NULL) &&
-           (
-              M_BMPDATA->m_pixbuf ||
-              M_BMPDATA->m_pixmap
-           );
-}
+#endif // wxUSE_IMAGE

 
 int wxBitmap::GetHeight() const
 {
 
 int wxBitmap::GetHeight() const
 {

-    wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );

 
     return M_BMPDATA->m_height;
 }
 
 int wxBitmap::GetWidth() const
 {
 
     return M_BMPDATA->m_height;
 }
 
 int wxBitmap::GetWidth() const
 {

-    wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );

 
     return M_BMPDATA->m_width;
 }
 
 int wxBitmap::GetDepth() const
 {
 
     return M_BMPDATA->m_width;
 }
 
 int wxBitmap::GetDepth() const
 {

-    wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid bitmap") );

 
     return M_BMPDATA->m_bpp;
 }
 
 wxMask *wxBitmap::GetMask() const
 {
 
     return M_BMPDATA->m_bpp;
 }
 
 wxMask *wxBitmap::GetMask() const
 {

-    wxCHECK_MSG( Ok(), (wxMask *) NULL, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") );

 
     return M_BMPDATA->m_mask;
 }
 
 void wxBitmap::SetMask( wxMask *mask )
 {
 
     return M_BMPDATA->m_mask;
 }
 
 void wxBitmap::SetMask( wxMask *mask )
 {

-    wxCHECK_RET( Ok(), wxT("invalid bitmap") );
+    wxCHECK_RET( IsOk(), wxT("invalid bitmap") );

 
 

+    AllocExclusive();

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


@@ -761,14 +591,14 @@ void wxBitmap::SetMask( wxMask *mask )
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
     *this = icon;
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
     *this = icon;

-    return Ok();
+    return IsOk();

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

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


@@ -779,6 +609,9 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
         GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
                                            gdk_pixbuf_get_has_alpha(GetPixbuf()),
                                            8, rect.width, rect.height);
         GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
                                            gdk_pixbuf_get_has_alpha(GetPixbuf()),
                                            8, rect.width, rect.height);

+        if (!pixbuf)
+            return ret;
+

         ret.SetPixbuf(pixbuf, M_BMPDATA->m_bpp);
         gdk_pixbuf_copy_area(GetPixbuf(),
                              rect.x, rect.y, rect.width, rect.height,
         ret.SetPixbuf(pixbuf, M_BMPDATA->m_bpp);
         gdk_pixbuf_copy_area(GetPixbuf(),
                              rect.x, rect.y, rect.width, rect.height,


@@ -787,9 +620,8 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
     else
     {
         ret.Create(rect.width, rect.height, M_BMPDATA->m_bpp);
     else
     {
         ret.Create(rect.width, rect.height, M_BMPDATA->m_bpp);

-        GdkGC *gc = gdk_gc_new( ret.GetPixmap() );
+        wxGtkObject<GdkGC> gc(gdk_gc_new( ret.GetPixmap() ));

         gdk_draw_drawable( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
         gdk_draw_drawable( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );

-        g_object_unref (gc);

     }
     // make mask, unless there is already alpha
     if (GetMask() && !HasAlpha())
     }
     // make mask, unless there is already alpha
     if (GetMask() && !HasAlpha())


@@ -797,9 +629,8 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
         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 );
 

-        GdkGC *gc = gdk_gc_new( mask->m_bitmap );
+        wxGtkObject<GdkGC> gc(gdk_gc_new( mask->m_bitmap ));

         gdk_draw_drawable(mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, rect.x, rect.y, 0, 0, rect.width, rect.height);
         gdk_draw_drawable(mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, rect.x, rect.y, 0, 0, rect.width, rect.height);

-        g_object_unref (gc);

 
         ret.SetMask( mask );
     }
 
         ret.SetMask( mask );
     }


@@ -809,11 +640,18 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
 
 bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalette *WXUNUSED(palette) ) const
 {
 
 bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalette *WXUNUSED(palette) ) const
 {

-    wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), 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 )


@@ -822,8 +660,10 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
 
     if (type == wxBITMAP_TYPE_XPM)
     {
 
     if (type == wxBITMAP_TYPE_XPM)
     {

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

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

+        if (!M_BMPDATA)
+            return false;   // do not set the mask

 
         if (mask)
         {
 
         if (mask)
         {


@@ -831,20 +671,22 @@ 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())
             CreateFromImage(image, -1);
     }
     else // try if wxImage can load it
     {
         wxImage image;
         if (image.LoadFile(name, type) && image.Ok())
             CreateFromImage(image, -1);
     }

+#endif // wxUSE_IMAGE

 
 

-    return Ok();
+    return IsOk();

 }
 
 #if wxUSE_PALETTE
 wxPalette *wxBitmap::GetPalette() const
 {
 }
 
 #if wxUSE_PALETTE
 wxPalette *wxBitmap::GetPalette() const
 {

-    wxCHECK_MSG(Ok(), NULL, wxT("invalid bitmap"));
+    wxCHECK_MSG(IsOk(), NULL, wxT("invalid bitmap"));

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


@@ -857,33 +699,32 @@ 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;
 }
 
 void wxBitmap::SetPixmap( GdkPixmap *pixmap )
 {
     M_BMPDATA->m_bpp = depth;
 }
 
 void wxBitmap::SetPixmap( GdkPixmap *pixmap )
 {

+    if (!pixmap)
+        return;
+

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


@@ -893,7 +734,7 @@ void wxBitmap::SetPixmap( GdkPixmap *pixmap )
 
 GdkPixmap *wxBitmap::GetPixmap() const
 {
 
 GdkPixmap *wxBitmap::GetPixmap() const
 {

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

 
     // 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)


@@ -909,7 +750,7 @@ GdkPixmap *wxBitmap::GetPixmap() const
         gdk_pixbuf_render_pixmap_and_mask(M_BMPDATA->m_pixbuf,
                                           &M_BMPDATA->m_pixmap,
                                           pmask,
         gdk_pixbuf_render_pixmap_and_mask(M_BMPDATA->m_pixbuf,
                                           &M_BMPDATA->m_pixmap,
                                           pmask,

-                                          wxIMAGE_ALPHA_THRESHOLD);
+                                          0x80 /* alpha threshold */);

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


@@ -917,17 +758,18 @@ GdkPixmap *wxBitmap::GetPixmap() const
 
 bool wxBitmap::HasPixmap() const
 {
 
 bool wxBitmap::HasPixmap() const
 {

-    wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") );

 
     return M_BMPDATA->m_pixmap != NULL;
 }
 
 GdkPixbuf *wxBitmap::GetPixbuf() const
 {
 
     return M_BMPDATA->m_pixmap != NULL;
 }
 
 GdkPixbuf *wxBitmap::GetPixbuf() const
 {

-    wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") );

 
     if (M_BMPDATA->m_pixbuf == NULL)
     {
 
     if (M_BMPDATA->m_pixbuf == NULL)
     {

+

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


@@ -937,7 +779,6 @@ GdkPixbuf *wxBitmap::GetPixbuf() const
         M_BMPDATA->m_pixbuf = 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)
         {


@@ -973,16 +814,21 @@ GdkPixbuf *wxBitmap::GetPixbuf() const
 
 bool wxBitmap::HasPixbuf() const
 {
 
 bool wxBitmap::HasPixbuf() const
 {

-    wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );
+    wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") );

 
     return M_BMPDATA->m_pixbuf != NULL;
 }
 
 void wxBitmap::SetPixbuf(GdkPixbuf* pixbuf, int depth)
 {
 
     return M_BMPDATA->m_pixbuf != NULL;
 }
 
 void wxBitmap::SetPixbuf(GdkPixbuf* pixbuf, int depth)
 {

+    if (!pixbuf)
+        return;
+

     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);
     wxASSERT(M_BMPDATA->m_pixbuf == NULL);
     M_BMPDATA->m_pixbuf = pixbuf;
     M_BMPDATA->m_width = gdk_pixbuf_get_width(pixbuf);


@@ -1010,15 +856,15 @@ void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep)
     }
 }
 
     }
 }
 

+#ifdef wxHAS_RAW_BITMAP

 void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
 {
     void* bits = NULL;
     GdkPixbuf *pixbuf = GetPixbuf();
     const bool hasAlpha = HasAlpha();
 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
     // allow access if bpp is valid and matches existence of alpha

-    if (pixbuf != NULL && (
-        bpp == 24 && !hasAlpha ||
-        bpp == 32 && hasAlpha))
+    if ( pixbuf && ((bpp == 24 && !hasAlpha) || (bpp == 32 && hasAlpha)) )

     {
         data.m_height = gdk_pixbuf_get_height( pixbuf );
         data.m_width = gdk_pixbuf_get_width( pixbuf );
     {
         data.m_height = gdk_pixbuf_get_height( pixbuf );
         data.m_width = gdk_pixbuf_get_width( pixbuf );


@@ -1031,6 +877,7 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
 void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data))
 {
 }
 void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data))
 {
 }

+#endif // wxHAS_RAW_BITMAP

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


@@ -1038,23 +885,48 @@ bool wxBitmap::HasAlpha() const
         gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbuf);
 }
 
         gdk_pixbuf_get_has_alpha(M_BMPDATA->m_pixbuf);
 }
 

-void wxBitmap::UseAlpha()
+wxGDIRefData* wxBitmap::CreateGDIRefData() const

 {
 {

-    GdkPixbuf* pixbuf = GetPixbuf();
-    // add alpha if necessary
-    if (!gdk_pixbuf_get_has_alpha(pixbuf))
-    {
-        M_BMPDATA->m_pixbuf = NULL;
-        SetPixbuf(gdk_pixbuf_add_alpha(pixbuf, false, 0, 0, 0));
-        g_object_unref(pixbuf);
-    }
+    return new wxBitmapRefData;

 }
 
 }
 

-//-----------------------------------------------------------------------------
-// wxBitmapHandler
-//-----------------------------------------------------------------------------
+wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const
+{
+    const wxBitmapRefData* oldRef = 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));
+        wxGtkObject<GdkGC> gc(gdk_gc_new(newRef->m_pixmap));
+        gdk_draw_drawable(
+            newRef->m_pixmap, gc, oldRef->m_pixmap, 0, 0, 0, 0, -1, -1);
+    }
+    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);
+        wxGtkObject<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);
+    }
+#if wxUSE_PALETTE
+    // implement this if SetPalette is ever implemented
+    wxASSERT(oldRef->m_palette == NULL);
+#endif

 
 

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

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