picker controls improvements: fixes to valid paths recognition and event generation...

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

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index e8009a37ed3c7c0861669c22a580d2284e7f9eca..e420d57b51fb7ce56e63e2f69268d6d4ad8be887 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -10,15 +10,18 @@
 // 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"

 
 #include "wx/rawbmp.h"
     // need this to get gdk_image_new_bitmap()
 
 #include "wx/rawbmp.h"
     // need this to get gdk_image_new_bitmap()


@@ -30,8 +33,6 @@
 
 #include <gdk/gdkimage.h>
 
 
 #include <gdk/gdkimage.h>
 

-#include "wx/math.h"
-

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


@@ -82,7 +83,7 @@ wxMask::wxMask( const wxBitmap& bitmap )
 wxMask::~wxMask()
 {
     if (m_bitmap)
 wxMask::~wxMask()
 {
     if (m_bitmap)

-        g_object_unref (G_OBJECT (m_bitmap));
+        g_object_unref (m_bitmap);

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


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

-        g_object_unref (G_OBJECT (m_bitmap));
+        g_object_unref (m_bitmap);

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


@@ -173,7 +174,7 @@ 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 );
     }
 

-    g_object_unref (G_OBJECT (gc));
+    g_object_unref (gc);

 
     return true;
 }
 
     return true;
 }


@@ -196,13 +197,13 @@ bool wxMask::Create( const wxBitmap& bitmap )
 {
     if (m_bitmap)
     {
 {
     if (m_bitmap)
     {

-        g_object_unref (G_OBJECT (m_bitmap));
+        g_object_unref (m_bitmap);

         m_bitmap = (GdkBitmap*) NULL;
     }
 
     if (!bitmap.Ok()) return false;
 
         m_bitmap = (GdkBitmap*) NULL;
     }
 
     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 );
 


@@ -210,9 +211,9 @@ bool wxMask::Create( const wxBitmap& bitmap )
 
     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() );

 
 

-    g_object_unref (G_OBJECT (gc));
+    g_object_unref (gc);

 
     return true;
 }
 
     return true;
 }


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

-    GdkBitmap      *m_bitmap;

     GdkPixbuf      *m_pixbuf;
     wxMask         *m_mask;
     int             m_width;
     GdkPixbuf      *m_pixbuf;
     wxMask         *m_mask;
     int             m_width;


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

-    m_bitmap = (GdkBitmap *) NULL;

     m_pixbuf = (GdkPixbuf *) NULL;
     m_mask = (wxMask *) NULL;
     m_width = 0;
     m_pixbuf = (GdkPixbuf *) NULL;
     m_mask = (wxMask *) NULL;
     m_width = 0;


@@ -257,11 +256,9 @@ wxBitmapRefData::wxBitmapRefData()
 wxBitmapRefData::~wxBitmapRefData()
 {
     if (m_pixmap)
 wxBitmapRefData::~wxBitmapRefData()
 {
     if (m_pixmap)

-        g_object_unref (G_OBJECT (m_pixmap));
-    if (m_bitmap)
-        g_object_unref (G_OBJECT (m_bitmap));
+        g_object_unref (m_pixmap);

     if (m_pixbuf)
     if (m_pixbuf)

-        g_object_unref (G_OBJECT (m_pixbuf));
+        g_object_unref (m_pixbuf);

     delete m_mask;
 #if wxUSE_PALETTE
     delete m_palette;
     delete m_mask;
 #if wxUSE_PALETTE
     delete m_palette;


@@ -270,7 +267,7 @@ wxBitmapRefData::~wxBitmapRefData()
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 

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


@@ -304,21 +301,15 @@ bool wxBitmap::Create( int width, int height, int depth )
     M_BMPDATA->m_mask = (wxMask *) NULL;
     M_BMPDATA->m_width = width;
     M_BMPDATA->m_height = height;
     M_BMPDATA->m_mask = (wxMask *) NULL;
     M_BMPDATA->m_width = width;
     M_BMPDATA->m_height = height;

-    if (depth == 1)
-    {
-        M_BMPDATA->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
-        M_BMPDATA->m_bpp = 1;
-    }
-    else if (depth == 32)
+    M_BMPDATA->m_bpp = depth;
+    if (depth == 32)

     {
         M_BMPDATA->m_pixbuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB, true,
                                               8, width, height);
     {
         M_BMPDATA->m_pixbuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB, true,
                                               8, width, height);

-        M_BMPDATA->m_bpp = 32;

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


@@ -346,7 +337,7 @@ 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() ?
 


@@ -386,8 +377,6 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
         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") );
 


@@ -398,7 +387,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
 
         GdkGC *gc = NULL;
         GdkPixmap *dstpix = NULL;
 
         GdkGC *gc = NULL;
         GdkPixmap *dstpix = NULL;

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

         {
             GdkVisual *visual = gdk_drawable_get_visual( GetPixmap() );
             if (visual == NULL)
         {
             GdkVisual *visual = gdk_drawable_get_visual( GetPixmap() );
             if (visual == NULL)


@@ -413,7 +402,7 @@ 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;


@@ -484,8 +473,8 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
                 dst[h*dstbyteperline+width/8] = outbyte;
         }
 
                 dst[h*dstbyteperline+width/8] = outbyte;
         }
 

-        g_object_unref (G_OBJECT (img));
-        if (gc) g_object_unref (G_OBJECT (gc));
+        g_object_unref (img);
+        if (gc) g_object_unref (gc);

 
         if ( dst )
         {
 
         if ( dst )
         {


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

-            g_object_unref (G_OBJECT (img));
+            g_object_unref (img);

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


@@ -591,7 +580,7 @@ bool wxBitmap::CreateFromImageAsBitmap(const wxImage& img)
     SetHeight( height );
     SetWidth( width );
 
     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 );
 


@@ -656,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 );

 
 

-    g_object_unref (G_OBJECT (data_image));
-    g_object_unref (G_OBJECT (data_gc));
+    g_object_unref (data_image);
+    g_object_unref (data_gc);

 
     // Blit mask
 
 
     // Blit mask
 


@@ -671,8 +660,8 @@ 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 );
 

-        g_object_unref (G_OBJECT (mask_image));
-        g_object_unref (G_OBJECT (mask_gc));
+        g_object_unref (mask_image);
+        g_object_unref (mask_gc);

     }
 
     return true;
     }
 
     return true;


