use WX_DEFINE_ARRAY_INT for an array of ints (bug 1536482)

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

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 1f62c2a11be98d0aff1282aed4a3abe3aa55ff8d..1e7534bcc2c80ff05b310f6be3e10ee27a15d32f 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -7,37 +7,38 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 
 

-#include "wx/palette.h"

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

-#include "wx/icon.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/dcmemory.h"
+    #include "wx/palette.h"
+    #include "wx/icon.h"
+    #include "wx/math.h"
+    #include "wx/image.h"
+#endif // WX_PRECOMP
+

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

-#include "wx/image.h"
-#include "wx/dcmemory.h"
-#include "wx/app.h"

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

-#if (GTK_MINOR_VERSION > 0)

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

-#endif

 
 

-extern void gdk_wx_draw_bitmap     (GdkDrawable  *drawable,
-                          GdkGC               *gc,
-                          GdkDrawable  *src,
-                          gint                xsrc,
-                          gint                ysrc,
-                          gint                xdest,
-                          gint                ydest,
-                          gint                width,
-                          gint                height);
+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
 
 //-----------------------------------------------------------------------------
 // data


@@ -62,11 +63,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 )
 {


@@ -89,8 +92,8 @@ bool wxMask::Create( const wxBitmap& bitmap,
         m_bitmap = (GdkBitmap*) NULL;
     }
 
         m_bitmap = (GdkBitmap*) NULL;
     }
 

-    wxImage image( bitmap );
-    if (!image.Ok()) return FALSE;
+    wxImage image = bitmap.ConvertToImage();
+    if (!image.Ok()) return false;

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


@@ -111,23 +114,29 @@ bool wxMask::Create( const wxBitmap& bitmap,
     unsigned char green = colour.Green();
     unsigned char blue = colour.Blue();
 
     unsigned char green = colour.Green();
     unsigned char blue = colour.Blue();
 

-    GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
-    wxASSERT( visual );
+    GdkVisual *visual = wxTheApp->GetGdkVisual();

 
     int bpp = visual->depth;
 
     int bpp = visual->depth;

-    if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
+    if ((bpp == 16) && (visual->red_mask != 0xf800))
+        bpp = 15;

     if (bpp == 15)
     {
         red = red & 0xf8;
         green = green & 0xf8;
         blue = blue & 0xf8;
     }
     if (bpp == 15)
     {
         red = red & 0xf8;
         green = green & 0xf8;
         blue = blue & 0xf8;
     }

-    if (bpp == 16)
+    else if (bpp == 16)

     {
         red = red & 0xf8;
         green = green & 0xfc;
         blue = blue & 0xf8;
     }
     {
         red = red & 0xf8;
         green = green & 0xfc;
         blue = blue & 0xf8;
     }

+    else if (bpp == 12)
+    {
+        red = red & 0xf0;
+        green = green & 0xf0;
+        blue = blue & 0xf0;
+    }

 
     color.red = 0;
     color.green = 0;
 
     color.red = 0;
     color.green = 0;


@@ -164,20 +173,22 @@ bool wxMask::Create( const wxBitmap& bitmap,
 
     gdk_gc_unref( gc );
 
 
     gdk_gc_unref( gc );
 

-    return TRUE;
+    return true;

 }
 
 }
 

+#if wxUSE_PALETTE

 bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex )
 {
     unsigned char r,g,b;
     wxPalette *pal = bitmap.GetPalette();
 
 bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex )
 {
     unsigned char r,g,b;
     wxPalette *pal = bitmap.GetPalette();
 

-    wxCHECK_MSG( pal, FALSE, wxT("Cannot create mask from bitmap without palette") );
+    wxCHECK_MSG( pal, false, wxT("Cannot create mask from bitmap without palette") );

 
     pal->GetRGB(paletteIndex, &r, &g, &b);
 
     return Create(bitmap, wxColour(r, g, b));
 }
 
     pal->GetRGB(paletteIndex, &r, &g, &b);
 
     return Create(bitmap, wxColour(r, g, b));
 }

+#endif // wxUSE_PALETTE

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


