X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f38924e863cd44e2abd49d20d201d72aa773c51e..c8326d649c00a47d3e77770a8e0a0a3b7ead56bb:/src/gtk/bitmap.cpp diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp index 4a0e1111f1..b04bbe3905 100644 --- a/src/gtk/bitmap.cpp +++ b/src/gtk/bitmap.cpp @@ -10,14 +10,15 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/bitmap.h" + #ifndef WX_PRECOMP #include "wx/app.h" #include "wx/dcmemory.h" + #include "wx/palette.h" + #include "wx/icon.h" #endif -#include "wx/bitmap.h" -#include "wx/palette.h" -#include "wx/icon.h" #include "wx/filefn.h" #include "wx/image.h" @@ -83,7 +84,7 @@ wxMask::wxMask( const wxBitmap& bitmap ) wxMask::~wxMask() { if (m_bitmap) - g_object_unref (G_OBJECT (m_bitmap)); + g_object_unref (m_bitmap); } bool wxMask::Create( const wxBitmap& bitmap, @@ -91,7 +92,7 @@ bool wxMask::Create( const wxBitmap& bitmap, { if (m_bitmap) { - g_object_unref (G_OBJECT (m_bitmap)); + g_object_unref (m_bitmap); m_bitmap = (GdkBitmap*) NULL; } @@ -174,7 +175,7 @@ bool wxMask::Create( const wxBitmap& bitmap, gdk_draw_line( m_bitmap, gc, start_x, j, i, j ); } - g_object_unref (G_OBJECT (gc)); + g_object_unref (gc); return true; } @@ -197,7 +198,7 @@ bool wxMask::Create( const wxBitmap& bitmap ) { if (m_bitmap) { - g_object_unref (G_OBJECT (m_bitmap)); + g_object_unref (m_bitmap); m_bitmap = (GdkBitmap*) NULL; } @@ -213,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() ); - g_object_unref (G_OBJECT (gc)); + g_object_unref (gc); return true; } @@ -258,11 +259,11 @@ wxBitmapRefData::wxBitmapRefData() wxBitmapRefData::~wxBitmapRefData() { if (m_pixmap) - g_object_unref (G_OBJECT (m_pixmap)); + g_object_unref (m_pixmap); if (m_bitmap) - g_object_unref (G_OBJECT (m_bitmap)); + g_object_unref (m_bitmap); if (m_pixbuf) - g_object_unref (G_OBJECT (m_pixbuf)); + g_object_unref (m_pixbuf); delete m_mask; #if wxUSE_PALETTE delete m_palette; @@ -485,8 +486,8 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, 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 ) { @@ -544,7 +545,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, bmp.SetMask(mask); free( dst ); - g_object_unref (G_OBJECT (img)); + g_object_unref (img); } free( tablex ); @@ -661,8 +662,8 @@ bool wxBitmap::CreateFromImageAsBitmap(const wxImage& img) gdk_draw_image( GetBitmap(), 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 @@ -672,8 +673,8 @@ bool wxBitmap::CreateFromImageAsBitmap(const wxImage& img) 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; @@ -732,7 +733,7 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& img) image.GetData(), width*3 ); - g_object_unref (G_OBJECT (gc)); + g_object_unref (gc); return true; } @@ -901,8 +902,8 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& img) 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 @@ -912,8 +913,8 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& img) 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; @@ -1137,8 +1138,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; @@ -1263,7 +1264,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 ); - g_object_unref (G_OBJECT (gc)); + g_object_unref (gc); } else { @@ -1274,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 ); - g_object_unref (G_OBJECT (gc)); + g_object_unref (gc); } } @@ -1290,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 ); - g_object_unref (G_OBJECT (gc)); + g_object_unref (gc); ret.SetMask( mask ); } @@ -1486,7 +1487,7 @@ GdkPixbuf *wxBitmap::GetPixbuf() const } } - g_object_unref (G_OBJECT (pmask)); + g_object_unref (pmask); } } } @@ -1514,12 +1515,12 @@ void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep) { 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()) { - g_object_unref (G_OBJECT (M_BMPDATA->m_pixmap)); + g_object_unref (M_BMPDATA->m_pixmap); M_BMPDATA->m_pixmap = NULL; } }