reSWIGged

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

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 8a6ca2ccc71fe4632380ee3121d2ad5351066c17..48300626d3ac25facd0413d21d165fc978888df3 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,19 +7,47 @@
 // 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/defs.h"

 
 #include "wx/bitmap.h"
 
 #include "wx/bitmap.h"

+#include "wx/palette.h"

 #include "wx/icon.h"
 #include "wx/filefn.h"
 #include "wx/image.h"
 #include "wx/icon.h"
 #include "wx/filefn.h"
 #include "wx/image.h"

+#include "wx/dcmemory.h"
+#include "wx/app.h"
+
+#include "wx/rawbmp.h"
+    // need this to get gdk_image_new_bitmap()
+    #define GDK_ENABLE_BROKEN

 
 #include <gdk/gdk.h>
 
 #include <gdk/gdk.h>

-#include <gdk/gdkprivate.h>
+#include <gtk/gtk.h>

 #include <gdk/gdkx.h>
 
 #include <gdk/gdkx.h>
 

+#include <gdk/gdkimage.h>
+
+#include "wx/math.h"
+
+extern void gdk_wx_draw_bitmap     (GdkDrawable  *drawable,
+                          GdkGC               *gc,
+                          GdkDrawable  *src,
+                          gint                xsrc,
+                          gint                ysrc,
+                          gint                xdest,
+                          gint                ydest,
+                          gint                width,
+                          gint                height);
+
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern GtkWidget *wxGetRootWindow();
+

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


@@ -37,11 +65,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 )
 {


@@ -51,12 +81,12 @@ wxMask::wxMask( const wxBitmap& bitmap )
 
 wxMask::~wxMask()
 {
 
 wxMask::~wxMask()
 {

-    if (m_bitmap) 
+    if (m_bitmap)

         gdk_bitmap_unref( m_bitmap );
 }
 
         gdk_bitmap_unref( m_bitmap );
 }
 

-bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap),
-                     const wxColour& WXUNUSED(colour) )
+bool wxMask::Create( const wxBitmap& bitmap,
+                     const wxColour& colour )

 {
     if (m_bitmap)
     {
 {
     if (m_bitmap)
     {


@@ -64,24 +94,103 @@ bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap),
         m_bitmap = (GdkBitmap*) NULL;
     }
 
         m_bitmap = (GdkBitmap*) NULL;
     }
 

-    wxFAIL_MSG( wxT("TODO") );
+    wxImage image = bitmap.ConvertToImage();
+    if (!image.Ok()) return false;

 
 

-    return FALSE;
-}
+    m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, image.GetWidth(), image.GetHeight(), 1 );
+    GdkGC *gc = gdk_gc_new( m_bitmap );

 
 

-bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap),
-                     int WXUNUSED(paletteIndex) )
-{
-    if (m_bitmap)
+    GdkColor color;
+    color.red = 65000;
+    color.green = 65000;
+    color.blue = 65000;
+    color.pixel = 1;
+    gdk_gc_set_foreground( gc, &color );
+    gdk_gc_set_fill( gc, GDK_SOLID );
+    gdk_draw_rectangle( m_bitmap, gc, TRUE, 0, 0, image.GetWidth(), image.GetHeight() );
+
+    unsigned char *data = image.GetData();
+    int index = 0;
+
+    unsigned char red = colour.Red();
+    unsigned char green = colour.Green();
+    unsigned char blue = colour.Blue();
+
+    GdkVisual *visual = wxTheApp->GetGdkVisual();
+
+    int bpp = visual->depth;
+    if ((bpp == 16) && (visual->red_mask != 0xf800))
+        bpp = 15;
+    if (bpp == 15)

     {
     {

-        gdk_bitmap_unref( m_bitmap );
-        m_bitmap = (GdkBitmap*) NULL;
+        red = red & 0xf8;
+        green = green & 0xf8;
+        blue = blue & 0xf8;
+    }
+    else if (bpp == 16)
+    {
+        red = red & 0xf8;
+        green = green & 0xfc;
+        blue = blue & 0xf8;
+    }
+    else if (bpp == 12)
+    {
+        red = red & 0xf0;
+        green = green & 0xf0;
+        blue = blue & 0xf0;

     }
 
     }
 

-    wxFAIL_MSG( wxT("not implemented") );
+    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++)
+    {
+        int start_x = -1;
+        int i;
+        for (i = 0; i < image.GetWidth(); i++)
+        {
+            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;
+        }
+        if (start_x != -1)
+            gdk_draw_line( m_bitmap, gc, start_x, j, i, j );
+    }
+
+    gdk_gc_unref( gc );
+
+    return true;
+}
+
+#if wxUSE_PALETTE
+bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex )
+{
+    unsigned char r,g,b;
+    wxPalette *pal = bitmap.GetPalette();

 
 

-    return FALSE;
+    wxCHECK_MSG( pal, false, wxT("Cannot create mask from bitmap without palette") );
+
+    pal->GetRGB(paletteIndex, &r, &g, &b);
+
+    return Create(bitmap, wxColour(r, g, b));

 }
 }

+#endif // wxUSE_PALETTE

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


@@ -91,21 +200,21 @@ bool wxMask::Create( const wxBitmap& 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.GetBitmap(), false, wxT("Cannot create mask from colour bitmap") );

 
 

