[ 1508778 ] Fix for wxOwnerDrawnComboBox list selection rendering.

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

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 90d40cefbf9d4791238eec3d5dc1e4cfac7a2d6c..e420d57b51fb7ce56e63e2f69268d6d4ad8be887 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,39 +7,31 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "bitmap.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // 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"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/dcmemory.h"
+    #include "wx/palette.h"
+    #include "wx/icon.h"
+    #include "wx/math.h"
+#endif
+

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

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

 
 

-#ifdef __WXGTK20__
+#include "wx/rawbmp.h"

     // need this to get gdk_image_new_bitmap()
     #define GDK_ENABLE_BROKEN
     // need this to get gdk_image_new_bitmap()
     #define GDK_ENABLE_BROKEN

-#endif

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

-#ifdef __WXGTK20__
-    #include <gdk/gdkimage.h>
-#else // GTK+ 1.2
-    #include <gdk/gdkrgb.h>
-#endif // GTK+ 2.0/1.2
-
-#include "wx/math.h"
+#include <gdk/gdkimage.h>

 
 extern void gdk_wx_draw_bitmap     (GdkDrawable  *drawable,
                           GdkGC               *gc,
 
 extern void gdk_wx_draw_bitmap     (GdkDrawable  *drawable,
                           GdkGC               *gc,


@@ -74,11 +66,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,7 +83,7 @@ wxMask::wxMask( const wxBitmap& bitmap )
 wxMask::~wxMask()
 {
     if (m_bitmap)
 wxMask::~wxMask()
 {
     if (m_bitmap)

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

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


@@ -97,12 +91,12 @@ bool wxMask::Create( const wxBitmap& bitmap,
 {
     if (m_bitmap)
     {
 {
     if (m_bitmap)
     {

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

         m_bitmap = (GdkBitmap*) NULL;
     }
 
     wxImage image = bitmap.ConvertToImage();
         m_bitmap = (GdkBitmap*) NULL;
     }
 
     wxImage image = bitmap.ConvertToImage();

-    if (!image.Ok()) return FALSE;
+    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 );


@@ -180,46 +174,48 @@ bool wxMask::Create( const wxBitmap& bitmap,
             gdk_draw_line( m_bitmap, gc, start_x, j, i, j );
     }
 
             gdk_draw_line( m_bitmap, gc, start_x, j, i, j );
     }
 

-    gdk_gc_unref( gc );
+    g_object_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 )
 {
     if (m_bitmap)
     {
 
 bool wxMask::Create( const wxBitmap& bitmap )
 {
     if (m_bitmap)
     {

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

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

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

 
 

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

 
     m_bitmap = gdk_pixmap_new( 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 );
 

-    gdk_wx_draw_bitmap( m_bitmap, gc, bitmap.GetBitmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight() );
+    gdk_wx_draw_bitmap( m_bitmap, gc, bitmap.GetPixmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight() );

 
 

-    gdk_gc_unref( gc );
+    g_object_unref (gc);

 
 

-    return TRUE;
+    return true;

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


@@ -238,10 +234,7 @@ public:
     ~wxBitmapRefData();
 
     GdkPixmap      *m_pixmap;
     ~wxBitmapRefData();
 
     GdkPixmap      *m_pixmap;

-    GdkBitmap      *m_bitmap;
-#ifdef __WXGTK20__

     GdkPixbuf      *m_pixbuf;
     GdkPixbuf      *m_pixbuf;

-#endif

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


@@ -252,10 +245,7 @@ public:
 wxBitmapRefData::wxBitmapRefData()
 {
     m_pixmap = (GdkPixmap *) NULL;
 wxBitmapRefData::wxBitmapRefData()
 {
     m_pixmap = (GdkPixmap *) NULL;

-    m_bitmap = (GdkBitmap *) NULL;
-#ifdef __WXGTK20__

     m_pixbuf = (GdkPixbuf *) NULL;
     m_pixbuf = (GdkPixbuf *) NULL;

-#endif

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


@@ -266,20 +256,18 @@ wxBitmapRefData::wxBitmapRefData()
 wxBitmapRefData::~wxBitmapRefData()
 {
     if (m_pixmap)
 wxBitmapRefData::~wxBitmapRefData()
 {
     if (m_pixmap)

-        gdk_pixmap_unref( m_pixmap );
-    if (m_bitmap)
-        gdk_bitmap_unref( m_bitmap );
-#ifdef __WXGTK20__
+        g_object_unref (m_pixmap);

     if (m_pixbuf)
     if (m_pixbuf)

-        gdk_pixbuf_unref( m_pixbuf );
-#endif
+        g_object_unref (m_pixbuf);

     delete m_mask;
     delete m_mask;

+#if wxUSE_PALETTE

     delete m_palette;
     delete m_palette;

+#endif // wxUSE_PALETTE

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

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

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


@@ -306,22 +294,22 @@ bool wxBitmap::Create( int width, int height, int depth )
     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_BMPDATA->m_width = width;
     M_BMPDATA->m_height = height;
 
     m_refData = new wxBitmapRefData();
     M_BMPDATA->m_mask = (wxMask *) NULL;
     M_BMPDATA->m_width = width;
     M_BMPDATA->m_height = height;

-    if (depth == 1)
+    M_BMPDATA->m_bpp = depth;
+    if (depth == 32)

     {
     {

-        M_BMPDATA->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
-        M_BMPDATA->m_bpp = 1;
+        M_BMPDATA->m_pixbuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB, true,
+                                              8, width, height);

     }
     else
     {
         M_BMPDATA->m_pixmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, depth );
     }
     else
     {
         M_BMPDATA->m_pixmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, depth );

-        M_BMPDATA->m_bpp = visual->depth;

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


@@ -331,7 +319,7 @@ bool wxBitmap::CreateFromXpm( const char **bits )
 {
     UnRef();
 
 {
     UnRef();
 

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

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


@@ -341,7 +329,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") );
+    wxCHECK_MSG( M_BMPDATA->m_pixmap, false, wxT("couldn't create pixmap") );

 
     if (mask)
     {
 
     if (mask)
     {


@@ -349,11 +337,11 @@ bool wxBitmap::CreateFromXpm( const char **bits )
         M_BMPDATA->m_mask->m_bitmap = mask;
     }
 
         M_BMPDATA->m_mask->m_bitmap = mask;
     }
 

-    gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
+    gdk_drawable_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );

 
     M_BMPDATA->m_bpp = visual->depth;  // Can we get a different depth from create_from_xpm_d() ?
 
 
     M_BMPDATA->m_bpp = visual->depth;  // Can we get a different depth from create_from_xpm_d() ?
 

-    return TRUE;
+    return true;

 }
 
 wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, int newx, int newy )
 }
 
 wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, int newx, int newy )


@@ -362,15 +350,14 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
 
     if (newy==M_BMPDATA->m_width && newy==M_BMPDATA->m_height)
         return *this;
 
     if (newy==M_BMPDATA->m_width && newy==M_BMPDATA->m_height)
         return *this;

-    
+

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

-        
+

     wxBitmap bmp;
 
     wxBitmap bmp;
 

-#ifdef __WXGTK20__

     if (HasPixbuf())
     {
         bmp.SetWidth(width);
     if (HasPixbuf())
     {
         bmp.SetWidth(width);


@@ -381,18 +368,15 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
                                      8, width, height));
         gdk_pixbuf_scale(GetPixbuf(), bmp.GetPixbuf(),
                          0, 0, width, height,
                                      8, width, height));
         gdk_pixbuf_scale(GetPixbuf(), bmp.GetPixbuf(),
                          0, 0, width, height,

-                         clipx, clipy, 
+                         clipx, clipy,

                          (double)newx/GetWidth(), (double)newy/GetHeight(),
                          GDK_INTERP_BILINEAR);
     }
     else
                          (double)newx/GetWidth(), (double)newy/GetHeight(),
                          GDK_INTERP_BILINEAR);
     }
     else

-#endif // __WXGTK20__

     {
         GdkImage *img = (GdkImage*) NULL;
         if (GetPixmap())
             img = gdk_image_get( GetPixmap(), 0, 0, GetWidth(), GetHeight() );
     {
         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") );
 
         else
             wxFAIL_MSG( wxT("Ill-formed bitmap") );
 


@@ -400,12 +384,12 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
 
         int bpp = -1;
 
 
         int bpp = -1;
 

-        
+

         GdkGC *gc = NULL;
         GdkPixmap *dstpix = NULL;
         GdkGC *gc = NULL;
         GdkPixmap *dstpix = NULL;

-        if (GetPixmap())
+        if (GetDepth() != 1)

         {
         {

-            GdkVisual *visual = gdk_window_get_visual( GetPixmap() );
+            GdkVisual *visual = gdk_drawable_get_visual( GetPixmap() );

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


@@ -417,8 +401,8 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
 
         char *dst = NULL;
         long dstbyteperline = 0;
 
         char *dst = NULL;
         long dstbyteperline = 0;

-        
-        if (GetBitmap())
+
+        if (GetDepth() == 1)

         {
             bpp = 1;
             dstbyteperline = width/8*M_BMPDATA->m_bpp;
         {
             bpp = 1;
             dstbyteperline = width/8*M_BMPDATA->m_bpp;


@@ -426,7 +410,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
                 dstbyteperline++;
             dst = (char*) malloc(dstbyteperline*height);
         }
                 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;
         // 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;


@@ -459,16 +443,16 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
                     old_pixval = pixval;
                     old_x = x;
                 }
                     old_pixval = pixval;
                     old_x = x;
                 }

-                    
-                if (bpp == 1)
+
+                if ( dst )

                 {
                     if (!pixval)
                     {
                         char bit=1;
                 {
                     if (!pixval)
                     {
                         char bit=1;

-                        char shift = bit << w % 8;
+                        char shift = bit << (w % 8);

                         outbyte |= shift;
                     }
                         outbyte |= shift;
                     }

-                    
+

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


@@ -483,21 +467,21 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
                     gdk_draw_point( dstpix, gc, w, h);
                 }
             }
                     gdk_draw_point( dstpix, gc, w, h);
                 }
             }

-        
+

             // do not forget the last byte
             // do not forget the last byte

-            if ((bpp == 1) && (width % 8 != 0))
+            if ( dst && (width % 8 != 0) )

                 dst[h*dstbyteperline+width/8] = outbyte;
         }
                 dst[h*dstbyteperline+width/8] = outbyte;
         }

-        
-        gdk_image_destroy( img );
-        if (gc) gdk_gc_unref( gc );

 
 

-        if (bpp == 1)
+        g_object_unref (img);
+        if (gc) g_object_unref (gc);
+
+        if ( dst )

         {
             bmp = wxBitmap( (const char *)dst, width, height, 1 );
             free( dst );
         }
         {
             bmp = wxBitmap( (const char *)dst, width, height, 1 );
             free( dst );
         }

-        
+

         if (GetMask())
         {
             dstbyteperline = width/8;
         if (GetMask())
         {
             dstbyteperline = width/8;


@@ -511,7 +495,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
                 char outbyte = 0;
                 int old_x = -1;
                 guint32 old_pixval = 0;
                 char outbyte = 0;
                 int old_x = -1;
                 guint32 old_pixval = 0;

-        
+

                 for (int w = 0; w < width; w++)
                 {
                     guint32 pixval;
                 for (int w = 0; w < width; w++)
                 {
                     guint32 pixval;


@@ -524,21 +508,21 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
                         old_pixval = pixval;
                         old_x = x;
                     }
                         old_pixval = pixval;
                         old_x = x;
                     }

-                    
+

                     if (pixval)
                     {
                         char bit=1;
                     if (pixval)
                     {
                         char bit=1;

-                        char shift = bit << w % 8;
+                        char shift = bit << (w % 8);

                         outbyte |= shift;
                     }
                         outbyte |= shift;
                     }

-                    
+

                     if ((w+1)%8 == 0)
                     {
                         dst[h*dstbyteperline+w/8] = outbyte;
                         outbyte = 0;
                     }
                 }
                     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;
                 // do not forget the last byte
                 if (width % 8 != 0)
                     dst[h*dstbyteperline+width/8] = outbyte;


@@ -548,26 +532,26 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
             bmp.SetMask(mask);
 
             free( dst );
             bmp.SetMask(mask);
 
             free( dst );

-            gdk_image_destroy( img );
+            g_object_unref (img);

         }
 
         free( tablex );
         free( tabley );
     }
         }
 
         free( tablex );
         free( tabley );
     }