@@ -187,13 +198,13 @@ 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( wxGetRootWindow()->window, bitmap.GetWidth(), bitmap.GetHeight(), 1 );
 
 
     m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, bitmap.GetWidth(), bitmap.GetHeight(), 1 );
 

-    if (!m_bitmap) return FALSE;
+    if (!m_bitmap) return false;

 
     GdkGC *gc = gdk_gc_new( m_bitmap );
 
 
     GdkGC *gc = gdk_gc_new( m_bitmap );
 


@@ -201,7 +212,7 @@ bool wxMask::Create( const wxBitmap& bitmap )
 
     gdk_gc_unref( gc );
 
 
     gdk_gc_unref( gc );
 

-    return TRUE;
+    return true;

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


@@ -217,7 +228,7 @@ class wxBitmapRefData: public wxObjectRefData
 {
 public:
     wxBitmapRefData();
 {
 public:
     wxBitmapRefData();

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

 
     GdkPixmap      *m_pixmap;
     GdkBitmap      *m_bitmap;
 
     GdkPixmap      *m_pixmap;
     GdkBitmap      *m_bitmap;


@@ -241,10 +252,14 @@ 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 );
+    delete m_mask;
+#if wxUSE_PALETTE
+    delete m_palette;
+#endif // wxUSE_PALETTE

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


@@ -266,15 +281,18 @@ bool wxBitmap::Create( int width, int height, int depth )
 {
     UnRef();
 
 {
     UnRef();
 

-    wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") )
+    if ( width <= 0 || height <= 0 )
+    {
+        return false;
+    }

 
 

-    GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
-    wxASSERT( visual );
+    GdkVisual *visual = wxTheApp->GetGdkVisual();

 
 

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

 
 

-    wxCHECK_MSG( (depth == visual->depth) ||
-                 (depth == 1), FALSE, wxT("invalid bitmap depth") )
+    wxCHECK_MSG( (depth == visual->depth) || (depth == 1) || (depth == 32), false,
+                    wxT("invalid bitmap depth") );

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


@@ -294,12 +312,11 @@ bool wxBitmap::Create( int width, int height, int depth )
     return Ok();
 }
 
     return Ok();
 }
 

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

 {
 {

-    wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") )
+    wxCHECK2_MSG(bits != NULL, return, wxT("invalid bitmap data"));

 
 

-    GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
-    wxASSERT( visual );
+    GdkVisual *visual = wxTheApp->GetGdkVisual();

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


@@ -307,7 +324,7 @@ bool wxBitmap::CreateFromXpm( const char **bits )
 
     M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( wxGetRootWindow()->window, &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") );
+    wxCHECK2_MSG(M_BMPDATA->m_pixmap, return, wxT("couldn't create pixmap"));

 
     if (mask)
     {
 
     if (mask)
     {


@@ -317,314 +334,552 @@ bool wxBitmap::CreateFromXpm( 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 = visual->depth;  // ?
-
-    return TRUE;
+    M_BMPDATA->m_bpp = visual->depth;  // Can we get a different depth from create_from_xpm_d() ?

 }
 
 }
 

-bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
+wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, int newx, int newy )

 {
 {

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

 
 

-    m_refData = new wxBitmapRefData();
+    if (newy==M_BMPDATA->m_width && newy==M_BMPDATA->m_height)
+        return *this;

 
 

-    // ------
-    // convertion to mono bitmap:
-    // ------
-    if (depth == 1)
-    {
-        int width = image.GetWidth();
-        int height = image.GetHeight();
+    int width = wxMax(newx, 1);
+    int height = wxMax(newy, 1);
+    width = wxMin(width, clipwidth);
+    height = wxMin(height, clipheight);

 
 

-        SetHeight( height );
-        SetWidth( width );
+    wxBitmap bmp;

 
 

-        SetBitmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) );
+    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") );

 
 

-        SetDepth( 1 );
+    wxCHECK_MSG( img, wxNullBitmap, wxT("couldn't create image") );

 
 

-        GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
-        wxASSERT( visual );
+    int bpp = -1;

 
 

-        // Create picture image

 
 

-        unsigned char *data_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
+    GdkGC *gc = NULL;
+    GdkPixmap *dstpix = NULL;
+    if (GetPixmap())
+    {
+        GdkVisual *visual = gdk_window_get_visual( GetPixmap() );
+        if (visual == NULL)
+            visual = wxTheApp->GetGdkVisual();

 
 

-        GdkImage *data_image =
-            gdk_image_new_bitmap( visual, data_data, width, height );
+        bpp = visual->depth;
+        bmp = wxBitmap(width,height,bpp);
+        dstpix = bmp.GetPixmap();
+        gc = gdk_gc_new( dstpix );
+    }

 
 

-        // Create mask image
+    char *dst = NULL;
+    long dstbyteperline = 0;

 
 

-        GdkImage *mask_image = (GdkImage*) NULL;
+    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);
+    }

 
 

-        if (image.HasMask())
-        {
-            unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * 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;

 
 

-            mask_image =  gdk_image_new_bitmap( visual, mask_data, width, height );
+        for (int w = 0; w < width; w++)
+        {
+            guint32 pixval;
+            int x = tablex[w];
+            if (x == old_x)
+                pixval = old_pixval;
+            else
+            {
+                pixval = gdk_image_get_pixel( img, x, tabley[h] );
+                old_pixval = pixval;
+                old_x = x;
+            }

 
 

-            wxMask *mask = new wxMask();
-            mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
+            if (bpp == 1)
+            {
+                if (!pixval)
+                {
+                    char bit=1;
+                    char shift = bit << (w % 8);
+                    outbyte |= shift;
+                }

 
 

-            SetMask( mask );
+                if ((w+1)%8==0)
+                {
+                    dst[h*dstbyteperline+w/8] = outbyte;
+                    outbyte = 0;
+                }
+            }
+            else
+            {
+                GdkColor col;
+                col.pixel = pixval;
+                gdk_gc_set_foreground( gc, &col );
+                gdk_draw_point( dstpix, gc, w, h);
+            }

         }
 
         }
 

-        int r_mask = image.GetMaskRed();
-        int g_mask = image.GetMaskGreen();
-        int b_mask = image.GetMaskBlue();
+        // do not forget the last byte
+        if ((bpp == 1) && (width % 8 != 0))
+            dst[h*dstbyteperline+width/8] = outbyte;
+    }
+
+    gdk_image_destroy( img );
+    if (gc) gdk_gc_unref( gc );
+
+    if (bpp == 1)
+    {
+        bmp = wxBitmap( (const char *)dst, width, height, 1 );
+        free( dst );
+    }

 
 

-        unsigned char* data = image.GetData();
+    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() );

 
 

-        int index = 0;
-        for (int y = 0; y < height; y++)
+        for (int h = 0; h < height; h++)

         {
         {

-            for (int x = 0; x < width; x++)
+            char outbyte = 0;
+            int old_x = -1;
+            guint32 old_pixval = 0;
+
+            for (int w = 0; w < width; w++)

             {
             {

-                int r = data[index];
-                index++;
-                int g = data[index];
-                index++;
-                int b = data[index];
-                index++;
-
-                if (image.HasMask())
+                guint32 pixval;
+                int x = tablex[w];
+                if (x == old_x)
+                    pixval = old_pixval;
+                else

                 {
                 {

-                    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 );
+                    pixval = gdk_image_get_pixel( img, x, tabley[h] );
+                    old_pixval = pixval;
+                    old_x = x;

                 }
 
                 }
 

-                if ((r == 255) && (b == 255) && (g == 255))
-                    gdk_image_put_pixel( data_image, x, y, 1 );
-                else
-                    gdk_image_put_pixel( data_image, x, y, 0 );
+                if (pixval)
+                {
+                    char bit=1;
+                    char shift = bit << (w % 8);
+                    outbyte |= shift;
+                }

 
 

-            } // for
-        }  // for
+                if ((w+1)%8 == 0)
+                {
+                    dst[h*dstbyteperline+w/8] = outbyte;
+                    outbyte = 0;
+                }
+            }

 
 

-        // Blit picture
+            // 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);

 
 

-        GdkGC *data_gc = gdk_gc_new( GetBitmap() );
+        free( dst );
+        gdk_image_destroy( img );
+    }

 
 