-    m_bitmap = gdk_pixmap_new( (GdkWindow*) &gdk_root_parent, 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_draw_bitmap( m_bitmap, gc, bitmap.GetBitmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight() );
+    gdk_wx_draw_bitmap( m_bitmap, gc, bitmap.GetBitmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight() );

 
     gdk_gc_unref( gc );
 
 
     gdk_gc_unref( gc );
 

-    return TRUE;
+    return true;

 }
 
 GdkBitmap *wxMask::GetBitmap() const
 }
 
 GdkBitmap *wxMask::GetBitmap() const


@@ -120,22 +229,24 @@ GdkBitmap *wxMask::GetBitmap() const
 class wxBitmapRefData: public wxObjectRefData
 {
 public:
 class wxBitmapRefData: public wxObjectRefData
 {
 public:

-  wxBitmapRefData();
-  ~wxBitmapRefData();
-
-  GdkPixmap      *m_pixmap;
-  GdkBitmap      *m_bitmap;
-  wxMask         *m_mask;
-  int             m_width;
-  int             m_height;
-  int             m_bpp;
-  wxPalette      *m_palette;
+    wxBitmapRefData();
+    ~wxBitmapRefData();
+
+    GdkPixmap      *m_pixmap;
+    GdkBitmap      *m_bitmap;
+    GdkPixbuf      *m_pixbuf;
+    wxMask         *m_mask;
+    int             m_width;
+    int             m_height;
+    int             m_bpp;
+    wxPalette      *m_palette;

 };
 
 wxBitmapRefData::wxBitmapRefData()
 {
     m_pixmap = (GdkPixmap *) NULL;
     m_bitmap = (GdkBitmap *) 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_mask = (wxMask *) NULL;
     m_width = 0;
     m_height = 0;


@@ -145,10 +256,16 @@ wxBitmapRefData::wxBitmapRefData()
 
 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)
+        gdk_pixmap_unref( m_pixmap );
+    if (m_bitmap)
+        gdk_bitmap_unref( m_bitmap );
+    if (m_pixbuf)
+        gdk_pixbuf_unref( m_pixbuf );
+    delete m_mask;
+#if wxUSE_PALETTE
+    delete m_palette;
+#endif // wxUSE_PALETTE

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -159,18 +276,29 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
 
 wxBitmap::wxBitmap()
 {
 
 wxBitmap::wxBitmap()
 {

-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);

 }
 
 wxBitmap::wxBitmap( int width, int height, int depth )
 {
 }
 
 wxBitmap::wxBitmap( int width, int height, int depth )
 {

-    wxCHECK_RET( (width > 0) && (height > 0), wxT("invalid bitmap size") )
+    Create( width, height, depth );
+}
+
+bool wxBitmap::Create( int width, int height, int depth )
+{
+    UnRef();

 
 

-    GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
-    if (depth == -1) depth = gdk_window_get_visual( parent )->depth;
+    if ( width <= 0 || height <= 0 )
+    {
+        return false;
+    }
+
+    GdkVisual *visual = wxTheApp->GetGdkVisual();

 
 

-    wxCHECK_RET( (depth ==  gdk_window_get_visual( parent )->depth) ||
-                 (depth == 1), wxT("invalid bitmap depth") )
+    if (depth == -1)
+        depth = visual->depth;
+
+    wxCHECK_MSG( (depth == visual->depth) || (depth == 1) || (depth == 32), false,
+                    wxT("invalid bitmap depth") );

 
     m_refData = new wxBitmapRefData();
     M_BMPDATA->m_mask = (wxMask *) NULL;
 
     m_refData = new wxBitmapRefData();
     M_BMPDATA->m_mask = (wxMask *) NULL;


@@ -178,28 +306,39 @@ wxBitmap::wxBitmap( int width, int height, int depth )
     M_BMPDATA->m_height = height;
     if (depth == 1)
     {
     M_BMPDATA->m_height = height;
     if (depth == 1)
     {

-        M_BMPDATA->m_bitmap = gdk_pixmap_new( parent, width, height, 1 );
+        M_BMPDATA->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );

         M_BMPDATA->m_bpp = 1;
     }
         M_BMPDATA->m_bpp = 1;
     }

+    else if (depth == 32)
+    {
+        M_BMPDATA->m_pixbuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB, true,
+                                              8, width, height);
+        M_BMPDATA->m_bpp = 32;
+    }

     else
     {
     else
     {

-        M_BMPDATA->m_pixmap = gdk_pixmap_new( parent, width, height, depth );
-        M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth;
+        M_BMPDATA->m_pixmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, depth );
+        M_BMPDATA->m_bpp = visual->depth;

     }
 
     }
 