-    
-    return bmp; 
+
+    return bmp;

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

-    wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") )
-    wxCHECK_MSG( depth == -1 || depth == 1, FALSE, wxT("invalid bitmap depth") )
+    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;
 
     if (image.GetWidth() <= 0 || image.GetHeight() <= 0)
         return false;

-    
+

     m_refData = new wxBitmapRefData();
 
     if (depth == 1)
     m_refData = new wxBitmapRefData();
 
     if (depth == 1)


@@ -576,10 +560,9 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
     }
     else
     {
     }
     else
     {

-#ifdef __WXGTK20__

         if (image.HasAlpha())
             return CreateFromImageAsPixbuf(image);
         if (image.HasAlpha())
             return CreateFromImageAsPixbuf(image);

-#endif
+

         return CreateFromImageAsPixmap(image);
     }
 }
         return CreateFromImageAsPixmap(image);
     }
 }


@@ -590,14 +573,14 @@ bool wxBitmap::CreateFromImageAsBitmap(const wxImage& img)
     // convert alpha channel to mask, if it is present:
     wxImage image(img);
     image.ConvertAlphaToMask();
     // 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 );
 
     int width = image.GetWidth();
     int height = image.GetHeight();
 
     SetHeight( height );
     SetWidth( width );
 

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

 
     SetDepth( 1 );
 
 
     SetDepth( 1 );
 


