gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgdkpangorenderer.c

@@ -1,22 +1,33 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgdkpangorenderer.c -
-
-  $Author: mutoh $
-  $Date: 2005/02/12 16:03:46 $
-
-  Copyright (C) 2005 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2005  Masao Mutoh
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
 #include "global.h"
 
 #if GTK_CHECK_VERSION(2,6,0)
 
+#define RG_TARGET_NAMESPACE cPangoRenderer
 #define _SELF(s) (GDK_PANGO_RENDERER(RVAL2GOBJ(s)))
 
 static VALUE
-prenderer_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE screen;
     GdkScreen* gscreen;
@@ -35,7 +46,7 @@ prenderer_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-prenderer_s_get_default(int argc, VALUE *argv, VALUE self)
+rg_s_get_default(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
     VALUE screen;
     GdkScreen* gscreen;
@@ -51,14 +62,14 @@ prenderer_s_get_default(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-prenderer_s_default(VALUE self)
+rg_s_default(G_GNUC_UNUSED VALUE self)
 {
     GdkScreen* gscreen = gdk_screen_get_default();
     return GOBJ2RVAL(gdk_pango_renderer_get_default(gscreen));
 }
 
 static VALUE
-prenderer_set_drawable(VALUE self, VALUE drawable)
+rg_set_drawable(VALUE self, VALUE drawable)
 {
     gdk_pango_renderer_set_drawable(_SELF(self), 
                                     GDK_DRAWABLE(RVAL2GOBJ(drawable)));
@@ -66,56 +77,73 @@ prenderer_set_drawable(VALUE self, VALUE drawable)
 }
 
 static VALUE
-prenderer_set_gc(VALUE self, VALUE gc)
+rg_set_gc(VALUE self, VALUE gc)
 {
     gdk_pango_renderer_set_gc(_SELF(self), 
                               NIL_P(gc) ? NULL : GDK_GC(RVAL2GOBJ(gc)));
     return self;
 }
 
+#ifdef HAVE_PANGO_RENDER_PART_GET_TYPE
 static VALUE
-prenderer_set_stipple(VALUE self, VALUE part, VALUE stipple)
+rg_set_stipple(VALUE self, VALUE part, VALUE stipple)
 {
-#if HAVE_PANGO_RENDER_PART_GET_TYPE
     gdk_pango_renderer_set_stipple(_SELF(self), RVAL2GENUM(part, PANGO_TYPE_RENDER_PART),
                                    NIL_P(stipple) ? NULL : GDK_BITMAP(RVAL2GOBJ(stipple)));
+
+    return self;
+}
 #else
-      rb_warning("Gdk::PangoRender#set_tipple is not supported (Require pango-1.8.1 or later");
-#endif
+static VALUE
+prenderer_set_stipple(G_GNUC_UNUSED VALUE self,
+                      G_GNUC_UNUSED VALUE part,
+                      G_GNUC_UNUSED VALUE stipple)
+{
+    rb_warning("Gdk::PangoRender#set_tipple is not supported (Require pango-1.8.1 or later");
+
     return self;
 }
+#endif
 
+#ifdef HAVE_PANGO_RENDER_PART_GET_TYPE
 static VALUE
-prenderer_set_override_color(VALUE self, VALUE part, VALUE color)
+rg_set_override_color(VALUE self, VALUE part, VALUE color)
 {
-#if HAVE_PANGO_RENDER_PART_GET_TYPE
-    gdk_pango_renderer_set_override_color(_SELF(self), 
+    gdk_pango_renderer_set_override_color(_SELF(self),
                                           RVAL2GENUM(part, PANGO_TYPE_RENDER_PART),
                                           RVAL2GDKCOLOR(color));
+
+    return self;
+}
 #else
-      rb_warning("Gdk::PangoRender#set_override_color is not supported (Require pango-1.8.1 or later");
-#endif
+static VALUE
+prenderer_set_override_color(G_GNUC_UNUSED VALUE self,
+                             G_GNUC_UNUSED VALUE part,
+                             G_GNUC_UNUSED VALUE color)
+{
+    rb_warning("Gdk::PangoRender#set_override_color is not supported (Require pango-1.8.1 or later");
+
     return self;
 }
 #endif
 
+#endif
+
 void
-Init_gtk_gdk_pangorenderer()
+Init_gtk_gdk_pangorenderer(VALUE mGdk)
 {
 #if GTK_CHECK_VERSION(2,6,0)
-    VALUE renderer = G_DEF_CLASS(GDK_TYPE_PANGO_RENDERER, "PangoRenderer", mGdk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_PANGO_RENDERER, "PangoRenderer", mGdk);
 
-    rb_define_method(renderer, "initialize", prenderer_initialize, -1);
-    rb_define_method(renderer, "set_drawable", prenderer_set_drawable, 1);
-    rb_define_method(renderer, "set_gc", prenderer_set_gc, 1);
-    rb_define_method(renderer, "set_stipple", prenderer_set_stipple, 2);
-    rb_define_method(renderer, "set_override_color", prenderer_set_override_color, 2);
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD(set_drawable, 1);
+    RG_DEF_METHOD(set_gc, 1);
+    RG_DEF_METHOD(set_stipple, 2);
+    RG_DEF_METHOD(set_override_color, 2);
 
-    rb_define_singleton_method(renderer, "get_default", prenderer_s_get_default, -1);
-    rb_define_singleton_method(renderer, "default", prenderer_s_default, 0);
+    RG_DEF_SMETHOD(get_default, -1);
+    RG_DEF_SMETHOD(default, 0);
 
-    G_DEF_SETTERS(renderer);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 #endif
 }
-
-

data/ext/gtk2/rbgdkpixbuf.c

@@ -1,20 +1,31 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgdkpixbuf.c -
-
-  $Author: ktou $
-  $Date: 2006/10/14 04:59:14 $
-
-  Copyright (C) 2002,2003 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 Masao Mutoh
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE cPixbuf
 #define _SELF(s) GDK_PIXBUF(RVAL2GOBJ(s)) 
 
 static VALUE
-pixbuf_render_threshold_alpha(VALUE self, VALUE bitmap, VALUE src_x, VALUE src_y, VALUE dest_x, VALUE dest_y, VALUE width, VALUE height, VALUE alpha_threshold)
+rg_render_threshold_alpha(VALUE self, VALUE bitmap, VALUE src_x, VALUE src_y, VALUE dest_x, VALUE dest_y, VALUE width, VALUE height, VALUE alpha_threshold)
 {
     gdk_pixbuf_render_threshold_alpha(_SELF(self), GDK_BITMAP(RVAL2GOBJ(bitmap)),
                                       NUM2INT(src_x), NUM2INT(src_y),
@@ -25,7 +36,7 @@ pixbuf_render_threshold_alpha(VALUE self, VALUE bitmap, VALUE src_x, VALUE src_y
 }
 
 static VALUE
-pixbuf_render_to_drawable(int argc, VALUE *argv, VALUE self)
+rg_render_to_drawable(int argc, VALUE *argv, VALUE self)
 {
     VALUE gc, src_x, src_y, dest_x, dest_y, width, height,
         dither, x_dither, y_dither;
@@ -53,9 +64,9 @@ pixbuf_render_to_drawable(int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eArgError, "arguments 7 must be non nil");
 
     gdk_pixbuf_render_to_drawable(_SELF(self),
-				  GDK_DRAWABLE(RVAL2GOBJ(self)),
-				  GDK_GC(RVAL2GOBJ(gc)),
-				  NUM2INT(src_x), NUM2INT(src_y),
+                                  GDK_DRAWABLE(RVAL2GOBJ(self)),
+                                  GDK_GC(RVAL2GOBJ(gc)),
+                                  NUM2INT(src_x), NUM2INT(src_y),
                                   NUM2INT(dest_x), NUM2INT(dest_y),
                                   NUM2INT(width), NUM2INT(height),
                                   NIL_P(dither) ? GDK_RGB_DITHER_NONE : RVAL2GENUM(dither, GDK_TYPE_RGB_DITHER),
@@ -65,7 +76,7 @@ pixbuf_render_to_drawable(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-pixbuf_render_pixmap_and_mask(int argc, VALUE *argv, VALUE self)
+rg_render_pixmap_and_mask(int argc, VALUE *argv, VALUE self)
 {
     VALUE colormap_or_alpha, alpha;
     GdkPixmap *pixmap;
@@ -93,7 +104,7 @@ pixbuf_render_pixmap_and_mask(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-pixbuf_s_from_drawable(int argc, VALUE *argv, VALUE self)
+rg_s_from_drawable(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
     VALUE cmap, src, src_x, src_y, width, height, dest, dest_x, dest_y;
     GdkPixbuf* buf;
@@ -118,9 +129,9 @@ pixbuf_s_from_drawable(int argc, VALUE *argv, VALUE self)
         return dest;
     }
 }
- 
+
 static VALUE
-pixbuf_s_from_image(int argc, VALUE *argv, VALUE self)
+rg_s_from_image(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
     VALUE cmap, src, src_x, src_y, width, height, dest, dest_x, dest_y;
     GdkPixbuf* buf;
@@ -147,17 +158,17 @@ pixbuf_s_from_image(int argc, VALUE *argv, VALUE self)
 }
 
 void
-Init_gtk_gdk_pixbuf()
+Init_gtk_gdk_pixbuf(VALUE mGdk)
 {
     /*
      *  This defines Gdk::Pixbuf methods of GDK side.
      */
-    VALUE gdkPixbuf = GTYPE2CLASS(GDK_TYPE_PIXBUF);
+    VALUE RG_TARGET_NAMESPACE = GTYPE2CLASS(GDK_TYPE_PIXBUF);
 
-    rb_define_method(gdkPixbuf, "render_threshold_alpha", pixbuf_render_threshold_alpha, 8);
-    rb_define_method(gdkPixbuf, "render_to_drawable", pixbuf_render_to_drawable, -1);
-    rb_define_method(gdkPixbuf, "render_pixmap_and_mask", pixbuf_render_pixmap_and_mask, -1);
+    RG_DEF_METHOD(render_threshold_alpha, 8);
+    RG_DEF_METHOD(render_to_drawable, -1);
+    RG_DEF_METHOD(render_pixmap_and_mask, -1);
 
-    rb_define_singleton_method(gdkPixbuf, "from_drawable", pixbuf_s_from_drawable, -1);
-    rb_define_singleton_method(gdkPixbuf, "from_image", pixbuf_s_from_image, -1);
+    RG_DEF_SMETHOD(from_drawable, -1);
+    RG_DEF_SMETHOD(from_image, -1);
 }

data/ext/gtk2/rbgdkpixmap.c

@@ -1,39 +1,51 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgdkpixmap.c -
-
-  $Author: mutoh $
-  $Date: 2006/11/25 17:50:41 $
-
-  Copyright (C) 2002-2004 Ruby-GNOME2 Project Team
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2004 Ruby-GNOME2 Project Team
+ *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
+ *                          Daisuke Kanda,
+ *                          Hiroshi Igarashi
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
 #include "global.h"
 #ifdef HAVE_XREADBITMAPFILEDATA
 #include <X11/Xlib.h>
 #endif /* HAVE_XREADBITMAPFILEDATA */
 
+#define RG_TARGET_NAMESPACE cPixmap
+
 static VALUE
-gdkpmap_initialize(VALUE self, VALUE win, VALUE w, VALUE h, VALUE depth)
+rg_initialize(VALUE self, VALUE win, VALUE w, VALUE h, VALUE depth)
 {
-	G_INITIALIZE(self, gdk_pixmap_new(GDK_WINDOW(RVAL2GOBJ(win)), 
-                                          NUM2INT(w), NUM2INT(h), 
-                                          NUM2INT(depth)));
-	return Qnil;
+    G_INITIALIZE(self, gdk_pixmap_new(GDK_WINDOW(RVAL2GOBJ(win)), 
+                                      NUM2INT(w), NUM2INT(h), 
+                                      NUM2INT(depth)));
+    return Qnil;
 }
 
 static VALUE
-gdkpmap_create_from_data(int argc, VALUE *argv, VALUE self)
+rg_s_create_from_data(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
     VALUE win, data, w, h, depth, fg, bg, ret;
 
     rb_scan_args(argc, argv, "43", &win, &data, &w, &h, &depth, &fg, &bg);
 
-    Check_Type(data, T_STRING);
+    StringValue(data);
     if (NIL_P(depth)){
         ret = GOBJ2RVAL(gdk_bitmap_create_from_data(NIL_P(win) ? NULL : GDK_WINDOW(RVAL2GOBJ(win)),
                                                     RVAL2CSTR(data), NUM2INT(w), NUM2INT(h)));
@@ -41,14 +53,14 @@ gdkpmap_create_from_data(int argc, VALUE *argv, VALUE self)
         ret = GOBJ2RVAL(gdk_pixmap_create_from_data(NIL_P(win) ? NULL : GDK_WINDOW(RVAL2GOBJ(win)),
                                                     RVAL2CSTR(data), NUM2INT(w), NUM2INT(h), 
                                                     NUM2INT(depth),
-						    RVAL2GDKCOLOR(fg),
-						    RVAL2GDKCOLOR(bg)));
+                                                    RVAL2GDKCOLOR(fg),
+                                                    RVAL2GDKCOLOR(bg)));
     }
     return ret;
 }
 
 static VALUE
-gdkpmap_create_from_xpm(VALUE self, VALUE win, VALUE color, VALUE fname)
+rg_s_create_from_xpm(G_GNUC_UNUSED VALUE self, VALUE win, VALUE color, VALUE fname)
 {
     GdkPixmap *result;
     GdkBitmap *mask;
@@ -64,7 +76,7 @@ gdkpmap_create_from_xpm(VALUE self, VALUE win, VALUE color, VALUE fname)
 }
 
 static VALUE
-gdkpmap_create_from_xpm_d(VALUE self, VALUE win, VALUE tcolor, VALUE data)
+rg_s_create_from_xpm_d(G_GNUC_UNUSED VALUE self, VALUE win, VALUE tcolor, VALUE data)
 {
     GdkPixmap *result;
     GdkBitmap *mask;
@@ -81,7 +93,7 @@ gdkpmap_create_from_xpm_d(VALUE self, VALUE win, VALUE tcolor, VALUE data)
 }
 
 static VALUE
-gdkpmap_colormap_create_from_xpm(VALUE self, VALUE win, VALUE colormap, VALUE tcolor, VALUE fname)
+rg_s_colormap_create_from_xpm(G_GNUC_UNUSED VALUE self, VALUE win, VALUE colormap, VALUE tcolor, VALUE fname)
 {
     GdkPixmap *result;
     GdkBitmap *mask;
@@ -98,7 +110,7 @@ gdkpmap_colormap_create_from_xpm(VALUE self, VALUE win, VALUE colormap, VALUE tc
 }
 
 static VALUE
-gdkpmap_colormap_create_from_xpm_d(VALUE self, VALUE win, VALUE colormap, VALUE tcolor, VALUE data)
+rg_s_colormap_create_from_xpm_d(G_GNUC_UNUSED VALUE self, VALUE win, VALUE colormap, VALUE tcolor, VALUE data)
 {
     GdkPixmap *result;
     GdkBitmap *mask;
@@ -115,14 +127,14 @@ gdkpmap_colormap_create_from_xpm_d(VALUE self, VALUE win, VALUE colormap, VALUE
 
 #ifdef HAVE_XREADBITMAPFILEDATA
 static VALUE
-gdkpmap_create_from_xbm(VALUE self, VALUE win, VALUE fname)
+rg_s_create_from_xbm(VALUE self, VALUE win, VALUE fname)
 {
     GdkBitmap *new;
     unsigned char *data;
     unsigned int width, height;
     int x, y;
 
-    Check_Type(fname, T_STRING);
+    StringValue(fname);
     if (XReadBitmapFileData(RVAL2CSTR(fname), &width, &height, &data, &x, &y))
         rb_raise(rb_eArgError, "Bitmap not created from %s", RVAL2CSTR(fname));
 
@@ -141,13 +153,13 @@ gdkpmap_create_from_xbm(VALUE self, VALUE win, VALUE fname)
  */
 
 static VALUE
-gdkpmap_foreign_new(int argc, VALUE *argv, VALUE self)
+rg_s_foreign_new(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
     VALUE arg[5];
     GdkPixmap* win = NULL;
-    
+
     rb_scan_args(argc, argv, "14", &arg[0], &arg[1], &arg[2], &arg[3], &arg[4]);
-    
+
     switch(argc)
         {
         case 1:
@@ -174,31 +186,35 @@ gdkpmap_foreign_new(int argc, VALUE *argv, VALUE self)
             rb_warn("Not supported. GTK+-2.10.0 or later.");
 #endif
             break;
+        default:
+            break;
         }
     return win ? GOBJ2RVAL(win) : Qnil;
 }
 
 static VALUE
-gdkpmap_lookup(int argc, VALUE *argv, VALUE self)
+rg_s_lookup(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
     VALUE arg[2];
     GdkPixmap* win = NULL;
-    
+
     rb_scan_args(argc, argv, "11", &arg[0], &arg[1]);
 
     switch(argc)
     {
       case 1:
-    	win = gdk_pixmap_lookup(RVAL2GDKNATIVEWINDOW(arg[0]));
-	break;
+        win = gdk_pixmap_lookup(RVAL2GDKNATIVEWINDOW(arg[0]));
+        break;
       case 2:
 #if GTK_CHECK_VERSION(2,2,0)
-    	win = gdk_pixmap_lookup_for_display(RVAL2GOBJ(arg[0]), RVAL2GDKNATIVEWINDOW(arg[1])); 
+        win = gdk_pixmap_lookup_for_display(RVAL2GOBJ(arg[0]), RVAL2GDKNATIVEWINDOW(arg[1])); 
 #else
-    	win = gdk_pixmap_lookup(RVAL2GDKNATIVEWINDOW(arg[1])); 
+        win = gdk_pixmap_lookup(RVAL2GDKNATIVEWINDOW(arg[1])); 
         rb_warn("Not supported in GTK+-2.0.x.");
 #endif
-    	break;
+        break;
+    default:
+        break;
     }
     if (win == NULL)
         return Qnil;
@@ -208,18 +224,18 @@ gdkpmap_lookup(int argc, VALUE *argv, VALUE self)
 }
 
 void
-Init_gtk_gdk_pixmap()
+Init_gtk_gdk_pixmap(VALUE mGdk)
 {
-    VALUE gdkPixmap = G_DEF_CLASS(GDK_TYPE_PIXMAP, "Pixmap", mGdk);
-
-    rb_define_method(gdkPixmap, "initialize", gdkpmap_initialize, 4);
-    rb_define_singleton_method(gdkPixmap, "create_from_data", gdkpmap_create_from_data, -1);
-    rb_define_singleton_method(gdkPixmap, "create_from_xpm", gdkpmap_create_from_xpm, 3);
-    rb_define_singleton_method(gdkPixmap, "create_from_xpm_d", gdkpmap_create_from_xpm_d, 3);
-    rb_define_singleton_method(gdkPixmap, "colormap_create_from_xpm", gdkpmap_colormap_create_from_xpm, 4);
-    rb_define_singleton_method(gdkPixmap, "colormap_create_from_xpm_d", gdkpmap_colormap_create_from_xpm_d, 4);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_PIXMAP, "Pixmap", mGdk);
+
+    RG_DEF_METHOD(initialize, 4);
+    RG_DEF_SMETHOD(create_from_data, -1);
+    RG_DEF_SMETHOD(create_from_xpm, 3);
+    RG_DEF_SMETHOD(create_from_xpm_d, 3);
+    RG_DEF_SMETHOD(colormap_create_from_xpm, 4);
+    RG_DEF_SMETHOD(colormap_create_from_xpm_d, 4);
 #ifdef HAVE_XREADBITMAPFILEDATA
-    rb_define_singleton_method(gdkPixmap, "create_from_xbm", gdkpmap_create_from_xbm, 2);
+    RG_DEF_SMETHOD(create_from_xbm, 2);
 #endif /* HAVE_XREADBITMAPFILEDATA */
 #ifdef GDK_WINDOWING_X11
     G_DEF_CLASS3("GdkPixmapImplX11", "PixmapImplX11", mGdk);
@@ -229,7 +245,7 @@ Init_gtk_gdk_pixmap()
     G_DEF_CLASS3("GdkPixmapFB", "PixmapFB", mGdk);
 #endif
 
-    rb_define_singleton_method(gdkPixmap, "foreign_new", gdkpmap_foreign_new, -1);
-    rb_define_singleton_method(gdkPixmap, "lookup", gdkpmap_lookup, -1);
+    RG_DEF_SMETHOD(foreign_new, -1);
+    RG_DEF_SMETHOD(lookup, -1);
 
 }