-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+    return Ok();

 }
 
 }
 

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

 {
 {

-    wxCHECK_RET( bits != NULL, wxT("invalid bitmap data") )
+    UnRef();
+
+    wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") );
+
+    GdkVisual *visual = wxTheApp->GetGdkVisual();

 
     m_refData = new wxBitmapRefData();
 
     GdkBitmap *mask = (GdkBitmap*) NULL;
 
     m_refData = new wxBitmapRefData();
 
     GdkBitmap *mask = (GdkBitmap*) NULL;

-    GdkWindow *parent = (GdkWindow*) &gdk_root_parent;

 
 

-    M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( parent, &mask, NULL, (gchar **) bits );
+    M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( wxGetRootWindow()->window, &mask, NULL, (gchar **) bits );
+
+    wxCHECK_MSG( M_BMPDATA->m_pixmap, false, wxT("couldn't create pixmap") );

 
     if (mask)
     {
 
     if (mask)
     {


@@ -209,90 +348,849 @@ wxBitmap::wxBitmap( const char **bits )
 
     gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
 
 
     gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
 

-    M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth;  // ?
-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+    M_BMPDATA->m_bpp = visual->depth;  // Can we get a different depth from create_from_xpm_d() ?
+
+    return true;

 }
 
 }
 

-wxBitmap::wxBitmap( char **bits )
+wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, int newx, int newy )

 {
 {

-    wxCHECK_RET( bits != NULL, wxT("invalid bitmap data") )
+    wxCHECK_MSG( Ok(), wxNullBitmap, 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);
+
+    wxBitmap bmp;
+
+    if (HasPixbuf())
+    {
+        bmp.SetWidth(width);
+        bmp.SetHeight(height);
+        bmp.SetDepth(GetDepth());
+        bmp.SetPixbuf(gdk_pixbuf_new(GDK_COLORSPACE_RGB,
+                                     gdk_pixbuf_get_has_alpha(GetPixbuf()),
+                                     8, width, height));
+        gdk_pixbuf_scale(GetPixbuf(), bmp.GetPixbuf(),
+                         0, 0, width, height,
+                         clipx, clipy,
+                         (double)newx/GetWidth(), (double)newy/GetHeight(),
+                         GDK_INTERP_BILINEAR);
+    }
+    else
+    {
+        GdkImage *img = (GdkImage*) NULL;
+        if (GetPixmap())
+            img = gdk_image_get( GetPixmap(), 0, 0, GetWidth(), GetHeight() );
+        else if (GetBitmap())
+            img = gdk_image_get( GetBitmap(), 0, 0, GetWidth(), GetHeight() );
+        else
+            wxFAIL_MSG( wxT("Ill-formed bitmap") );
+
+        wxCHECK_MSG( img, wxNullBitmap, wxT("couldn't create image") );
+
+        int bpp = -1;
+
+
+        GdkGC *gc = NULL;
+        GdkPixmap *dstpix = NULL;
+        if (GetPixmap())
+        {
+            GdkVisual *visual = gdk_window_get_visual( GetPixmap() );
+            if (visual == NULL)
+                visual = wxTheApp->GetGdkVisual();
+
+            bpp = visual->depth;
+            bmp = wxBitmap(width,height,bpp);
+            dstpix = bmp.GetPixmap();
+            gc = gdk_gc_new( dstpix );
+        }
+
+        char *dst = NULL;
+        long dstbyteperline = 0;
+
+        if (GetBitmap())
+        {
+            bpp = 1;
+            dstbyteperline = width/8*M_BMPDATA->m_bpp;
+            if (width*M_BMPDATA->m_bpp % 8 != 0)
+                dstbyteperline++;
+            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;
+        }
+
+        gdk_image_destroy( img );
+        if (gc) gdk_gc_unref( gc );
+
+        if ( dst )
+        {
+            bmp = wxBitmap( (const char *)dst, width, height, 1 );
+            free( dst );
+        }
+
+        if (GetMask())
+        {
+            dstbyteperline = width/8;
+            if (width % 8 != 0)
+                dstbyteperline++;
+            dst = (char*) malloc(dstbyteperline*height);
+            img = gdk_image_get( GetMask()->GetBitmap(), 0, 0, GetWidth(), GetHeight() );
+
+            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 );
+            gdk_image_destroy( img );
+        }
+
+        free( tablex );
+        free( tabley );
+    }
+
+    return bmp;
+}
+
+bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
+{
+    UnRef();
+
+    wxCHECK_MSG( image.Ok(), false, wxT("invalid image") );
+    wxCHECK_MSG( depth == -1 || depth == 1, false, wxT("invalid bitmap depth") );
+
+    if (image.GetWidth() <= 0 || image.GetHeight() <= 0)
+        return false;

 
     m_refData = new wxBitmapRefData();
 
 
     m_refData = new wxBitmapRefData();
 

-    GdkBitmap *mask = (GdkBitmap*) NULL;
-    GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
+    if (depth == 1)
+    {
+        return CreateFromImageAsBitmap(image);
+    }
+    else
+    {
+        if (image.HasAlpha())
+            return CreateFromImageAsPixbuf(image);
+
+        return CreateFromImageAsPixmap(image);
+    }
+}
+
+// conversion to mono bitmap:
+bool wxBitmap::CreateFromImageAsBitmap(const wxImage& img)
+{
+    // convert alpha channel to mask, if it is present:
+    wxImage image(img);
+    image.ConvertAlphaToMask();

 
 

-    M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( parent, &mask, NULL, (gchar **) bits );
+    int width = image.GetWidth();
+    int height = image.GetHeight();

 
 

-    wxCHECK_RET( M_BMPDATA->m_pixmap, wxT("couldn't create pixmap") );
+    SetHeight( height );
+    SetWidth( width );

 
 

-    if (mask)
+    SetBitmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) );
+
+    SetDepth( 1 );
+
+    GdkVisual *visual = wxTheApp->GetGdkVisual();
+
+    // Create picture image
+
+    unsigned char *data_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
+
+    GdkImage *data_image =
+        gdk_image_new_bitmap( visual, data_data, width, height );
+
+    // Create mask image
+
+    GdkImage *mask_image = (GdkImage*) NULL;
+
+    if (image.HasMask())

     {
     {

-        M_BMPDATA->m_mask = new wxMask();
-        M_BMPDATA->m_mask->m_bitmap = mask;
+        unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
+
+        mask_image =  gdk_image_new_bitmap( visual, mask_data, width, height );
+
+        wxMask *mask = new wxMask();
+        mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
+
+        SetMask( mask );

     }
 
     }
 