@@ -662,12 +645,12 @@ bool wxBitmap::CreateFromImageAsBitmap(const wxImage& img)
 
     // Blit picture
 
 
     // Blit picture
 

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

 
 

-    gdk_draw_image( GetBitmap(), 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 );
+    g_object_unref (data_image);
+    g_object_unref (data_gc);

 
     // Blit mask
 
 
     // Blit mask
 


@@ -677,20 +660,20 @@ bool wxBitmap::CreateFromImageAsBitmap(const wxImage& img)
 
         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 );
+        g_object_unref (mask_image);
+        g_object_unref (mask_gc);

     }
 
     return true;
 }
     }
 
     return true;
 }

-    
+

 // conversion to colour bitmap:
 bool wxBitmap::CreateFromImageAsPixmap(const wxImage& img)
 {
     // convert alpha channel to mask, if it is present:
     wxImage image(img);
     image.ConvertAlphaToMask();
 // conversion to colour bitmap:
 bool wxBitmap::CreateFromImageAsPixmap(const wxImage& img)
 {
     // convert alpha channel to mask, if it is present:
     wxImage image(img);
     image.ConvertAlphaToMask();

-    
+

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


@@ -705,77 +688,33 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& img)
 
     SetDepth( bpp );
 
 
     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() );
+    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_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 );
+    g_object_unref (gc);

 
     // Create mask image
 
     GdkImage *mask_image = (GdkImage*) NULL;
 
 
     // Create mask image
 
     GdkImage *mask_image = (GdkImage*) NULL;
 