-        gdk_draw_image( GetBitmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
+    free( tablex );
+    free( tabley );

 
 

-        gdk_image_destroy( data_image );
-        gdk_gc_unref( data_gc );
+    return bmp;
+}

 
 

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

 
 

-        if (image.HasMask())
-        {
-            GdkGC *mask_gc = gdk_gc_new( GetMask()->GetBitmap() );
+    wxCHECK_MSG( image.Ok(), false, wxT("invalid image") );
+    wxCHECK_MSG( depth == -1 || depth == 1, false, wxT("invalid bitmap depth") );

 
 

-            gdk_draw_image( GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
+    if (image.GetWidth() <= 0 || image.GetHeight() <= 0)
+        return false;

 
 

-            gdk_image_destroy( mask_image );
-            gdk_gc_unref( mask_gc );
-        }
-    }
+    m_refData = new wxBitmapRefData();

 
 

-    // ------
-    // convertion to colour bitmap:
-    // ------
+    if (depth == 1)
+    {
+        return CreateFromImageAsBitmap(image);
+    }

     else
     {
     else
     {

-        int width = image.GetWidth();
-        int height = image.GetHeight();
+        return CreateFromImageAsPixmap(image);
+    }
+}

 
 

-        SetHeight( height );
-        SetWidth( width );
+// conversion to mono bitmap:
+bool wxBitmap::CreateFromImageAsBitmap(const wxImage& img)
+{
+    // convert alpha channel to mask, if it is present:
+    wxImage image(img);
+    image.ConvertAlphaToMask();

 
 

-        SetPixmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, -1 ) );
+    int width = image.GetWidth();
+    int height = image.GetHeight();

 
 