-    gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
+    int r_mask = image.GetMaskRed();
+    int g_mask = image.GetMaskGreen();
+    int b_mask = image.GetMaskBlue();
+
+    unsigned char* data = image.GetData();
+
+    int index = 0;
+    for (int y = 0; y < height; y++)
+    {
+        for (int x = 0; x < width; x++)
+        {
+            int r = data[index];
+            index++;
+            int g = data[index];
+            index++;
+            int b = data[index];
+            index++;
+
+            if (image.HasMask())
+            {
+                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 );
+            }
+
+            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 );
+
+        } // for
+    }  // for
+
+    // Blit picture
+
+    GdkGC *data_gc = gdk_gc_new( GetBitmap() );
+
+    gdk_draw_image( GetBitmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
+
+    gdk_image_destroy( data_image );
+    gdk_gc_unref( data_gc );
+
+    // Blit mask
+
+    if (image.HasMask())
+    {
+        GdkGC *mask_gc = gdk_gc_new( GetMask()->GetBitmap() );

 
 

-    M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth;  // ?
-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+        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 );
+    }
+
+    return true;

 }
 
 }
 

-wxBitmap::wxBitmap( const wxBitmap& bmp )
+// conversion to colour bitmap:
+bool wxBitmap::CreateFromImageAsPixmap(const wxImage& img)

 {
 {

-    Ref( bmp );
+    // convert alpha channel to mask, if it is present:
+    wxImage image(img);
+    image.ConvertAlphaToMask();
+
+    int width = image.GetWidth();
+    int height = image.GetHeight();
+
+    SetHeight( height );
+    SetWidth( width );
+
+    SetPixmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, -1 ) );
+
+    GdkVisual *visual = wxTheApp->GetGdkVisual();
+
+    int bpp = visual->depth;
+
+    SetDepth( bpp );
+
+    if ((bpp == 16) && (visual->red_mask != 0xf800))
+        bpp = 15;
+    else if (bpp < 8)
+        bpp = 8;
+
+    // We handle 8-bit bitmaps ourselves using the colour cube, 12-bit
+    // visuals are not supported by GDK so we do these ourselves, too.
+    // 15-bit and 16-bit should actually work and 24-bit certainly does.
+#ifdef __sgi
+    if (!image.HasMask() && (bpp > 16))
+#else
+    if (!image.HasMask() && (bpp > 12))
+#endif
+    {
+        static bool s_hasInitialized = false;
+
+        if (!s_hasInitialized)
+        {
+            gdk_rgb_init();
+            s_hasInitialized = true;
+        }
+
+        GdkGC *gc = gdk_gc_new( GetPixmap() );
+
+        gdk_draw_rgb_image( GetPixmap(),
+                            gc,
+                            0, 0,
+                            width, height,
+                            GDK_RGB_DITHER_NONE,
+                            image.GetData(),
+                            width*3 );
+
+        gdk_gc_unref( gc );
+        return true;
+    }
+
+    // Create picture image
+
+    GdkImage *data_image =
+        gdk_image_new( GDK_IMAGE_FASTEST, visual, width, height );

 
 