-    if (image.HasMask())
-    {
-        unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
+    if (!image.HasMask())
+        return true;

 
 

-        mask_image =  gdk_image_new_bitmap( visual, mask_data, width, height );
+    unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );

 
 

-        wxMask *mask = new wxMask();
-        mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
+    mask_image =  gdk_image_new_bitmap( visual, mask_data, width, height );

 
 

-        SetMask( mask );
-    }
-
-    // Render
-
-    enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
-    byte_order b_o = RGB;
+    wxMask *mask = new wxMask();
+    mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );

 
 

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

 
     int r_mask = image.GetMaskRed();
     int g_mask = image.GetMaskGreen();
 
     int r_mask = image.GetMaskRed();
     int g_mask = image.GetMaskGreen();


@@ -795,135 +734,25 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& img)
             int b = 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 );
-                }
-                default: break;
-            }
+            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 );

         } // for
     }  // for
 
         } // 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
 
     // Blit mask
 

-    if (image.HasMask())
-    {
-        GdkGC *mask_gc = gdk_gc_new( GetMask()->GetBitmap() );
+    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 );
-    }
+    g_object_unref (mask_image);
+    g_object_unref (mask_gc);

 
     return true;
 }
 
 
     return true;
 }
 

-#ifdef __WXGTK20__

 bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
 {
     int width = image.GetWidth();
 bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
 {
     int width = image.GetWidth();


@@ -940,17 +769,17 @@ bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
     wxASSERT( gdk_pixbuf_get_n_channels(pixbuf) == 4 );
     wxASSERT( gdk_pixbuf_get_width(pixbuf) == width );
     wxASSERT( gdk_pixbuf_get_height(pixbuf) == height );
     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);
     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();
     // 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)
     int rowinc = gdk_pixbuf_get_rowstride(pixbuf) - 4 * width;
 
     for (int y = 0; y < height; y++, out += rowinc)


@@ -963,17 +792,16 @@ bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image)
             out[3] = *alpha;
         }
     }
             out[3] = *alpha;
         }
     }

