add a scoped_ptr-like wxGtkObject class which calls g_object_unref() automatically...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/private/object.h b/include/wx/gtk/private/object.h
new file mode 100644 (file)
index 0000000..404dc08
--- /dev/null
+++ b/include/wx/gtk/private/object.h
@@ -0,0 +1,36 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/gtk/private/object.h
+// Purpose:     wxGtkObject class declaration
+// Author:      Vadim Zeitlin
+// Created:     2008-08-27
+// RCS-ID:      $Id$
+// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwindows.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_GTK_PRIVATE_OBJECT_H_
+#define _WX_GTK_PRIVATE_OBJECT_H_
+
+// ----------------------------------------------------------------------------
+// Convenience class for calling g_object_unref() automatically
+// ----------------------------------------------------------------------------
+
+template <typename T>
+class wxGtkObject
+{
+public:
+    explicit wxGtkObject(T *p) : m_ptr(p) { }
+    ~wxGtkObject() { g_object_unref(m_ptr); }
+
+    operator T *() const { return m_ptr; }
+
+private:
+    T * const m_ptr;
+
+    // copying could be implemented by using g_object_ref() but for now there
+    // is no need for it so don't implement it
+    DECLARE_NO_COPY_CLASS(wxGtkObject)
+};
+
+#endif // _WX_GTK_PRIVATE_OBJECT_H_
+

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index cd556674cf9b822e2468c5a8e82ac512a69f4946..88d5a0d6d8d6a0ce34f3372255218fb2d5a48304 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -23,6 +23,8 @@
 
 #include "wx/rawbmp.h"
 
 
 #include "wx/rawbmp.h"
 

+#include "wx/gtk/private/object.h"
+

 #include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 #include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------


@@ -164,10 +166,9 @@ bool wxMask::Create( const wxBitmap& bitmap )
 
     if (!m_bitmap) return false;
 
 
     if (!m_bitmap) return false;
 

-    GdkGC *gc = gdk_gc_new( m_bitmap );
+    wxGtkObject<GdkGC> gc(gdk_gc_new( m_bitmap ));

     gdk_gc_set_function(gc, GDK_COPY_INVERT);
     gdk_draw_drawable(m_bitmap, gc, bitmap.GetPixmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight());
     gdk_gc_set_function(gc, GDK_COPY_INVERT);
     gdk_draw_drawable(m_bitmap, gc, bitmap.GetPixmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight());

-    g_object_unref (gc);

 
     return true;
 }
 
     return true;
 }


@@ -413,12 +414,11 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth)
     else
     {
         SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, w, h, depth));
     else
     {
         SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, w, h, depth));

-        GdkGC* gc = gdk_gc_new(M_BMPDATA->m_pixmap);
+        wxGtkObject<GdkGC> gc(gdk_gc_new(M_BMPDATA->m_pixmap));

         gdk_draw_rgb_image(
             M_BMPDATA->m_pixmap, gc,
             0, 0, w, h,
             GDK_RGB_DITHER_NONE, image.GetData(), w * 3);
         gdk_draw_rgb_image(
             M_BMPDATA->m_pixmap, gc,
             0, 0, w, h,
             GDK_RGB_DITHER_NONE, image.GetData(), w * 3);

-        g_object_unref(gc);

     }
 
     const wxByte* alpha = image.GetAlpha();
     }
 
     const wxByte* alpha = image.GetAlpha();


@@ -541,10 +541,9 @@ wxImage wxBitmap::ConvertToImage() const
         {
             // mono bitmaps are inverted, i.e. 0 is white
             pixmap_invert = gdk_pixmap_new(pixmap, w, h, 1);
         {
             // mono bitmaps are inverted, i.e. 0 is white
             pixmap_invert = gdk_pixmap_new(pixmap, w, h, 1);

-            GdkGC* gc = gdk_gc_new(pixmap_invert);
+            wxGtkObject<GdkGC> gc(gdk_gc_new(pixmap_invert));

             gdk_gc_set_function(gc, GDK_COPY_INVERT);
             gdk_draw_drawable(pixmap_invert, gc, pixmap, 0, 0, 0, 0, w, h);
             gdk_gc_set_function(gc, GDK_COPY_INVERT);
             gdk_draw_drawable(pixmap_invert, gc, pixmap, 0, 0, 0, 0, w, h);

-            g_object_unref(gc);

             pixmap = pixmap_invert;
         }
         // create a pixbuf which shares data with the wxImage
             pixmap = pixmap_invert;
         }
         // create a pixbuf which shares data with the wxImage


@@ -664,9 +663,8 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
     else
     {
         ret.Create(rect.width, rect.height, M_BMPDATA->m_bpp);
     else
     {
         ret.Create(rect.width, rect.height, M_BMPDATA->m_bpp);

-        GdkGC *gc = gdk_gc_new( ret.GetPixmap() );
+        wxGtkObject<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_draw_drawable( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );

-        g_object_unref (gc);

     }
     // make mask, unless there is already alpha
     if (GetMask() && !HasAlpha())
     }
     // make mask, unless there is already alpha
     if (GetMask() && !HasAlpha())


@@ -674,9 +672,8 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
         wxMask *mask = new wxMask;
         mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, rect.width, rect.height, 1 );
 
         wxMask *mask = new wxMask;
         mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, rect.width, rect.height, 1 );
 

-        GdkGC *gc = gdk_gc_new( mask->m_bitmap );
+        wxGtkObject<GdkGC> gc(gdk_gc_new( mask->m_bitmap ));

         gdk_draw_drawable(mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, rect.x, rect.y, 0, 0, rect.width, rect.height);
         gdk_draw_drawable(mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, rect.x, rect.y, 0, 0, rect.width, rect.height);

-        g_object_unref (gc);

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