-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+    // Create mask image
+
+    GdkImage *mask_image = (GdkImage*) NULL;
+
+    if (image.HasMask())
+    {
+        unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
+
+        mask_image =  gdk_image_new_bitmap( visual, mask_data, width, height );
+
+        wxMask *mask = new wxMask();
+        mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
+
+        SetMask( mask );
+    }
+
+    // Render
+
+    enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
+    byte_order b_o = RGB;
+
+    if (bpp > 8)
+    {
+        if ((visual->red_mask > visual->green_mask) && (visual->green_mask > visual->blue_mask))      b_o = RGB;
+        else if ((visual->red_mask > visual->blue_mask) && (visual->blue_mask > visual->green_mask))  b_o = RBG;
+        else if ((visual->blue_mask > visual->red_mask) && (visual->red_mask > visual->green_mask))   b_o = BRG;
+        else if ((visual->blue_mask > visual->green_mask) && (visual->green_mask > visual->red_mask)) b_o = BGR;
+        else if ((visual->green_mask > visual->red_mask) && (visual->red_mask > visual->blue_mask))   b_o = GRB;
+        else if ((visual->green_mask > visual->blue_mask) && (visual->blue_mask > visual->red_mask))  b_o = GBR;
+    }
+
+    int r_mask = image.GetMaskRed();
+    int g_mask = image.GetMaskGreen();
+    int b_mask = image.GetMaskBlue();
+
+    unsigned char* data = image.GetData();
+
+    int index = 0;
+    for (int y = 0; y < height; y++)
+    {
+        for (int x = 0; x < width; x++)
+        {
+            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 12:  // SGI only
+                {
+                    guint32 pixel = 0;
+                    switch (b_o)
+                    {
+                        case RGB: pixel = ((r & 0xf0) << 4) | (g & 0xf0) | ((b & 0xf0) >> 4); break;
+                        case RBG: pixel = ((r & 0xf0) << 4) | (b & 0xf0) | ((g & 0xf0) >> 4); break;
+                        case GRB: pixel = ((g & 0xf0) << 4) | (r & 0xf0) | ((b & 0xf0) >> 4); break;
+                        case GBR: pixel = ((g & 0xf0) << 4) | (b & 0xf0) | ((r & 0xf0) >> 4); break;
+                        case BRG: pixel = ((b & 0xf0) << 4) | (r & 0xf0) | ((g & 0xf0) >> 4); break;
+                        case BGR: pixel = ((b & 0xf0) << 4) | (g & 0xf0) | ((r & 0xf0) >> 4); break;
+                    }
+                    gdk_image_put_pixel( data_image, x, y, pixel );
+                    break;
+                }
+                case 15:
+                {
+                    guint32 pixel = 0;
+                    switch (b_o)
+                    {
+                        case RGB: pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3); break;
+                        case RBG: pixel = ((r & 0xf8) << 7) | ((b & 0xf8) << 2) | ((g & 0xf8) >> 3); break;
+                        case GRB: pixel = ((g & 0xf8) << 7) | ((r & 0xf8) << 2) | ((b & 0xf8) >> 3); break;
+                        case GBR: pixel = ((g & 0xf8) << 7) | ((b & 0xf8) << 2) | ((r & 0xf8) >> 3); break;
+                        case BRG: pixel = ((b & 0xf8) << 7) | ((r & 0xf8) << 2) | ((g & 0xf8) >> 3); break;
+                        case BGR: pixel = ((b & 0xf8) << 7) | ((g & 0xf8) << 2) | ((r & 0xf8) >> 3); break;
+                    }
+                    gdk_image_put_pixel( data_image, x, y, pixel );
+                    break;
+                }
+                case 16:
+                {
+                    // I actually don't know if for 16-bit displays, it is alway the green
+                    // component or the second component which has 6 bits.
+                    guint32 pixel = 0;
+                    switch (b_o)
+                    {
+                        case RGB: pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3); break;
+                        case RBG: pixel = ((r & 0xf8) << 8) | ((b & 0xfc) << 3) | ((g & 0xf8) >> 3); break;
+                        case GRB: pixel = ((g & 0xf8) << 8) | ((r & 0xfc) << 3) | ((b & 0xf8) >> 3); break;
+                        case GBR: pixel = ((g & 0xf8) << 8) | ((b & 0xfc) << 3) | ((r & 0xf8) >> 3); break;
+                        case BRG: pixel = ((b & 0xf8) << 8) | ((r & 0xfc) << 3) | ((g & 0xf8) >> 3); break;
+                        case BGR: pixel = ((b & 0xf8) << 8) | ((g & 0xfc) << 3) | ((r & 0xf8) >> 3); break;
+                    }
+                    gdk_image_put_pixel( data_image, x, y, pixel );
+                    break;
+                }
+                case 32:
+                case 24:
+                {
+                    guint32 pixel = 0;
+                    switch (b_o)
+                    {
+                        case RGB: pixel = (r << 16) | (g << 8) | b; break;
+                        case RBG: pixel = (r << 16) | (b << 8) | g; break;
+                        case BRG: pixel = (b << 16) | (r << 8) | g; break;
+                        case BGR: pixel = (b << 16) | (g << 8) | r; break;
+                        case GRB: pixel = (g << 16) | (r << 8) | b; break;
+                        case GBR: pixel = (g << 16) | (b << 8) | r; break;
+                    }
+                    gdk_image_put_pixel( data_image, x, y, pixel );
+                    break;
+                }
+                default: break;
+            }
+        } // for
+    }  // for
+
+    // Blit picture
+
+    GdkGC *data_gc = gdk_gc_new( GetPixmap() );
+
+    gdk_draw_image( GetPixmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
+
+    gdk_image_destroy( data_image );
+    gdk_gc_unref( data_gc );
+
+    // Blit mask
+
+    if (image.HasMask())
+    {
+        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 );
+    }
+
+    return true;

 }
 
 }
 

-wxBitmap::wxBitmap( const wxString &filename, int type )
+bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)

 {
 {

-    LoadFile( filename, type );
+    int width = image.GetWidth();
+    int height = image.GetHeight();
+
+    GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
+                                       image.HasAlpha(),
+                                       8 /* bits per sample */,
+                                       width, height);
+    if (!pixbuf)
+        return false;
+
+    wxASSERT( image.HasAlpha() ); // for now
+    wxASSERT( gdk_pixbuf_get_n_channels(pixbuf) == 4 );
+    wxASSERT( gdk_pixbuf_get_width(pixbuf) == width );
+    wxASSERT( gdk_pixbuf_get_height(pixbuf) == height );
+
+    M_BMPDATA->m_pixbuf = pixbuf;
+    SetHeight(height);
+    SetWidth(width);
+    SetDepth(wxTheApp->GetGdkVisual()->depth);
+
+    // Copy the data:
+    unsigned char *in = image.GetData();
+    unsigned char *out = gdk_pixbuf_get_pixels(pixbuf);
+    unsigned char *alpha = image.GetAlpha();
+
+    int rowinc = gdk_pixbuf_get_rowstride(pixbuf) - 4 * width;
+
+    for (int y = 0; y < height; y++, out += rowinc)
+    {
+        for (int x = 0; x < width; x++, alpha++, out += 4, in += 3)
+        {
+            out[0] = in[0];
+            out[1] = in[1];
+            out[2] = in[2];
+            out[3] = *alpha;
+        }
+    }

 
 

-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+    return true;

 }
 
 }
 

-wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth))
+wxImage wxBitmap::ConvertToImage() const

 {
 {

-    m_refData = new wxBitmapRefData();
+    wxImage image;

 
 

-    M_BMPDATA->m_mask = (wxMask *) NULL;
-    M_BMPDATA->m_bitmap =
-      gdk_bitmap_create_from_data( (GdkWindow*) &gdk_root_parent, (gchar *) bits, width, height );
-    M_BMPDATA->m_width = width;
-    M_BMPDATA->m_height = height;
-    M_BMPDATA->m_bpp = 1;
+    wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
+
+    image.Create(GetWidth(), GetHeight());
+    unsigned char *data = image.GetData();
+
+    if (!data)
+    {
+        wxFAIL_MSG( wxT("couldn't create image") );
+        return wxNullImage;
+    }
+
+    if (HasPixbuf())
+    {
+        GdkPixbuf *pixbuf = GetPixbuf();
+        wxASSERT( gdk_pixbuf_get_has_alpha(pixbuf) );
+
+        int w = GetWidth();
+        int h = GetHeight();
+
+        image.SetAlpha();
+
+        unsigned char *alpha = image.GetAlpha();
+        unsigned char *in = gdk_pixbuf_get_pixels(pixbuf);
+        unsigned char *out = data;
+        int rowinc = gdk_pixbuf_get_rowstride(pixbuf) - 4 * w;
+
+        for (int y = 0; y < h; y++, in += rowinc)
+        {
+            for (int x = 0; x < w; x++, in += 4, out += 3, alpha++)
+            {
+                out[0] = in[0];
+                out[1] = in[1];
+                out[2] = in[2];
+                *alpha = in[3];
+            }
+        }
+    }
+    else
+    {
+        // the colour used as transparent one in wxImage and the one it is
+        // replaced with when it really occurs in the bitmap
+        static const int MASK_RED = 1;
+        static const int MASK_GREEN = 2;
+        static const int MASK_BLUE = 3;
+        static const int MASK_BLUE_REPLACEMENT = 2;
+
+        GdkImage *gdk_image = (GdkImage*) NULL;
+
+        if (HasPixmap())
+        {
+            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") );
+
+        GdkImage *gdk_image_mask = (GdkImage*) NULL;
+        if (GetMask())
+        {
+            gdk_image_mask = gdk_image_get( GetMask()->GetBitmap(),
+                                            0, 0,
+                                            GetWidth(), GetHeight() );
+
+            image.SetMaskColour( MASK_RED, MASK_GREEN, MASK_BLUE );
+        }

 
 

-    wxCHECK_RET( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") );
+        int bpp = -1;
+        int red_shift_right = 0;
+        int green_shift_right = 0;
+        int blue_shift_right = 0;
+        int red_shift_left = 0;
+        int green_shift_left = 0;
+        int blue_shift_left = 0;
+        bool use_shift = false;
+
+        if (GetPixmap())
+        {
+            GdkVisual *visual = gdk_window_get_visual( GetPixmap() );
+            if (visual == NULL)
+                visual = wxTheApp->GetGdkVisual();
+
+            bpp = visual->depth;
+            if (bpp == 16)
+                bpp = visual->red_prec + visual->green_prec + visual->blue_prec;
+            red_shift_right = visual->red_shift;
+            red_shift_left = 8-visual->red_prec;
+            green_shift_right = visual->green_shift;
+            green_shift_left = 8-visual->green_prec;
+            blue_shift_right = visual->blue_shift;
+            blue_shift_left = 8-visual->blue_prec;
+
+            use_shift = (visual->type == GDK_VISUAL_TRUE_COLOR) || (visual->type == GDK_VISUAL_DIRECT_COLOR);
+        }
+        if (GetBitmap())
+        {
+            bpp = 1;
+        }

 
 

-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+
+        GdkColormap *cmap = gtk_widget_get_default_colormap();
+
+        long pos = 0;
+        for (int j = 0; j < GetHeight(); j++)
+        {
+            for (int i = 0; i < GetWidth(); i++)
+            {
+                wxUint32 pixel = gdk_image_get_pixel( gdk_image, i, j );
+                if (bpp == 1)
+                {
+                    if (pixel == 0)
+                    {
+                        data[pos]   = 0;
+                        data[pos+1] = 0;
+                        data[pos+2] = 0;
+                    }
+                    else
+                    {
+                        data[pos]   = 255;
+                        data[pos+1] = 255;
+                        data[pos+2] = 255;
+                    }
+                }
+                else if (use_shift)
+                {
+                    data[pos] =   (pixel >> red_shift_right)   << red_shift_left;
+                    data[pos+1] = (pixel >> green_shift_right) << green_shift_left;
+                    data[pos+2] = (pixel >> blue_shift_right)  << blue_shift_left;
+                }
+                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)
+                    {
+                        data[pos] = MASK_RED;
+                        data[pos+1] = MASK_GREEN;
+                        data[pos+2] = MASK_BLUE;
+                    }
+                    else if ( data[pos] == MASK_RED &&
+                                data[pos+1] == MASK_GREEN &&
+                                    data[pos+2] == MASK_BLUE )
+                    {
+                        data[pos+2] = MASK_BLUE_REPLACEMENT;
+                    }
+                }
+
+                pos += 3;
+            }
+        }
+
+        gdk_image_destroy( gdk_image );
+        if (gdk_image_mask) gdk_image_destroy( gdk_image_mask );
+    }
+
+    return image;

 }
 
 }
 

-wxBitmap::~wxBitmap()
+wxBitmap::wxBitmap( const wxString &filename, wxBitmapType type )
+{
+    LoadFile( filename, type );
+}
+
+wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth))

 {
 {

-    if (wxTheBitmapList) wxTheBitmapList->DeleteObject(this);
+    if ( width > 0 && height > 0 )
+    {
+        m_refData = new wxBitmapRefData();
+
+        M_BMPDATA->m_mask = (wxMask *) NULL;
+        M_BMPDATA->m_bitmap = gdk_bitmap_create_from_data
+                              (
+                                wxGetRootWindow()->window,
+                                (gchar *) bits,
+                                width,
+                                height
+                              );
+        M_BMPDATA->m_width = width;
+        M_BMPDATA->m_height = height;
+        M_BMPDATA->m_bpp = 1;
+
+        wxASSERT_MSG( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") );
+    }

 }
 
 }
 

-wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp )
+wxBitmap::~wxBitmap()

 {
 {

-    if (*this == bmp) return (*this);
-    Ref( bmp );
-    return *this;

 }
 
 }
 

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

 {
     return m_refData == bmp.m_refData;
 }
 
 {
     return m_refData == bmp.m_refData;
 }
 

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

 {
     return m_refData != bmp.m_refData;
 }
 
 bool wxBitmap::Ok() 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_bitmap || M_BMPDATA->m_pixmap