-        // Retrieve depth
+    SetHeight( height );
+    SetWidth( width );

 
 

-        GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
-        wxASSERT( visual );
+    SetBitmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) );

 
 

-        int bpp = visual->depth;
+    SetDepth( 1 );

 
 

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

 
 

-        if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
-        if (bpp < 8) bpp = 8;
+    // Create picture image

 
 

-#if (GTK_MINOR_VERSION > 0)
+    unsigned char *data_data = (unsigned char*)malloc( ((width >> 3)+8) * height );

 
 

-        if (!image.HasMask() && (bpp > 8))
-        {
-            static bool s_hasInitialized = FALSE;
+    GdkImage *data_image =
+        gdk_image_new_bitmap( visual, data_data, width, height );
+
+    // Create mask image

 
 

-            if (!s_hasInitialized)
+    GdkImage *mask_image = (GdkImage*) NULL;
+
+    if (image.HasMask())
+    {
+        unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
+
+        mask_image =  gdk_image_new_bitmap( visual, mask_data, width, height );
+
+        wxMask *mask = new wxMask();
+        mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
+
+        SetMask( mask );
+    }
+
+    int r_mask = image.GetMaskRed();
+    int g_mask = image.GetMaskGreen();
+    int b_mask = image.GetMaskBlue();
+
+    unsigned char* data = image.GetData();
+
+    int index = 0;
+    for (int y = 0; y < height; y++)
+    {
+        for (int x = 0; x < width; x++)
+        {
+            int r = data[index];
+            index++;
+            int g = data[index];
+            index++;
+            int b = data[index];
+            index++;
+
+            if (image.HasMask())

             {
             {

-                gdk_rgb_init();
-                s_hasInitialized = TRUE;
+                if ((r == r_mask) && (b == b_mask) && (g == g_mask))
+                    gdk_image_put_pixel( mask_image, x, y, 1 );
+                else
+                    gdk_image_put_pixel( mask_image, x, y, 0 );

             }
 
             }
 

-            GdkGC *gc = gdk_gc_new( GetPixmap() );
+            if ((r == 255) && (b == 255) && (g == 255))
+                gdk_image_put_pixel( data_image, x, y, 1 );
+            else
+                gdk_image_put_pixel( data_image, x, y, 0 );

 
 

-            gdk_draw_rgb_image( GetPixmap(),
-                                gc,
-                                0, 0,
-                                width, height,
-                                GDK_RGB_DITHER_NONE,
-                                image.GetData(),
-                                width*3 );
+        } // for
+    }  // for

 
 

-            gdk_gc_unref( gc );
-            return TRUE;
-        }
+    // Blit picture

 
 

