X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5af73080abf2b01f4bbd7c0a27773b49f995932..2240b1aa740739e35e646016511fc8a3302104a4:/src/gtk/bitmap.cpp diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp index 58b54903cf..4a0e1111f1 100644 --- a/src/gtk/bitmap.cpp +++ b/src/gtk/bitmap.cpp @@ -10,15 +10,16 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/dcmemory.h" +#endif #include "wx/bitmap.h" #include "wx/palette.h" #include "wx/icon.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() @@ -173,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 (G_OBJECT (gc)); return true; } @@ -212,7 +213,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 (G_OBJECT (gc)); return true; } @@ -261,7 +262,7 @@ wxBitmapRefData::~wxBitmapRefData() if (m_bitmap) g_object_unref (G_OBJECT (m_bitmap)); if (m_pixbuf) - gdk_pixbuf_unref( m_pixbuf ); + g_object_unref (G_OBJECT (m_pixbuf)); delete m_mask; #if wxUSE_PALETTE delete m_palette; @@ -346,7 +347,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() ? @@ -484,8 +485,8 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, dst[h*dstbyteperline+width/8] = outbyte; } - gdk_image_destroy( img ); - if (gc) gdk_gc_unref( gc ); + g_object_unref (G_OBJECT (img)); + if (gc) g_object_unref (G_OBJECT (gc)); if ( dst ) { @@ -543,7 +544,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, bmp.SetMask(mask); free( dst ); - gdk_image_destroy( img ); + g_object_unref (G_OBJECT (img)); } free( tablex ); @@ -660,8 +661,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 (G_OBJECT (data_image)); + g_object_unref (G_OBJECT (data_gc)); // Blit mask @@ -671,8 +672,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 (G_OBJECT (mask_image)); + g_object_unref (G_OBJECT (mask_gc)); } return true; @@ -731,7 +732,7 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& img) image.GetData(), width*3 ); - gdk_gc_unref( gc ); + g_object_unref (G_OBJECT (gc)); return true; } @@ -900,8 +901,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 (G_OBJECT (data_image)); + g_object_unref (G_OBJECT (data_gc)); // Blit mask @@ -911,8 +912,8 @@ 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 (G_OBJECT (mask_image)); + g_object_unref (G_OBJECT (mask_gc)); } return true; @@ -1136,8 +1137,8 @@ wxImage wxBitmap::ConvertToImage() const } } - gdk_image_destroy( gdk_image ); - if (gdk_image_mask) gdk_image_destroy( gdk_image_mask ); + g_object_unref (G_OBJECT (gdk_image)); + if (gdk_image_mask) g_object_unref (G_OBJECT (gdk_image_mask)); } return image; @@ -1262,7 +1263,7 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const { GdkGC *gc = gdk_gc_new( ret.GetPixmap() ); gdk_draw_drawable( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height ); - gdk_gc_destroy( gc ); + g_object_unref (G_OBJECT (gc)); } else { @@ -1273,7 +1274,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 (G_OBJECT (gc)); } } @@ -1289,7 +1290,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 (G_OBJECT (gc)); ret.SetMask( mask ); } @@ -1339,7 +1340,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; } @@ -1485,7 +1486,7 @@ GdkPixbuf *wxBitmap::GetPixbuf() const } } - gdk_pixbuf_unref(pmask); + g_object_unref (G_OBJECT (pmask)); } } } @@ -1513,7 +1514,7 @@ void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep) { if (keep == Pixmap && HasPixbuf()) { - gdk_pixbuf_unref( M_BMPDATA->m_pixbuf ); + g_object_unref (G_OBJECT (M_BMPDATA->m_pixbuf)); M_BMPDATA->m_pixbuf = NULL; } if (keep == Pixbuf && HasPixmap())