+           );

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


@@ -332,33 +1230,108 @@ void wxBitmap::SetMask( wxMask *mask )
     M_BMPDATA->m_mask = mask;
 }
 
     M_BMPDATA->m_mask = mask;
 }
 

-bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) )
+bool wxBitmap::CopyFromIcon(const wxIcon& icon)

 {
 {

-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") );
+    *this = icon;
+    return true;
+}
+
+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( rect.width, rect.height, M_BMPDATA->m_bpp );
+    wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
+
+    if (HasPixbuf())
+    {
+        GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
+                                           gdk_pixbuf_get_has_alpha(GetPixbuf()),
+                                           8, rect.width, rect.height);
+        ret.SetPixbuf(pixbuf);
+        gdk_pixbuf_copy_area(GetPixbuf(),
+                             rect.x, rect.y, rect.width, rect.height,
+                             pixbuf, 0, 0);
+    }
+    else
+    {
+        if (ret.GetPixmap())
+        {
+            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 );
+        }
+        else
+        {
+            GdkGC *gc = gdk_gc_new( ret.GetBitmap() );
+            GdkColor col;
+            col.pixel = 0xFFFFFF;
+            gdk_gc_set_foreground( gc, &col );
+            col.pixel = 0;
+            gdk_gc_set_background( gc, &col );
+            gdk_wx_draw_bitmap( ret.GetBitmap(), gc, GetBitmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
+            gdk_gc_destroy( gc );
+        }
+    }
+
+    if (GetMask())
+    {
+        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 );
+        GdkColor col;
+        col.pixel = 0xFFFFFF;
+        gdk_gc_set_foreground( gc, &col );
+        col.pixel = 0;
+        gdk_gc_set_background( gc, &col );
+        gdk_wx_draw_bitmap( mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, rect.x, rect.y, 0, 0, rect.width, rect.height );
+        gdk_gc_destroy( gc );
+
+        ret.SetMask( mask );
+    }
+
+    return ret;
+}
+
+bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalette *WXUNUSED(palette) ) const
+{
+    wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );

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

-        wxImage image( *this );
+        wxImage image = ConvertToImage();

         if (image.Ok()) return image.SaveFile( name, type );
     }
 
         if (image.Ok()) return image.SaveFile( name, type );
     }
 

-    return FALSE;
+    return false;

 }
 
 }
 

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

 {
     UnRef();
 
 {
     UnRef();
 

-    if (!wxFileExists(name)) return FALSE;
+    if (!wxFileExists(name))
+        return false;
+
+    GdkVisual *visual = wxTheApp->GetGdkVisual();

 
     if (type == wxBITMAP_TYPE_XPM)
     {
         m_refData = new wxBitmapRefData();
 
         GdkBitmap *mask = (GdkBitmap*) NULL;
 
     if (type == wxBITMAP_TYPE_XPM)
     {
         m_refData = new wxBitmapRefData();
 
         GdkBitmap *mask = (GdkBitmap*) NULL;

-        GdkWindow *parent = (GdkWindow*) &gdk_root_parent;

 
 

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

 
         if (mask)
         {
 
         if (mask)
         {


@@ -367,64 +1340,271 @@ bool wxBitmap::LoadFile( const wxString &name, int type )
         }
 
         gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
         }
 
         gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );

-        M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth;
+
+        M_BMPDATA->m_bpp = visual->depth;

     }
     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() )
+            return false;
+
+        *this = wxBitmap(image);

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 }
 

+#if wxUSE_PALETTE

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

-    if (!Ok()) return (wxPalette *) NULL;
+    if (!Ok())
+        return (wxPalette *) NULL;

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

+void wxBitmap::SetPalette(const wxPalette& WXUNUSED(palette))
+{
+    // TODO
+}
+#endif // wxUSE_PALETTE
+

 void wxBitmap::SetHeight( int height )
 {
 void wxBitmap::SetHeight( int height )
 {

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

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

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

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

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

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

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

 
     M_BMPDATA->m_pixmap = pixmap;
 
     M_BMPDATA->m_pixmap = pixmap;

+    PurgeOtherRepresentations(Pixmap);
+}
+
+void wxBitmap::SetBitmap( GdkPixmap *bitmap )
+{
+    if (!m_refData)
+        m_refData = new wxBitmapRefData();
+
+    M_BMPDATA->m_bitmap = bitmap;
+    PurgeOtherRepresentations(Pixmap);

 }
 
 GdkPixmap *wxBitmap::GetPixmap() const
 {
     wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, wxT("invalid bitmap") );
 
 }
 
 GdkPixmap *wxBitmap::GetPixmap() const
 {
     wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, wxT("invalid bitmap") );
 

+    // create the pixmap on the fly if we use Pixbuf representation:
+    if (HasPixbuf() && !HasPixmap())
+    {
+        delete M_BMPDATA->m_mask;
+        M_BMPDATA->m_mask = new wxMask();
+        gdk_pixbuf_render_pixmap_and_mask(M_BMPDATA->m_pixbuf,
+                                          &M_BMPDATA->m_pixmap,
+                                          &M_BMPDATA->m_mask->m_bitmap,
+                                          128 /*threshold*/);
+    }
+

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