-#endif
+    GdkGC *data_gc = gdk_gc_new( GetBitmap() );
+
+    gdk_draw_image( GetBitmap(), data_gc, data_image, 0, 0, 0, 0, width, height );

 
 

-        // Create picture image
+    gdk_image_destroy( data_image );
+    gdk_gc_unref( data_gc );

 
 

-        GdkImage *data_image =
-            gdk_image_new( GDK_IMAGE_FASTEST, visual, width, height );
+    // Blit mask

 
 

-        // Create mask image
+    if (image.HasMask())
+    {
+        GdkGC *mask_gc = gdk_gc_new( GetMask()->GetBitmap() );

 
 

-        GdkImage *mask_image = (GdkImage*) NULL;
+        gdk_draw_image( GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );

 
 

-        if (image.HasMask())
-        {
-            unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
+        gdk_image_destroy( mask_image );
+        gdk_gc_unref( mask_gc );
+    }

 
 

-            mask_image =  gdk_image_new_bitmap( visual, mask_data, width, height );
+    return true;
+}

 
 

-            wxMask *mask = new wxMask();
-            mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
+// conversion to colour bitmap:
+bool wxBitmap::CreateFromImageAsPixmap(const wxImage& img)
+{
+    // convert alpha channel to mask, if it is present:
+    wxImage image(img);
+    image.ConvertAlphaToMask();

 
 

-            SetMask( mask );
-        }
+    int width = image.GetWidth();
+    int height = image.GetHeight();

 
 

-        // Render
+    SetHeight( height );
+    SetWidth( width );

 
 

-        enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
-        byte_order b_o = RGB;
+    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 (bpp >= 24)
+        if (!s_hasInitialized)

         {
         {

-            if ((visual->red_mask > visual->green_mask) && (visual->green_mask > visual->blue_mask))      b_o = RGB;
-            else if ((visual->red_mask > visual->blue_mask) && (visual->blue_mask > visual->green_mask))  b_o = RGB;
-            else if ((visual->blue_mask > visual->red_mask) && (visual->red_mask > visual->green_mask))   b_o = BRG;
-            else if ((visual->blue_mask > visual->green_mask) && (visual->green_mask > visual->red_mask)) b_o = BGR;
-            else if ((visual->green_mask > visual->red_mask) && (visual->red_mask > visual->blue_mask))   b_o = GRB;
-            else if ((visual->green_mask > visual->blue_mask) && (visual->blue_mask > visual->red_mask))  b_o = GBR;
+            gdk_rgb_init();
+            s_hasInitialized = true;

         }
 
         }
 

-        int r_mask = image.GetMaskRed();
-        int g_mask = image.GetMaskGreen();
-        int b_mask = image.GetMaskBlue();
+        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 );
+
+    // 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

 
 

-        unsigned char* data = image.GetData();
+    enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
+    byte_order b_o = RGB;

 
 