@@ -699,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 );
-
-        g_object_unref (G_OBJECT (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 );
-
-        mask_image =  gdk_image_new_bitmap( visual, mask_data, width, height );
+    if (!image.HasMask())
+        return true;

 
 

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

 
 

-        SetMask( mask );
-    }
+    mask_image =  gdk_image_new_bitmap( visual, mask_data, width, height );

 
 

-    // Render
+    wxMask *mask = new wxMask();
+    mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );

 
 

-    enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
-    byte_order b_o = RGB;
-
-    if (bpp > 8)
-    {
-        if ((visual->red_mask > visual->green_mask) && (visual->green_mask > visual->blue_mask))      b_o = RGB;
-        else if ((visual->red_mask > visual->blue_mask) && (visual->blue_mask > visual->green_mask))  b_o = RBG;
-        else if ((visual->blue_mask > visual->red_mask) && (visual->red_mask > visual->green_mask))   b_o = BRG;
-        else if ((visual->blue_mask > visual->green_mask) && (visual->green_mask > visual->red_mask)) b_o = BGR;
-        else if ((visual->green_mask > visual->red_mask) && (visual->red_mask > visual->blue_mask))   b_o = GRB;
-        else if ((visual->green_mask > visual->blue_mask) && (visual->blue_mask > visual->red_mask))  b_o = GBR;
-    }
+    SetMask( mask );

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


@@ -789,131 +734,21 @@ 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 );
-                    break;
-                }
-                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 );
-
-    g_object_unref (G_OBJECT (data_image));
-    g_object_unref (G_OBJECT (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 );

 
 

-        g_object_unref (G_OBJECT (mask_image));
-        g_object_unref (G_OBJECT (mask_gc));
-    }
+    g_object_unref (mask_image);
+    g_object_unref (mask_gc);

 
     return true;
 }
 
     return true;
 }


@@ -1019,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") );


@@ -1051,7 +880,7 @@ wxImage wxBitmap::ConvertToImage() const
         int blue_shift_left = 0;
         bool use_shift = false;
 
         int blue_shift_left = 0;
         bool use_shift = false;
 

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

         {
             GdkVisual *visual = gdk_drawable_get_visual( GetPixmap() );
             if (visual == NULL)
         {
             GdkVisual *visual = gdk_drawable_get_visual( GetPixmap() );
             if (visual == NULL)


@@ -1069,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;
         }


@@ -1136,8 +965,8 @@ wxImage wxBitmap::ConvertToImage() const
             }
         }
 
             }
         }
 

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

     }
 
     return image;
     }
 
     return image;


@@ -1155,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,


@@ -1166,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,7 +1018,7 @@ bool wxBitmap::Ok() const
     return (m_refData != NULL) &&
            (
               M_BMPDATA->m_pixbuf ||
     return (m_refData != NULL) &&
            (
               M_BMPDATA->m_pixbuf ||

-              M_BMPDATA->m_bitmap || M_BMPDATA->m_pixmap
+              M_BMPDATA->m_pixmap

            );
 }
 
            );
 }
 


@@ -1258,22 +1087,22 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
     }
     else
     {
     }
     else
     {

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

         {
             GdkGC *gc = gdk_gc_new( ret.GetPixmap() );
             gdk_draw_drawable( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
         {
             GdkGC *gc = gdk_gc_new( ret.GetPixmap() );
             gdk_draw_drawable( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );

-            g_object_unref (G_OBJECT (gc));
+            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 );
-            g_object_unref (G_OBJECT (gc));
+            gdk_wx_draw_bitmap( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
+            g_object_unref (gc);

         }
     }
 
         }
     }
 


@@ -1289,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 );

-        g_object_unref (G_OBJECT (gc));
+        g_object_unref (gc);

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


@@ -1339,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;
     }


@@ -1403,15 +1232,6 @@ void wxBitmap::SetPixmap( GdkPixmap *pixmap )
     PurgeOtherRepresentations(Pixmap);
 }
 
     PurgeOtherRepresentations(Pixmap);
 }
 

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

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


@@ -1437,13 +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;
-}
-

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


@@ -1485,7 +1298,7 @@ GdkPixbuf *wxBitmap::GetPixbuf() const
                     }
                 }
 
                     }
                 }
 

-                g_object_unref (G_OBJECT (pmask));
+                g_object_unref (pmask);

             }
         }
     }
             }
         }
     }


@@ -1513,12 +1326,12 @@ void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep)
 {
     if (keep == Pixmap && HasPixbuf())
     {
 {
     if (keep == Pixmap && HasPixbuf())
     {

-        g_object_unref (G_OBJECT (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())
     {

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

         M_BMPDATA->m_pixmap = NULL;
     }
 }
         M_BMPDATA->m_pixmap = NULL;
     }
 }