+bool wxBitmap::HasPixmap() const
+{
+    wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );
+
+    return M_BMPDATA->m_pixmap != NULL;
+}
+

 GdkBitmap *wxBitmap::GetBitmap() const
 {
     wxCHECK_MSG( Ok(), (GdkBitmap *) NULL, wxT("invalid bitmap") );
 
     return M_BMPDATA->m_bitmap;
 }
 GdkBitmap *wxBitmap::GetBitmap() const
 {
     wxCHECK_MSG( Ok(), (GdkBitmap *) NULL, wxT("invalid bitmap") );
 
     return M_BMPDATA->m_bitmap;
 }

+
+GdkPixbuf *wxBitmap::GetPixbuf() const
+{
+    wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );
+
+    if (HasPixmap() && !HasPixbuf())
+    {
+        int width = GetWidth();
+        int height = GetHeight();
+
+        GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
+                                           GetMask() != NULL,
+                                           8, width, height);
+        M_BMPDATA->m_pixbuf =
+            gdk_pixbuf_get_from_drawable(pixbuf, M_BMPDATA->m_pixmap, NULL,
+                                         0, 0, 0, 0, width, height);
+
+        // apply the mask to created pixbuf:
+        if (M_BMPDATA->m_pixbuf && M_BMPDATA->m_mask)
+        {
+            GdkPixbuf *pmask =
+                gdk_pixbuf_get_from_drawable(NULL,
+                                             M_BMPDATA->m_mask->GetBitmap(),
+                                             NULL,
+                                             0, 0, 0, 0, width, height);
+            if (pmask)
+            {
+                guchar *bmp = gdk_pixbuf_get_pixels(pixbuf);
+                guchar *mask = gdk_pixbuf_get_pixels(pmask);
+                int bmprowinc = gdk_pixbuf_get_rowstride(pixbuf) - 4 * width;
+                int maskrowinc = gdk_pixbuf_get_rowstride(pmask) - 3 * width;
+
+                for (int y = 0; y < height;
+                     y++, bmp += bmprowinc, mask += maskrowinc)
+                {
+                    for (int x = 0; x < width; x++, bmp += 4, mask += 3)
+                    {
+                        if (mask[0] == 0 /*black pixel*/)
+                            bmp[3] = 0;
+                    }
+                }
+
+                gdk_pixbuf_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 )
+{
+    if (!m_refData)
+        m_refData = new wxBitmapRefData();
+
+    M_BMPDATA->m_pixbuf = pixbuf;
+    PurgeOtherRepresentations(Pixbuf);
+}
+
+void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep)
+{
+    if (keep == Pixmap && HasPixbuf())
+    {
+        gdk_pixbuf_unref( M_BMPDATA->m_pixbuf );
+        M_BMPDATA->m_pixbuf = NULL;
+    }
+    if (keep == Pixbuf && HasPixmap())
+    {
+        gdk_pixmap_unref( M_BMPDATA->m_pixmap );
+        M_BMPDATA->m_pixmap = NULL;
+    }
+}
+
+void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
+{
+    if (bpp != 32)
+        return NULL;
+
+    GdkPixbuf *pixbuf = GetPixbuf();
+    if (!pixbuf)
+        return NULL;
+
+#if 0
+    if (gdk_pixbuf_get_has_alpha( pixbuf ))
+        wxPrintf( wxT("Has alpha\n") );
+    else
+        wxPrintf( wxT("No alpha.\n") );
+#endif
+
+    data.m_height = gdk_pixbuf_get_height( pixbuf );
+    data.m_width = gdk_pixbuf_get_width( pixbuf );
+    data.m_stride = gdk_pixbuf_get_rowstride( pixbuf );
+
+    return gdk_pixbuf_get_pixels( pixbuf );
+}
+
+void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data))
+{
+}
+
+
+bool wxBitmap::HasAlpha() const
+{
+    return HasPixbuf();
+}
+
+void wxBitmap::UseAlpha()
+{
+    GetPixbuf();
+}
+
+//-----------------------------------------------------------------------------
+// wxBitmapHandler
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler,wxBitmapHandlerBase)
+
+wxBitmapHandler::~wxBitmapHandler()
+{
+}
+
+bool wxBitmapHandler::Create(wxBitmap * WXUNUSED(bitmap),
+                             void * WXUNUSED(data),
+                             long WXUNUSED(type),
+                             int WXUNUSED(width),
+                             int WXUNUSED(height),
+                             int WXUNUSED(depth))
+{
+    wxFAIL_MSG( _T("not implemented") );
+
+    return false;
+}
+
+bool wxBitmapHandler::LoadFile(wxBitmap * WXUNUSED(bitmap),
+                               const wxString& WXUNUSED(name),
+                               long WXUNUSED(flags),
+                               int WXUNUSED(desiredWidth),
+                               int WXUNUSED(desiredHeight))
+{
+    wxFAIL_MSG( _T("not implemented") );
+
+    return false;
+}
+
+bool wxBitmapHandler::SaveFile(const wxBitmap * WXUNUSED(bitmap),
+                               const wxString& WXUNUSED(name),
+                               int WXUNUSED(type),
+                               const wxPalette * WXUNUSED(palette))
+{
+    wxFAIL_MSG( _T("not implemented") );
+
+    return false;
+}
+
+/* static */ void wxBitmap::InitStandardHandlers()
+{
+    // TODO: Insert handler based on GdkPixbufs handler later
+}