-        int index = 0;
-        for (int y = 0; y < height; y++)
+    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++)

         {
         {

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

             {
             {

-                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 == 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)
-                {
+            switch (bpp)
+            {

                 case 8:
                 case 8:

+                {
+                    int pixel = -1;
+                    if (wxTheApp->m_colorCube)

                     {
                     {

-                        int pixel = -1;
-                        if (wxTheApp->m_colorCube)
-                        {
-                            pixel = wxTheApp->m_colorCube[ ((r & 0xf8) << 7) + ((g & 0xf8) << 2) + ((b & 0xf8) >> 3) ];
-                        }
-                        else
+                        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++)

                         {
                         {

-                            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; }
-                            }
+                            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 );
+                    gdk_image_put_pixel( data_image, x, y, pixel );

 
 

-                        break;
+                    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:
                 case 15:

+                {
+                    guint32 pixel = 0;
+                    switch (b_o)

                     {
                     {

-                        guint32 pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
-                        gdk_image_put_pixel( data_image, x, y, pixel );
-                        break;
+                        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:
                 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)

                     {
                     {

-                        guint32 pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3);
-                        gdk_image_put_pixel( data_image, x, y, pixel );
-                        break;
+                        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:
                 case 32:
                 case 24:

+                {
+                    guint32 pixel = 0;
+                    switch (b_o)

                     {
                     {

-                        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;
                         case RGB: pixel = (r << 16) | (g << 8) | b; break;
                         case RBG: pixel = (r << 16) | (b << 8) | g; break;
                         case BRG: pixel = (b << 16) | (r << 8) | g; break;
                         case BGR: pixel = (b << 16) | (g << 8) | r; break;
                         case GRB: pixel = (g << 16) | (r << 8) | b; break;
                         case GBR: pixel = (g << 16) | (b << 8) | r; break;

-                        }
-                        gdk_image_put_pixel( data_image, x, y, pixel );

                     }
                     }

-                default: break;
+                    gdk_image_put_pixel( data_image, x, y, pixel );
+                    break;

                 }
                 }

-            } // for
-        }  // for
+                default: break;
+            }
+        } // for
+    }  // for

 
 

-        // Blit picture
+    // Blit picture

 
 

-        GdkGC *data_gc = gdk_gc_new( GetPixmap() );
+    GdkGC *data_gc = gdk_gc_new( GetPixmap() );

 
 

-        gdk_draw_image( GetPixmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
+    gdk_draw_image( GetPixmap(), data_gc, data_image, 0, 0, 0, 0, width, height );

 
 

-        gdk_image_destroy( data_image );
-        gdk_gc_unref( data_gc );
+    gdk_image_destroy( data_image );
+    gdk_gc_unref( data_gc );

 
 

-        // Blit mask
+    // Blit mask

 
 

-        if (image.HasMask())
-        {
-            GdkGC *mask_gc = gdk_gc_new( GetMask()->GetBitmap() );
+    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_draw_image( GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );

 
 

-            gdk_image_destroy( mask_image );
-            gdk_gc_unref( mask_gc );
-        }
+        gdk_image_destroy( mask_image );
+        gdk_gc_unref( mask_gc );

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 wxImage wxBitmap::ConvertToImage() const
 }
 
 wxImage wxBitmap::ConvertToImage() const


@@ -633,43 +888,51 @@ wxImage wxBitmap::ConvertToImage() const
 
     wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
 
 
     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;
+    }
+
+    // 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;
     GdkImage *gdk_image = (GdkImage*) NULL;

-    if (GetPixmap())
+
+    if (HasPixmap())

     {
         gdk_image = gdk_image_get( GetPixmap(),
     {
         gdk_image = gdk_image_get( GetPixmap(),

-            0, 0,
-            GetWidth(), GetHeight() );
-    } else
-    if (GetBitmap())
+                                    0, 0,
+                                    GetWidth(), GetHeight() );
+    }
+    else if (GetBitmap())

     {
         gdk_image = gdk_image_get( GetBitmap(),
     {
         gdk_image = gdk_image_get( GetBitmap(),

-            0, 0,
-            GetWidth(), GetHeight() );
-    } else
+                                    0, 0,
+                                    GetWidth(), GetHeight() );
+    }
+    else

     {
         wxFAIL_MSG( wxT("Ill-formed bitmap") );
     }
 
     wxCHECK_MSG( gdk_image, wxNullImage, wxT("couldn't create image") );
 
     {
         wxFAIL_MSG( wxT("Ill-formed bitmap") );
     }
 
     wxCHECK_MSG( gdk_image, wxNullImage, wxT("couldn't create image") );
 

-    image.Create( GetWidth(), GetHeight() );
-    char unsigned *data = image.GetData();
-
-    if (!data)
-    {
-        gdk_image_destroy( gdk_image );
-        wxFAIL_MSG( wxT("couldn't create image") );
-        return wxNullImage;
-    }
-

     GdkImage *gdk_image_mask = (GdkImage*) NULL;
     if (GetMask())
     {
         gdk_image_mask = gdk_image_get( GetMask()->GetBitmap(),
     GdkImage *gdk_image_mask = (GdkImage*) NULL;
     if (GetMask())
     {
         gdk_image_mask = gdk_image_get( GetMask()->GetBitmap(),

-            0, 0,
-            GetWidth(), GetHeight() );
+                                        0, 0,
+                                        GetWidth(), GetHeight() );

 
 

-        image.SetMaskColour( 16, 16, 16 );  // anything unlikely and dividable
+        image.SetMaskColour( MASK_RED, MASK_GREEN, MASK_BLUE );

     }
 
     int bpp = -1;
     }
 
     int bpp = -1;


@@ -679,15 +942,17 @@ wxImage wxBitmap::ConvertToImage() const
     int red_shift_left = 0;
     int green_shift_left = 0;
     int blue_shift_left = 0;
     int red_shift_left = 0;
     int green_shift_left = 0;
     int blue_shift_left = 0;

-    bool use_shift = FALSE;
+    bool use_shift = false;

 
     if (GetPixmap())
     {
         GdkVisual *visual = gdk_window_get_visual( GetPixmap() );
 
     if (GetPixmap())
     {
         GdkVisual *visual = gdk_window_get_visual( GetPixmap() );

+        if (visual == NULL)
+            visual = wxTheApp->GetGdkVisual();

 
 

-        if (visual == NULL) visual = gdk_window_get_visual( wxGetRootWindow()->window );

         bpp = visual->depth;
         bpp = visual->depth;

-        if (bpp == 16) bpp = visual->red_prec + visual->green_prec + visual->blue_prec;
+        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;
         red_shift_right = visual->red_shift;
         red_shift_left = 8-visual->red_prec;
         green_shift_right = visual->green_shift;


@@ -711,27 +976,27 @@ wxImage wxBitmap::ConvertToImage() const
         for (int i = 0; i < GetWidth(); i++)
         {
             wxUint32 pixel = gdk_image_get_pixel( gdk_image, i, j );
         for (int i = 0; i < GetWidth(); i++)
         {
             wxUint32 pixel = gdk_image_get_pixel( gdk_image, i, j );

-                if (bpp == 1)
+            if (bpp == 1)
+            {
+                if (pixel == 0)

                 {
                 {

-                    if (pixel == 0)
-                        {

                     data[pos]   = 0;
                     data[pos+1] = 0;
                     data[pos+2] = 0;
                     data[pos]   = 0;
                     data[pos+1] = 0;
                     data[pos+2] = 0;

-                        }
-                        else
-                        {
+                }
+                else
+                {

                     data[pos]   = 255;
                     data[pos+1] = 255;
                     data[pos+2] = 255;
                     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 (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;
             else if (cmap->colors)
             {
                 data[pos] =   cmap->colors[pixel].red   >> 8;


@@ -748,9 +1013,15 @@ wxImage wxBitmap::ConvertToImage() const
                 int mask_pixel = gdk_image_get_pixel( gdk_image_mask, i, j );
                 if (mask_pixel == 0)
                 {
                 int mask_pixel = gdk_image_get_pixel( gdk_image_mask, i, j );
                 if (mask_pixel == 0)
                 {

-                    data[pos] = 16;
-                    data[pos+1] = 16;
-                    data[pos+2] = 16;
+                    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;

                 }
             }
 
                 }
             }
 


@@ -764,42 +1035,37 @@ wxImage wxBitmap::ConvertToImage() const
     return image;
 }
 
     return image;
 }
 

-wxBitmap::wxBitmap( const wxBitmap& bmp )
-{
-    Ref( bmp );
-}
-
-wxBitmap::wxBitmap( const wxString &filename, int type )
+wxBitmap::wxBitmap( const wxString &filename, wxBitmapType type )

 {
     LoadFile( filename, type );
 }
 
 wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth))
 {
 {
     LoadFile( filename, type );
 }
 
 wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth))
 {

-    m_refData = new wxBitmapRefData();
+    if ( width > 0 && height > 0 )
+    {
+        m_refData = new wxBitmapRefData();

 
 

-    M_BMPDATA->m_mask = (wxMask *) NULL;
-    M_BMPDATA->m_bitmap =
-      gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) bits, width, height );
-    M_BMPDATA->m_width = width;
-    M_BMPDATA->m_height = height;
-    M_BMPDATA->m_bpp = 1;
+        M_BMPDATA->m_mask = (wxMask *) NULL;
+        M_BMPDATA->m_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;

 
 

-    wxCHECK_RET( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") );
+        wxASSERT_MSG( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") );
+    }

 }
 
 wxBitmap::~wxBitmap()
 {
 }
 
 }
 
 wxBitmap::~wxBitmap()
 {
 }
 

-wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp )
-{
-    if ( m_refData != bmp.m_refData )
-        Ref( bmp );
-
-    return *this;
-}
-

 bool wxBitmap::operator == ( const wxBitmap& bmp ) const
 {
     return m_refData == bmp.m_refData;
 bool wxBitmap::operator == ( const wxBitmap& bmp ) const
 {
     return m_refData == bmp.m_refData;


@@ -810,9 +1076,10 @@ bool wxBitmap::operator != ( const wxBitmap& bmp ) const
     return m_refData != bmp.m_refData;
 }
 
     return m_refData != bmp.m_refData;
 }
 

-bool wxBitmap::Ok() const
+bool wxBitmap::IsOk() const

 {
 {

-    return (m_refData != NULL);
+    return (m_refData != NULL) &&
+           (M_BMPDATA->m_bitmap || M_BMPDATA->m_pixmap);

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


@@ -855,7 +1122,7 @@ void wxBitmap::SetMask( wxMask *mask )
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
     *this = icon;
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
     *this = icon;

-    return TRUE;
+    return true;

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


@@ -877,6 +1144,11 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
     else
     {
         GdkGC *gc = gdk_gc_new( ret.GetBitmap() );
     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 );
     }
         gdk_wx_draw_bitmap( ret.GetBitmap(), gc, GetBitmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
         gdk_gc_destroy( gc );
     }


@@ -887,7 +1159,12 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
         mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, rect.width, rect.height, 1 );
 
         GdkGC *gc = gdk_gc_new( mask->m_bitmap );
         mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, rect.width, rect.height, 1 );
 
         GdkGC *gc = gdk_gc_new( mask->m_bitmap );

-        gdk_wx_draw_bitmap( mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, 0, 0, rect.x, rect.y, rect.width, rect.height );
+        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 );
         gdk_gc_destroy( gc );
 
         ret.SetMask( mask );