-    
+

     return true;
 }
     return true;
 }

-#endif // __WXGTK20__

 
 wxImage wxBitmap::ConvertToImage() const
 {
     wxImage image;
 
     wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
 
 wxImage wxBitmap::ConvertToImage() const
 {
     wxImage image;
 
     wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );

-    
+

     image.Create(GetWidth(), GetHeight());
     unsigned char *data = image.GetData();
 
     image.Create(GetWidth(), GetHeight());
     unsigned char *data = image.GetData();
 


@@ -983,15 +811,14 @@ wxImage wxBitmap::ConvertToImage() const
         return wxNullImage;
     }
 
         return wxNullImage;
     }
 

-#ifdef __WXGTK20__

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

-        
+

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

-        
+

         image.SetAlpha();
 
         unsigned char *alpha = image.GetAlpha();
         image.SetAlpha();
 
         unsigned char *alpha = image.GetAlpha();


@@ -1011,7 +838,6 @@ wxImage wxBitmap::ConvertToImage() const
         }
     }
     else
         }
     }
     else

-#endif // __WXGTK20__

     {
         // the colour used as transparent one in wxImage and the one it is
         // replaced with when it really occurs in the bitmap
     {
         // the colour used as transparent one in wxImage and the one it is
         // replaced with when it really occurs in the bitmap


@@ -1028,12 +854,6 @@ wxImage wxBitmap::ConvertToImage() const
                                        0, 0,
                                        GetWidth(), GetHeight() );
         }
                                        0, 0,
                                        GetWidth(), GetHeight() );
         }