@@ -938,10 +935,9 @@ wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const
             oldRef->m_pixmap, oldRef->m_width, oldRef->m_height,
             // use pixmap depth, m_bpp may not match
             gdk_drawable_get_depth(oldRef->m_pixmap));
             oldRef->m_pixmap, oldRef->m_width, oldRef->m_height,
             // use pixmap depth, m_bpp may not match
             gdk_drawable_get_depth(oldRef->m_pixmap));

-        GdkGC* gc = gdk_gc_new(newRef->m_pixmap);
+        wxGtkObject<GdkGC> gc(gdk_gc_new(newRef->m_pixmap));

         gdk_draw_drawable(
             newRef->m_pixmap, gc, oldRef->m_pixmap, 0, 0, 0, 0, -1, -1);
         gdk_draw_drawable(
             newRef->m_pixmap, gc, oldRef->m_pixmap, 0, 0, 0, 0, -1, -1);

-        g_object_unref(gc);

     }
     if (oldRef->m_pixbuf != NULL)
     {
     }
     if (oldRef->m_pixbuf != NULL)
     {


@@ -952,10 +948,9 @@ wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const
         newRef->m_mask = new wxMask;
         newRef->m_mask->m_bitmap = gdk_pixmap_new(
             oldRef->m_mask->m_bitmap, oldRef->m_width, oldRef->m_height, 1);
         newRef->m_mask = new wxMask;
         newRef->m_mask->m_bitmap = gdk_pixmap_new(
             oldRef->m_mask->m_bitmap, oldRef->m_width, oldRef->m_height, 1);

-        GdkGC* gc = gdk_gc_new(newRef->m_mask->m_bitmap);
+        wxGtkObject<GdkGC> gc(gdk_gc_new(newRef->m_mask->m_bitmap));

         gdk_draw_drawable(newRef->m_mask->m_bitmap,
             gc, oldRef->m_mask->m_bitmap, 0, 0, 0, 0, -1, -1);
         gdk_draw_drawable(newRef->m_mask->m_bitmap,
             gc, oldRef->m_mask->m_bitmap, 0, 0, 0, 0, -1, -1);

-        g_object_unref(gc);

     }
 #if wxUSE_PALETTE
     // implement this if SetPalette is ever implemented
     }
 #if wxUSE_PALETTE
     // implement this if SetPalette is ever implemented

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 1c3227b106635e978f51055176f79a691f6e0b8c..1ce082df0d3cc458ca1372c6632c1898af686969 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -28,6 +28,7 @@
 #include "wx/fontutil.h"
 
 #include "wx/gtk/private.h"
 #include "wx/fontutil.h"
 
 #include "wx/gtk/private.h"

+#include "wx/gtk/private/object.h"

 
 #include <gdk/gdkx.h>
 
 
 #include <gdk/gdkx.h>
 


@@ -1000,18 +1001,15 @@ void wxWindowDCImpl::DoDrawMonoBitmap(const wxBitmap& bitmap,
                                       int xdest, int ydest,
                                       int width, int height)
 {
                                       int xdest, int ydest,
                                       int width, int height)
 {

-    GdkPixmap *bitmap2
-        = gdk_pixmap_new( wxGetRootWindow()->window, bmp_w, bmp_h, -1 );
-    GdkGC *gc = gdk_gc_new( bitmap2 );
+    wxGtkObject<GdkPixmap>
+        bitmap2(gdk_pixmap_new( wxGetRootWindow()->window, bmp_w, bmp_h, -1 ));
+    wxGtkObject<GdkGC> gc(gdk_gc_new( bitmap2 ));

     gdk_gc_set_foreground( gc, m_textForegroundColour.GetColor() );
     gdk_gc_set_background( gc, m_textBackgroundColour.GetColor() );
     gdk_wx_draw_bitmap(bitmap2, gc, bitmap.GetPixmap(), 0, 0);
 
     gdk_draw_drawable(m_gdkwindow, m_textGC, bitmap2, xsrc, ysrc, xdest, ydest,
                       width, height);
     gdk_gc_set_foreground( gc, m_textForegroundColour.GetColor() );
     gdk_gc_set_background( gc, m_textBackgroundColour.GetColor() );
     gdk_wx_draw_bitmap(bitmap2, gc, bitmap.GetPixmap(), 0, 0);
 
     gdk_draw_drawable(m_gdkwindow, m_textGC, bitmap2, xsrc, ysrc, xdest, ydest,
                       width, height);

-
-    g_object_unref (bitmap2);
-    g_object_unref (gc);

 }
 
 // Returns a new mask that is the intersection of the old mask
 }
 
 // Returns a new mask that is the intersection of the old mask


@@ -1026,7 +1024,7 @@ GdkBitmap* wxWindowDCImpl::GetClippedMask(GdkBitmap* mask, int w, int h,
     GdkColor c0, c1;
     c0.pixel = 0;
     c1.pixel = 1;
     GdkColor c0, c1;
     c0.pixel = 0;
     c1.pixel = 1;

-    GdkGC *gc = gdk_gc_new( new_mask );
+    wxGtkObject<GdkGC> gc(gdk_gc_new( new_mask ));

 
     // zero-ing new_mask
     gdk_gc_set_foreground( gc, &c0 );
 
     // zero-ing new_mask
     gdk_gc_set_foreground( gc, &c0 );


@@ -1044,7 +1042,6 @@ GdkBitmap* wxWindowDCImpl::GetClippedMask(GdkBitmap* mask, int w, int h,
     gdk_gc_set_stipple( gc, mask );
     gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, w, h );
 
     gdk_gc_set_stipple( gc, mask );
     gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, w, h );
 

-    g_object_unref (gc);

     return new_mask;
 }
 
     return new_mask;
 }