X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17a1ebd101f0653e69736416a2a28d0ada423141..7ca4ac63835adef8226b655013a8a84b416c8171:/src/gtk/bitmap.cpp diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp index 1ea0526a59..b04bbe3905 100644 --- 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$ @@ -10,31 +10,27 @@ // 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" +#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 #include "wx/math.h" @@ -71,11 +67,13 @@ wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour ) Create( bitmap, colour ); } +#if wxUSE_PALETTE wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex ) { m_bitmap = (GdkBitmap *) NULL; Create( bitmap, paletteIndex ); } +#endif // wxUSE_PALETTE wxMask::wxMask( const wxBitmap& bitmap ) { @@ -86,7 +84,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, @@ -94,7 +92,7 @@ bool wxMask::Create( const wxBitmap& bitmap, { if (m_bitmap) { - gdk_bitmap_unref( m_bitmap ); + g_object_unref (m_bitmap); m_bitmap = (GdkBitmap*) NULL; } @@ -177,11 +175,12 @@ 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; } +#if wxUSE_PALETTE bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex ) { unsigned char r,g,b; @@ -193,12 +192,13 @@ bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex ) return Create(bitmap, wxColour(r, g, b)); } +#endif // wxUSE_PALETTE bool wxMask::Create( const wxBitmap& bitmap ) { if (m_bitmap) { - gdk_bitmap_unref( m_bitmap ); + g_object_unref (m_bitmap); m_bitmap = (GdkBitmap*) NULL; } @@ -214,7 +214,7 @@ bool wxMask::Create( const wxBitmap& bitmap ) gdk_wx_draw_bitmap( m_bitmap, gc, bitmap.GetBitmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight() ); - gdk_gc_unref( gc ); + g_object_unref (gc); return true; } @@ -236,9 +236,7 @@ public: GdkPixmap *m_pixmap; GdkBitmap *m_bitmap; -#ifdef __WXGTK20__ GdkPixbuf *m_pixbuf; -#endif wxMask *m_mask; int m_width; int m_height; @@ -250,9 +248,7 @@ 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; @@ -263,15 +259,15 @@ wxBitmapRefData::wxBitmapRefData() wxBitmapRefData::~wxBitmapRefData() { if (m_pixmap) - gdk_pixmap_unref( m_pixmap ); + g_object_unref (m_pixmap); if (m_bitmap) - gdk_bitmap_unref( m_bitmap ); -#ifdef __WXGTK20__ + g_object_unref (m_bitmap); if (m_pixbuf) - gdk_pixbuf_unref( m_pixbuf ); -#endif + g_object_unref (m_pixbuf); delete m_mask; +#if wxUSE_PALETTE delete m_palette; +#endif // wxUSE_PALETTE } //----------------------------------------------------------------------------- @@ -304,7 +300,7 @@ 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; @@ -315,14 +311,12 @@ bool wxBitmap::Create( int width, int height, int depth ) 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_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 ); @@ -336,7 +330,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(); @@ -354,7 +348,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() ? @@ -375,7 +369,6 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, wxBitmap bmp; -#ifdef __WXGTK20__ if (HasPixbuf()) { bmp.SetWidth(width); @@ -391,7 +384,6 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, GDK_INTERP_BILINEAR); } else -#endif // __WXGTK20__ { GdkImage *img = (GdkImage*) NULL; if (GetPixmap()) @@ -410,7 +402,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, GdkPixmap *dstpix = NULL; if (GetPixmap()) { - GdkVisual *visual = gdk_window_get_visual( GetPixmap() ); + GdkVisual *visual = gdk_drawable_get_visual( GetPixmap() ); if (visual == NULL) visual = wxTheApp->GetGdkVisual(); @@ -465,7 +457,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, old_x = x; } - if (bpp == 1) + if ( dst ) { if (!pixval) { @@ -490,14 +482,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 ); @@ -553,7 +545,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 ); @@ -567,8 +559,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; @@ -581,10 +573,9 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth) } else { -#ifdef __WXGTK20__ if (image.HasAlpha()) return CreateFromImageAsPixbuf(image); -#endif + return CreateFromImageAsPixmap(image); } } @@ -671,8 +662,8 @@ bool wxBitmap::CreateFromImageAsBitmap(const wxImage& img) gdk_draw_image( GetBitmap(), 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 @@ -682,8 +673,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; @@ -742,7 +733,7 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& img) image.GetData(), width*3 ); - gdk_gc_unref( gc ); + g_object_unref (gc); return true; } @@ -911,8 +902,8 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& img) 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 @@ -922,14 +913,13 @@ bool wxBitmap::CreateFromImageAsPixmap(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; } -#ifdef __WXGTK20__ bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image) { int width = image.GetWidth(); @@ -972,7 +962,6 @@ bool wxBitmap::CreateFromImageAsPixbuf(const wxImage& image) return true; } -#endif // __WXGTK20__ wxImage wxBitmap::ConvertToImage() const { @@ -989,7 +978,6 @@ wxImage wxBitmap::ConvertToImage() const return wxNullImage; } -#ifdef __WXGTK20__ if (HasPixbuf()) { GdkPixbuf *pixbuf = GetPixbuf(); @@ -1017,7 +1005,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 @@ -1068,7 +1055,7 @@ wxImage wxBitmap::ConvertToImage() const if (GetPixmap()) { - GdkVisual *visual = gdk_window_get_visual( GetPixmap() ); + GdkVisual *visual = gdk_drawable_get_visual( GetPixmap() ); if (visual == NULL) visual = wxTheApp->GetGdkVisual(); @@ -1151,19 +1138,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 ); @@ -1195,14 +1176,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; @@ -1217,9 +1190,7 @@ bool wxBitmap::Ok() const { return (m_refData != NULL) && ( -#ifdef __WXGTK20__ M_BMPDATA->m_pixbuf || -#endif M_BMPDATA->m_bitmap || M_BMPDATA->m_pixmap ); } @@ -1277,25 +1248,23 @@ 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, 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 -#endif // __WXGTK20__ { if (ret.GetPixmap()) { GdkGC *gc = gdk_gc_new( ret.GetPixmap() ); - gdk_draw_pixmap( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height ); - gdk_gc_destroy( gc ); + gdk_draw_drawable( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height ); + g_object_unref (gc); } else { @@ -1306,7 +1275,7 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const 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 ); + g_object_unref (gc); } } @@ -1322,7 +1291,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 ); } @@ -1372,7 +1341,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; } @@ -1388,6 +1357,7 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type ) return true; } +#if wxUSE_PALETTE wxPalette *wxBitmap::GetPalette() const { if (!Ok()) @@ -1400,6 +1370,7 @@ void wxBitmap::SetPalette(const wxPalette& WXUNUSED(palette)) { // TODO } +#endif // wxUSE_PALETTE void wxBitmap::SetHeight( int height ) { @@ -1431,9 +1402,7 @@ void wxBitmap::SetPixmap( GdkPixmap *pixmap ) m_refData = new wxBitmapRefData(); M_BMPDATA->m_pixmap = pixmap; -#ifdef __WXGTK20__ PurgeOtherRepresentations(Pixmap); -#endif } void wxBitmap::SetBitmap( GdkPixmap *bitmap ) @@ -1442,16 +1411,13 @@ void wxBitmap::SetBitmap( GdkPixmap *bitmap ) 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()) { @@ -1462,7 +1428,6 @@ GdkPixmap *wxBitmap::GetPixmap() const &M_BMPDATA->m_mask->m_bitmap, 128 /*threshold*/); } -#endif // __WXGTK20__ return M_BMPDATA->m_pixmap; } @@ -1481,7 +1446,6 @@ GdkBitmap *wxBitmap::GetBitmap() const return M_BMPDATA->m_bitmap; } -#ifdef __WXGTK20__ GdkPixbuf *wxBitmap::GetPixbuf() const { wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ); @@ -1523,7 +1487,7 @@ GdkPixbuf *wxBitmap::GetPixbuf() const } } - gdk_pixbuf_unref(pmask); + g_object_unref (pmask); } } } @@ -1551,21 +1515,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; @@ -1585,9 +1546,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)) @@ -1597,18 +1555,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 } //----------------------------------------------------------------------------- @@ -1658,5 +1610,3 @@ bool wxBitmapHandler::SaveFile(const wxBitmap * WXUNUSED(bitmap), { // TODO: Insert handler based on GdkPixbufs handler later } - -