X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b04c4e0bd0dc4010e02d912c6a94a08e06b5327..58772e4992e1a0601bddbf76fddbf4bb916cf85e:/src/gtk/bitmap.cpp diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp index 46ffd4b0ca..e420d57b51 100644 --- a/src/gtk/bitmap.cpp +++ b/src/gtk/bitmap.cpp @@ -10,33 +10,28 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/defs.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/dcmemory.h" -#include "wx/app.h" -#ifdef __WXGTK20__ #include "wx/rawbmp.h" // need this to get gdk_image_new_bitmap() #define GDK_ENABLE_BROKEN -#endif #include #include #include -#ifdef __WXGTK20__ - #include -#else // GTK+ 1.2 - #include -#endif // GTK+ 2.0/1.2 - -#include "wx/math.h" +#include extern void gdk_wx_draw_bitmap (GdkDrawable *drawable, GdkGC *gc, @@ -88,7 +83,7 @@ wxMask::wxMask( const wxBitmap& bitmap ) wxMask::~wxMask() { if (m_bitmap) - gdk_bitmap_unref( m_bitmap ); + g_object_unref (m_bitmap); } bool wxMask::Create( const wxBitmap& bitmap, @@ -96,7 +91,7 @@ bool wxMask::Create( const wxBitmap& bitmap, { if (m_bitmap) { - gdk_bitmap_unref( m_bitmap ); + g_object_unref (m_bitmap); m_bitmap = (GdkBitmap*) NULL; } @@ -179,7 +174,7 @@ bool wxMask::Create( const wxBitmap& bitmap, gdk_draw_line( m_bitmap, gc, start_x, j, i, j ); } - gdk_gc_unref( gc ); + g_object_unref (gc); return true; } @@ -202,13 +197,13 @@ bool wxMask::Create( const wxBitmap& bitmap ) { if (m_bitmap) { - gdk_bitmap_unref( m_bitmap ); + g_object_unref (m_bitmap); 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 ); @@ -216,9 +211,9 @@ bool wxMask::Create( const wxBitmap& 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; } @@ -239,10 +234,7 @@ public: ~wxBitmapRefData(); GdkPixmap *m_pixmap; - GdkBitmap *m_bitmap; -#ifdef __WXGTK20__ GdkPixbuf *m_pixbuf; -#endif wxMask *m_mask; int m_width; int m_height; @@ -253,10 +245,7 @@ public: wxBitmapRefData::wxBitmapRefData() { m_pixmap = (GdkPixmap *) NULL; - m_bitmap = (GdkBitmap *) NULL; -#ifdef __WXGTK20__ m_pixbuf = (GdkPixbuf *) NULL; -#endif m_mask = (wxMask *) NULL; m_width = 0; m_height = 0; @@ -267,13 +256,9 @@ wxBitmapRefData::wxBitmapRefData() 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) - gdk_pixbuf_unref( m_pixbuf ); -#endif + g_object_unref (m_pixbuf); delete m_mask; #if wxUSE_PALETTE delete m_palette; @@ -282,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) @@ -310,29 +295,21 @@ bool wxBitmap::Create( int width, int height, int depth ) depth = visual->depth; wxCHECK_MSG( (depth == visual->depth) || (depth == 1) || (depth == 32), false, - wxT("invalid bitmap depth") ) + wxT("invalid bitmap depth") ); 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_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ); - M_BMPDATA->m_bpp = 1; - } -#ifdef __WXGTK20__ - 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_bpp = 32; } -#endif else { M_BMPDATA->m_pixmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, depth ); - M_BMPDATA->m_bpp = visual->depth; } return Ok(); @@ -342,7 +319,7 @@ bool wxBitmap::CreateFromXpm( const char **bits ) { UnRef(); - wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") ) + wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") ); GdkVisual *visual = wxTheApp->GetGdkVisual(); @@ -360,7 +337,7 @@ bool wxBitmap::CreateFromXpm( const char **bits ) 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() ? @@ -381,7 +358,6 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, wxBitmap bmp; -#ifdef __WXGTK20__ if (HasPixbuf()) { bmp.SetWidth(width); @@ -397,13 +373,10 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, GDK_INTERP_BILINEAR); } else -#endif // __WXGTK20__ { 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") ); @@ -414,9 +387,9 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, 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(); @@ -429,7 +402,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, char *dst = NULL; long dstbyteperline = 0; - if (GetBitmap()) + if (GetDepth() == 1) { bpp = 1; dstbyteperline = width/8*M_BMPDATA->m_bpp; @@ -471,7 +444,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, old_x = x; } - if (bpp == 1) + if ( dst ) { if (!pixval) { @@ -496,14 +469,14 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, } // do not forget the last byte - if ((bpp == 1) && (width % 8 != 0)) + if ( dst && (width % 8 != 0) ) dst[h*dstbyteperline+width/8] = outbyte; } - gdk_image_destroy( img ); - if (gc) gdk_gc_unref( gc ); + g_object_unref (img); + if (gc) g_object_unref (gc); - if (bpp == 1) + if ( dst ) { bmp = wxBitmap( (const char *)dst, width, height, 1 ); free( dst ); @@ -559,7 +532,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, bmp.SetMask(mask); free( dst ); - gdk_image_destroy( img ); + g_object_unref (img); } free( tablex ); @@ -573,8 +546,8 @@ 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; @@ -587,10 +560,9 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth) } else { -#ifdef __WXGTK20__ if (image.HasAlpha()) return CreateFromImageAsPixbuf(image); -#endif + return CreateFromImageAsPixmap(image); } } @@ -608,7 +580,7 @@ bool wxBitmap::CreateFromImageAsBitmap(const wxImage& img) SetHeight( height ); SetWidth( width ); - SetBitmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) ); + SetPixmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) ); SetDepth( 1 ); @@ -673,12 +645,12 @@ bool wxBitmap::CreateFromImageAsBitmap(const wxImage& img) // 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 @@ -688,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_image_destroy( mask_image ); - gdk_gc_unref( mask_gc ); + g_object_unref (mask_image); + g_object_unref (mask_gc); } return true; @@ -716,77 +688,33 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& img) SetDepth( bpp ); - if ((bpp == 16) && (visual->red_mask != 0xf800)) - bpp = 15; - else if (bpp < 8) - bpp = 8; - - // We handle 8-bit bitmaps ourselves using the colour cube, 12-bit - // visuals are not supported by GDK so we do these ourselves, too. - // 15-bit and 16-bit should actually work and 24-bit certainly does. -#ifdef __sgi - if (!image.HasMask() && (bpp > 16)) -#else - if (!image.HasMask() && (bpp > 12)) -#endif - { - static bool s_hasInitialized = false; - - if (!s_hasInitialized) - { - gdk_rgb_init(); - s_hasInitialized = true; - } - - GdkGC *gc = gdk_gc_new( GetPixmap() ); - - gdk_draw_rgb_image( GetPixmap(), - gc, - 0, 0, - width, height, - GDK_RGB_DITHER_NONE, - image.GetData(), - width*3 ); + GdkGC *gc = gdk_gc_new( GetPixmap() ); - gdk_gc_unref( gc ); - return true; - } + gdk_draw_rgb_image( GetPixmap(), + gc, + 0, 0, + width, height, + GDK_RGB_DITHER_NONE, + image.GetData(), + width*3 ); - // 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; - 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(); @@ -806,136 +734,25 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& img) 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 - // Blit picture - - GdkGC *data_gc = gdk_gc_new( GetPixmap() ); - - gdk_draw_image( GetPixmap(), data_gc, data_image, 0, 0, 0, 0, width, height ); - - gdk_image_destroy( data_image ); - gdk_gc_unref( data_gc ); - // Blit mask - if (image.HasMask()) - { - GdkGC *mask_gc = gdk_gc_new( GetMask()->GetBitmap() ); + 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; } -#ifdef __WXGTK20__ bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image) { int width = image.GetWidth(); @@ -978,7 +795,6 @@ bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image) return true; } -#endif // __WXGTK20__ wxImage wxBitmap::ConvertToImage() const { @@ -995,7 +811,6 @@ wxImage wxBitmap::ConvertToImage() const return wxNullImage; } -#ifdef __WXGTK20__ if (HasPixbuf()) { GdkPixbuf *pixbuf = GetPixbuf(); @@ -1023,7 +838,6 @@ wxImage wxBitmap::ConvertToImage() const } } 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 @@ -1040,12 +854,6 @@ wxImage wxBitmap::ConvertToImage() const 0, 0, GetWidth(), GetHeight() ); } - else if (GetBitmap()) - { - gdk_image = gdk_image_get( GetBitmap(), - 0, 0, - GetWidth(), GetHeight() ); - } else { wxFAIL_MSG( wxT("Ill-formed bitmap") ); @@ -1072,9 +880,9 @@ wxImage wxBitmap::ConvertToImage() const int blue_shift_left = 0; 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(); @@ -1090,7 +898,7 @@ wxImage wxBitmap::ConvertToImage() const use_shift = (visual->type == GDK_VISUAL_TRUE_COLOR) || (visual->type == GDK_VISUAL_DIRECT_COLOR); } - if (GetBitmap()) + else { bpp = 1; } @@ -1157,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; } -wxBitmap::wxBitmap( const wxBitmap& bmp ) - : wxBitmapBase() -{ - Ref( bmp ); -} - wxBitmap::wxBitmap( const wxString &filename, wxBitmapType type ) { LoadFile( filename, type ); @@ -1182,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_BMPDATA->m_bitmap = gdk_bitmap_create_from_data + M_BMPDATA->m_pixmap = gdk_bitmap_create_from_data ( wxGetRootWindow()->window, (gchar *) bits, @@ -1193,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; - wxASSERT_MSG( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") ); + wxASSERT_MSG( M_BMPDATA->m_pixmap, wxT("couldn't create bitmap") ); } } @@ -1201,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; @@ -1223,10 +1017,8 @@ bool wxBitmap::Ok() const { return (m_refData != NULL) && ( -#ifdef __WXGTK20__ M_BMPDATA->m_pixbuf || -#endif - M_BMPDATA->m_bitmap || M_BMPDATA->m_pixmap + M_BMPDATA->m_pixmap ); } @@ -1283,7 +1075,6 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const 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, @@ -1295,24 +1086,23 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const pixbuf, 0, 0); } else -#endif // __WXGTK20__ { - if (ret.GetPixmap()) + if (ret.GetDepth() != 1) { 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 { - 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 ); - 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); } } @@ -1328,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 ); - gdk_gc_destroy( gc ); + g_object_unref (gc); ret.SetMask( mask ); } @@ -1378,7 +1168,7 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type ) 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; } @@ -1439,27 +1229,13 @@ void wxBitmap::SetPixmap( GdkPixmap *pixmap ) m_refData = new wxBitmapRefData(); M_BMPDATA->m_pixmap = pixmap; -#ifdef __WXGTK20__ 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") ); -#ifdef __WXGTK20__ // create the pixmap on the fly if we use Pixbuf representation: if (HasPixbuf() && !HasPixmap()) { @@ -1470,7 +1246,6 @@ GdkPixmap *wxBitmap::GetPixmap() const &M_BMPDATA->m_mask->m_bitmap, 128 /*threshold*/); } -#endif // __WXGTK20__ return M_BMPDATA->m_pixmap; } @@ -1482,14 +1257,6 @@ bool wxBitmap::HasPixmap() const 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") ); @@ -1531,7 +1298,7 @@ GdkPixbuf *wxBitmap::GetPixbuf() const } } - gdk_pixbuf_unref(pmask); + g_object_unref (pmask); } } } @@ -1559,21 +1326,18 @@ void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep) { 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()) { - gdk_pixmap_unref( M_BMPDATA->m_pixmap ); + g_object_unref (M_BMPDATA->m_pixmap); M_BMPDATA->m_pixmap = NULL; } } -#endif // __WXGTK20__ - void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp) { -#ifdef __WXGTK20__ if (bpp != 32) return NULL; @@ -1593,9 +1357,6 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp) data.m_stride = gdk_pixbuf_get_rowstride( pixbuf ); return gdk_pixbuf_get_pixels( pixbuf ); -#else - return NULL; -#endif } void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data)) @@ -1605,18 +1366,12 @@ void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data)) bool wxBitmap::HasAlpha() const { -#ifdef __WXGTK20__ return HasPixbuf(); -#else - return false; -#endif } void wxBitmap::UseAlpha() { -#ifdef __WXGTK20__ GetPixbuf(); -#endif } //-----------------------------------------------------------------------------