-        else if (GetBitmap())
-        {
-            gdk_image = gdk_image_get( GetBitmap(),
-                                       0, 0,
-                                       GetWidth(), GetHeight() );
-        }

         else
         {
             wxFAIL_MSG( wxT("Ill-formed bitmap") );
         else
         {
             wxFAIL_MSG( wxT("Ill-formed bitmap") );


@@ -1058,11 +878,11 @@ 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())
+        if (GetDepth() != 1)

         {
         {

-            GdkVisual *visual = gdk_window_get_visual( GetPixmap() );
+            GdkVisual *visual = gdk_drawable_get_visual( GetPixmap() );

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


@@ -1078,7 +898,7 @@ wxImage wxBitmap::ConvertToImage() const
 
             use_shift = (visual->type == GDK_VISUAL_TRUE_COLOR) || (visual->type == GDK_VISUAL_DIRECT_COLOR);
         }
 
             use_shift = (visual->type == GDK_VISUAL_TRUE_COLOR) || (visual->type == GDK_VISUAL_DIRECT_COLOR);
         }

-        if (GetBitmap())
+        else

         {
             bpp = 1;
         }
         {
             bpp = 1;
         }


@@ -1145,19 +965,13 @@ wxImage wxBitmap::ConvertToImage() const
             }
         }
 
             }
         }
 

-        gdk_image_destroy( gdk_image );
-        if (gdk_image_mask) gdk_image_destroy( gdk_image_mask );
+        g_object_unref (gdk_image);
+        if (gdk_image_mask) g_object_unref (gdk_image_mask);

     }
 
     return image;
 }
 
     }
 
     return image;
 }
 

-wxBitmap::wxBitmap( const wxBitmap& bmp )
-        : wxBitmapBase()
-{
-    Ref( bmp );
-}
-

 wxBitmap::wxBitmap( const wxString &filename, wxBitmapType type )
 {
     LoadFile( filename, type );
 wxBitmap::wxBitmap( const wxString &filename, wxBitmapType type )
 {
     LoadFile( filename, type );


@@ -1170,7 +984,7 @@ wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth
         m_refData = new wxBitmapRefData();
 
         M_BMPDATA->m_mask = (wxMask *) NULL;
         m_refData = new wxBitmapRefData();
 
         M_BMPDATA->m_mask = (wxMask *) NULL;

-        M_BMPDATA->m_bitmap = gdk_bitmap_create_from_data
+        M_BMPDATA->m_pixmap = gdk_bitmap_create_from_data

                               (
                                 wxGetRootWindow()->window,
                                 (gchar *) bits,
                               (
                                 wxGetRootWindow()->window,
                                 (gchar *) bits,


@@ -1181,7 +995,7 @@ wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth
         M_BMPDATA->m_height = height;
         M_BMPDATA->m_bpp = 1;
 
         M_BMPDATA->m_height = height;
         M_BMPDATA->m_bpp = 1;
 

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

     }
 }
 
     }
 }
 


@@ -1189,14 +1003,6 @@ 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;


@@ -1209,12 +1015,10 @@ bool wxBitmap::operator != ( const wxBitmap& bmp ) const
 
 bool wxBitmap::Ok() const
 {
 
 bool wxBitmap::Ok() const
 {

-    return (m_refData != NULL) && 
+    return (m_refData != NULL) &&

            (
            (

-#ifdef __WXGTK20__

               M_BMPDATA->m_pixbuf ||
               M_BMPDATA->m_pixbuf ||

-#endif
-              M_BMPDATA->m_bitmap || M_BMPDATA->m_pixmap 
+              M_BMPDATA->m_pixmap

            );
 }
 
            );
 }
 


@@ -1258,7 +1062,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


@@ -1271,36 +1075,34 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
     wxBitmap ret( rect.width, rect.height, M_BMPDATA->m_bpp );
     wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
 
     wxBitmap ret( rect.width, rect.height, M_BMPDATA->m_bpp );
     wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
 