@@ -896,27 +1173,27 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
     return ret;
 }
 
     return ret;
 }
 

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

 {
 {

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

 
     // 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 = gdk_window_get_visual( wxGetRootWindow()->window );
-    wxASSERT( visual );
+    GdkVisual *visual = wxTheApp->GetGdkVisual();

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


@@ -924,7 +1201,13 @@ bool wxBitmap::LoadFile( const wxString &name, int type )
 
         GdkBitmap *mask = (GdkBitmap*) NULL;
 
 
         GdkBitmap *mask = (GdkBitmap*) NULL;
 

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

 
         if (mask)
         {
 
         if (mask)
         {


@@ -939,52 +1222,66 @@ bool wxBitmap::LoadFile( const wxString &name, int type )
     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;
 }
 
 void wxBitmap::SetBitmap( GdkPixmap *bitmap )
 {
 
     M_BMPDATA->m_pixmap = pixmap;
 }
 
 void wxBitmap::SetBitmap( GdkPixmap *bitmap )
 {

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

 
     M_BMPDATA->m_bitmap = bitmap;
 }
 
     M_BMPDATA->m_bitmap = bitmap;
 }


@@ -996,9 +1293,45 @@ GdkPixmap *wxBitmap::GetPixmap() const
     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;
 }

+
+void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
+{
+    return NULL;
+}
+
+void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data))
+{
+}
+
+bool wxBitmap::HasAlpha() const
+{
+    return false;
+}
+
+void wxBitmap::UseAlpha()
+{
+}
+
+//-----------------------------------------------------------------------------
+// wxBitmapHandler
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase)
+
+/* static */ void wxBitmap::InitStandardHandlers()
+{
+    // TODO: Insert handler based on GdkPixbufs handler later
+}