-#ifdef __WXGTK20__

     if (HasPixbuf())
     {
         GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
                                            gdk_pixbuf_get_has_alpha(GetPixbuf()),
     if (HasPixbuf())
     {
         GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
                                            gdk_pixbuf_get_has_alpha(GetPixbuf()),

-                                           8, GetWidth(), GetHeight());
+                                           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
         ret.SetPixbuf(pixbuf);
         gdk_pixbuf_copy_area(GetPixbuf(),
                              rect.x, rect.y, rect.width, rect.height,
                              pixbuf, 0, 0);
     }
     else

-#endif // __WXGTK20__

     {
     {

-        if (ret.GetPixmap())
+        if (ret.GetDepth() != 1)

         {
             GdkGC *gc = gdk_gc_new( 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 );
+            gdk_draw_drawable( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
+            g_object_unref (gc);

         }
         else
         {
         }
         else
         {

-            GdkGC *gc = gdk_gc_new( ret.GetBitmap() );
+            GdkGC *gc = gdk_gc_new( ret.GetPixmap() );

             GdkColor col;
             col.pixel = 0xFFFFFF;
             gdk_gc_set_foreground( gc, &col );
             col.pixel = 0;
             gdk_gc_set_background( gc, &col );
             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.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
+            g_object_unref (gc);

         }
     }
 
         }
     }
 


@@ -1316,7 +1118,7 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
         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 );
         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 );
+        g_object_unref (gc);

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


@@ -1326,7 +1128,7 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
 
 bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalette *WXUNUSED(palette) ) const
 {
 
 bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalette *WXUNUSED(palette) ) const
 {

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

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


@@ -1334,7 +1136,7 @@ bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalett
         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, wxBitmapType type )
 }
 
 bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )


@@ -1342,7 +1144,7 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
     UnRef();
 
     if (!wxFileExists(name))
     UnRef();
 
     if (!wxFileExists(name))

-        return FALSE;
+        return false;

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


@@ -1366,7 +1168,7 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
            M_BMPDATA->m_mask->m_bitmap = mask;
         }
 
            M_BMPDATA->m_mask->m_bitmap = mask;
         }
 

-        gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
+        gdk_drawable_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );

 
         M_BMPDATA->m_bpp = visual->depth;
     }
 
         M_BMPDATA->m_bpp = visual->depth;
     }


@@ -1374,14 +1176,15 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
     {
         wxImage image;
         if ( !image.LoadFile( name, type ) || !image.Ok() )
     {
         wxImage image;
         if ( !image.LoadFile( name, type ) || !image.Ok() )

-            return FALSE;
+            return false;

 
         *this = wxBitmap(image);
     }
 
 
         *this = wxBitmap(image);
     }
 

-    return TRUE;
+    return true;

 }
 
 }
 

+#if wxUSE_PALETTE

 wxPalette *wxBitmap::GetPalette() const
 {
     if (!Ok())
 wxPalette *wxBitmap::GetPalette() const
 {
     if (!Ok())


@@ -1394,6 +1197,7 @@ void wxBitmap::SetPalette(const wxPalette& WXUNUSED(palette))
 {
     // TODO
 }
 {
     // TODO
 }

+#endif // wxUSE_PALETTE

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


@@ -1425,27 +1229,13 @@ void wxBitmap::SetPixmap( GdkPixmap *pixmap )
         m_refData = new wxBitmapRefData();
 
     M_BMPDATA->m_pixmap = pixmap;
         m_refData = new wxBitmapRefData();
 
     M_BMPDATA->m_pixmap = pixmap;

-#ifdef __WXGTK20__

     PurgeOtherRepresentations(Pixmap);
     PurgeOtherRepresentations(Pixmap);

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

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

-#ifdef __WXGTK20__

     // create the pixmap on the fly if we use Pixbuf representation:
     if (HasPixbuf() && !HasPixmap())
     {
     // create the pixmap on the fly if we use Pixbuf representation:
     if (HasPixbuf() && !HasPixmap())
     {


@@ -1456,7 +1246,6 @@ GdkPixmap *wxBitmap::GetPixmap() const
                                           &M_BMPDATA->m_mask->m_bitmap,
                                           128 /*threshold*/);
     }
                                           &M_BMPDATA->m_mask->m_bitmap,
                                           128 /*threshold*/);
     }

-#endif // __WXGTK20__

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


@@ -1468,14 +1257,6 @@ bool wxBitmap::HasPixmap() const
     return M_BMPDATA->m_pixmap != NULL;
 }
 
     return M_BMPDATA->m_pixmap != NULL;
 }
 

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

 GdkPixbuf *wxBitmap::GetPixbuf() const
 {
     wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );
 GdkPixbuf *wxBitmap::GetPixbuf() const
 {
     wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );


@@ -1484,18 +1265,18 @@ GdkPixbuf *wxBitmap::GetPixbuf() const
     {
         int width = GetWidth();
         int height = GetHeight();
     {
         int width = GetWidth();
         int height = GetHeight();

-        
+

         GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
                                            GetMask() != NULL,
                                            8, width, height);
         GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
                                            GetMask() != NULL,
                                            8, width, height);

-        M_BMPDATA->m_pixbuf = 
+        M_BMPDATA->m_pixbuf =

             gdk_pixbuf_get_from_drawable(pixbuf, M_BMPDATA->m_pixmap, NULL,
                                          0, 0, 0, 0, width, height);
             gdk_pixbuf_get_from_drawable(pixbuf, M_BMPDATA->m_pixmap, NULL,
                                          0, 0, 0, 0, width, height);

-        
+

         // apply the mask to created pixbuf:
         if (M_BMPDATA->m_pixbuf && M_BMPDATA->m_mask)
         {
         // apply the mask to created pixbuf:
         if (M_BMPDATA->m_pixbuf && M_BMPDATA->m_mask)
         {

-            GdkPixbuf *pmask = 
+            GdkPixbuf *pmask =

                 gdk_pixbuf_get_from_drawable(NULL,
                                              M_BMPDATA->m_mask->GetBitmap(),
                                              NULL,
                 gdk_pixbuf_get_from_drawable(NULL,
                                              M_BMPDATA->m_mask->GetBitmap(),
                                              NULL,


@@ -1516,8 +1297,8 @@ GdkPixbuf *wxBitmap::GetPixbuf() const
                             bmp[3] = 0;
                     }
                 }
                             bmp[3] = 0;
                     }
                 }

-                    
-                gdk_pixbuf_unref(pmask);
+
+                g_object_unref (pmask);

             }
         }
     }
             }
         }
     }


@@ -1545,16 +1326,54 @@ void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep)
 {
     if (keep == Pixmap && HasPixbuf())
     {
 {
     if (keep == Pixmap && HasPixbuf())
     {

-        gdk_pixbuf_unref( M_BMPDATA->m_pixbuf );
+        g_object_unref (M_BMPDATA->m_pixbuf);

         M_BMPDATA->m_pixbuf = NULL;
     }
     if (keep == Pixbuf && HasPixmap())
     {
         M_BMPDATA->m_pixbuf = NULL;
     }
     if (keep == Pixbuf && HasPixmap())
     {

-        gdk_pixmap_unref( M_BMPDATA->m_pixmap );
+        g_object_unref (M_BMPDATA->m_pixmap);

         M_BMPDATA->m_pixmap = NULL;
     }
 }
 
         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
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxBitmapHandler
 //-----------------------------------------------------------------------------


@@ -1565,26 +1384,40 @@ wxBitmapHandler::~wxBitmapHandler()
 {
 }
 
 {
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

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

 }
 
 /* static */ void wxBitmap::InitStandardHandlers()
 {
     // TODO: Insert handler based on GdkPixbufs handler later
 }
 }
 
 /* static */ void wxBitmap::InitStandardHandlers()
 {
     // TODO: Insert handler based on GdkPixbufs handler later
 }

-
-
-#endif // __WXGTK20__