gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtkscale.c

@@ -1,30 +1,41 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkscale.c -
-
-  $Author: mutoh $
-  $Date: 2004/11/14 11:01:43 $
-
-  Copyright (C) 2002,2003 Ruby-GNOME2 Project Team
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 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"
 
+#define RG_TARGET_NAMESPACE cScale
 #define _SELF(self) (GTK_SCALE(RVAL2GOBJ(self)))
 
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-rbscale_get_layout(VALUE self)
+rg_layout(VALUE self)
 {
     return GOBJ2RVAL(gtk_scale_get_layout(_SELF(self)));
 }
 
 static VALUE
-rbscale_get_layout_offsets(VALUE self)
+rg_layout_offsets(VALUE self)
 {
     gint x, y;
     gtk_scale_get_layout_offsets(_SELF(self), &x, &y);
@@ -33,12 +44,12 @@ rbscale_get_layout_offsets(VALUE self)
 #endif
 
 void 
-Init_gtk_scale()
+Init_gtk_scale(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,4,0)
-    VALUE gScale = G_DEF_CLASS(GTK_TYPE_SCALE, "Scale", mGtk);
-    rb_define_method(gScale, "layout", rbscale_get_layout, 0);
-    rb_define_method(gScale, "layout_offsets", rbscale_get_layout_offsets, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_SCALE, "Scale", mGtk);
+    RG_DEF_METHOD(layout, 0);
+    RG_DEF_METHOD(layout_offsets, 0);
 #else
     G_DEF_CLASS(GTK_TYPE_SCALE, "Scale", mGtk);
 #endif

data/ext/gtk2/rbgtkscalebutton.c

@@ -1,25 +1,36 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkscalebutton.c -
-
-  $Author: ggc $
-  $Date: 2007/07/12 14:43:11 $
-
-  Copyright (C) 2002,2003 Ruby-GNOME2 Project Team
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 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"
 
 #if GTK_CHECK_VERSION(2,12,0)
 
+#define RG_TARGET_NAMESPACE cScaleButton
 #define _SELF(s) (GTK_SCALE_BUTTON(RVAL2GOBJ(s)))
 
 static VALUE
-scalebutton_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg1, arg2, arg3, arg4, arg5;
     GtkWidget *widget;
@@ -52,24 +63,13 @@ scalebutton_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-/* Defined as Properties
-void                gtk_scale_button_set_adjustment     (GtkScaleButton *button,
-                                                         GtkAdjustment *adjustment);
-void                gtk_scale_button_set_icons          (GtkScaleButton *button,
-                                                         const gchar **icons);
-void                gtk_scale_button_set_value          (GtkScaleButton *button,
-                                                         gdouble value);
-GtkAdjustment *     gtk_scale_button_get_adjustment     (GtkScaleButton *button);
-gdouble             gtk_scale_button_get_value          (GtkScaleButton *button);
-*/
-
 #endif
 
 void 
-Init_gtk_scalebutton()
+Init_gtk_scalebutton(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,12,0)
-    VALUE gScaleButton = G_DEF_CLASS(GTK_TYPE_SCALE_BUTTON, "ScaleButton", mGtk);
-    rb_define_method(gScaleButton, "initialize", scalebutton_initialize, -1);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_SCALE_BUTTON, "ScaleButton", mGtk);
+    RG_DEF_METHOD(initialize, -1);
 #endif
 }

data/ext/gtk2/rbgtkscrollbar.c

@@ -1,21 +1,31 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkscrollbar.c -
-
-  $Author: mutoh $
-  $Date: 2003/02/01 16:46:24 $
-
-  Copyright (C) 2002,2003 Ruby-GNOME2 Project Team
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 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"
 
 void 
-Init_gtk_scrollbar()
+Init_gtk_scrollbar(VALUE mGtk)
 {
     G_DEF_CLASS(GTK_TYPE_SCROLLBAR, "Scrollbar", mGtk);
 }

data/ext/gtk2/rbgtkscrolledwindow.c

@@ -1,23 +1,34 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkscrolledwindow.c -
-
-  $Author: ktou $
-  $Date: 2006/11/13 12:53:21 $
-
-  Copyright (C) 2002,2003 Ruby-GNOME2 Project Team
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 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"
 
+#define RG_TARGET_NAMESPACE cScrolledWindow
 #define _SELF(self) (GTK_SCROLLED_WINDOW(RVAL2GOBJ(self)))
 
 static VALUE
-scwin_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg1, arg2;
     GtkAdjustment *h_adj = NULL;
@@ -33,7 +44,7 @@ scwin_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-scwin_set_policy(VALUE self, VALUE hpolicy, VALUE vpolicy)
+rg_set_policy(VALUE self, VALUE hpolicy, VALUE vpolicy)
 {
     gtk_scrolled_window_set_policy(_SELF(self),
                                    RVAL2GENUM(hpolicy, GTK_TYPE_POLICY_TYPE),
@@ -42,7 +53,7 @@ scwin_set_policy(VALUE self, VALUE hpolicy, VALUE vpolicy)
 }
 
 static VALUE
-scwin_get_policy(VALUE self)
+rg_policy(VALUE self)
 {
     GtkPolicyType hpolicy, vpolicy;
 
@@ -53,7 +64,7 @@ scwin_get_policy(VALUE self)
 }
 
 static VALUE
-scwin_add_with_viewport(VALUE self, VALUE other)
+rg_add_with_viewport(VALUE self, VALUE other)
 {
     gtk_scrolled_window_add_with_viewport(_SELF(self),
                                           GTK_WIDGET(RVAL2GOBJ(other)));
@@ -63,13 +74,13 @@ scwin_add_with_viewport(VALUE self, VALUE other)
 
 #if GTK_CHECK_VERSION(2,8,0)
 static VALUE
-scwin_get_hscrollbar(VALUE self)
+rg_hscrollbar(VALUE self)
 {
     return GOBJ2RVAL(gtk_scrolled_window_get_hscrollbar(_SELF(self)));
 }
 
 static VALUE
-scwin_get_vscrollbar(VALUE self)
+rg_vscrollbar(VALUE self)
 {
     return GOBJ2RVAL(gtk_scrolled_window_get_vscrollbar(_SELF(self)));
 }
@@ -77,7 +88,7 @@ scwin_get_vscrollbar(VALUE self)
 
 #if GTK_CHECK_VERSION(2,10,0)
 static VALUE
-scwin_set_placement(VALUE self, VALUE corner_type)
+rg_set_placement(VALUE self, VALUE corner_type)
 {
     gtk_scrolled_window_set_placement(_SELF(self), 
                                       RVAL2GENUM(corner_type, GTK_TYPE_CORNER_TYPE));
@@ -85,65 +96,38 @@ scwin_set_placement(VALUE self, VALUE corner_type)
 }
 
 static VALUE
-scwin_unset_placement(VALUE self)
+rg_unset_placement(VALUE self)
 {
     gtk_scrolled_window_unset_placement(_SELF(self));
     return self;
 }
 
 static VALUE
-scwin_get_placement(VALUE self)
+rg_placement(VALUE self)
 {
     return GENUM2RVAL(gtk_scrolled_window_get_placement(_SELF(self)), 
                       GTK_TYPE_CORNER_TYPE);
 }
 #endif
 
-/* Defined as properties
-GtkAdjustment* gtk_scrolled_window_get_hadjustment
-                                            (GtkScrolledWindow *scrolled_window);
-GtkAdjustment* gtk_scrolled_window_get_vadjustment
-                                            (GtkScrolledWindow *scrolled_window);
-GtkWidget*  gtk_scrolled_window_get_hscrollbar
-                                            (GtkScrolledWindow *scrolled_window);
-GtkWidget*  gtk_scrolled_window_get_vscrollbar
-                                            (GtkScrolledWindow *scrolled_window);
-void        gtk_scrolled_window_add_with_viewport
-                                            (GtkScrolledWindow *scrolled_window,
-                                             GtkWidget *child);
-void        gtk_scrolled_window_set_shadow_type
-                                            (GtkScrolledWindow *scrolled_window,
-                                             GtkShadowType type);
-void        gtk_scrolled_window_set_hadjustment
-                                            (GtkScrolledWindow *scrolled_window,
-                                             GtkAdjustment *hadjustment);
-void        gtk_scrolled_window_set_vadjustment
-                                            (GtkScrolledWindow *scrolled_window,
-                                             GtkAdjustment *vadjustment);
-GtkShadowType gtk_scrolled_window_get_shadow_type
-                                            (GtkScrolledWindow *scrolled_window);
-
-*/
-
-
 void 
-Init_gtk_scrolled_window()
+Init_gtk_scrolled_window(VALUE mGtk)
 {
-    VALUE gScrolledWin = G_DEF_CLASS(GTK_TYPE_SCROLLED_WINDOW, "ScrolledWindow", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_SCROLLED_WINDOW, "ScrolledWindow", mGtk);
 
-    rb_define_method(gScrolledWin, "initialize", scwin_initialize, -1);
-    rb_define_method(gScrolledWin, "set_policy", scwin_set_policy, 2);
-    rb_define_method(gScrolledWin, "policy", scwin_get_policy, 0);
-    rb_define_method(gScrolledWin, "add_with_viewport", scwin_add_with_viewport, 1);
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD(set_policy, 2);
+    RG_DEF_METHOD(policy, 0);
+    RG_DEF_METHOD(add_with_viewport, 1);
 #if GTK_CHECK_VERSION(2,8,0)
-    rb_define_method(gScrolledWin, "hscrollbar", scwin_get_hscrollbar, 0);
-    rb_define_method(gScrolledWin, "vscrollbar", scwin_get_vscrollbar, 0);
+    RG_DEF_METHOD(hscrollbar, 0);
+    RG_DEF_METHOD(vscrollbar, 0);
 #endif
 
 #if GTK_CHECK_VERSION(2,10,0)
-    rb_define_method(gScrolledWin, "unset_placement", scwin_unset_placement, 0);
-    rb_define_method(gScrolledWin, "placement", scwin_get_placement, 0);
-    rb_define_method(gScrolledWin, "set_placement", scwin_set_placement, 1);
-    G_DEF_SETTER(gScrolledWin, "placement");
+    RG_DEF_METHOD(unset_placement, 0);
+    RG_DEF_METHOD(placement, 0);
+    RG_DEF_METHOD(set_placement, 1);
+    G_DEF_SETTER(RG_TARGET_NAMESPACE, "placement");
 #endif
 }

data/ext/gtk2/rbgtkselection.c

@@ -1,25 +1,35 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 Masao Mutoh
+ *  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
+ */
 
-  rbgtkselection.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 14:27:10 $
-
-  Copyright (C) 2002,2003 Masao Mutoh
-
-  This file is devided from rbgtkwidget.c.
-  rbgtkwidget.c -
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE mSelection
+
 #define RVAL2WIDGET(w) (GTK_WIDGET(RVAL2GOBJ(w)))
 
 static VALUE
-gtkdrag_selection_owner_set(int argc, VALUE *argv, VALUE self)
+rg_m_owner_set(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
     gboolean ret;
 
@@ -43,7 +53,7 @@ gtkdrag_selection_owner_set(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-gtkdrag_selection_add_target(VALUE self, VALUE widget, VALUE selection, VALUE target, VALUE info)
+rg_m_add_target(VALUE self, VALUE widget, VALUE selection, VALUE target, VALUE info)
 {
     gtk_selection_add_target(RVAL2WIDGET(widget), RVAL2ATOM(selection),
                              RVAL2ATOM(target), NUM2INT(info));
@@ -51,23 +61,29 @@ gtkdrag_selection_add_target(VALUE self, VALUE widget, VALUE selection, VALUE ta
 }
 
 static VALUE
-gtkdrag_selection_add_targets(VALUE self, VALUE widget, VALUE selection, VALUE targets)
+rg_m_add_targets(VALUE self, VALUE rbwidget, VALUE rbselection, VALUE rbtargets)
 {
-    gtk_selection_add_targets(RVAL2WIDGET(widget), 
-                              RVAL2ATOM(selection),
-                              rbgtk_get_target_entry(targets), RARRAY_LEN(targets));
+    GtkWidget *widget = RVAL2WIDGET(rbwidget);
+    GdkAtom selection = RVAL2ATOM(rbselection);
+    long n;
+    GtkTargetEntry *targets = RVAL2GTKTARGETENTRIES(rbtargets, &n);
+
+    gtk_selection_add_targets(widget, selection, targets, n);
+
+    g_free(targets);
+
     return self;
 }
 
 static VALUE
-gtkdrag_selection_clear_targets(VALUE self, VALUE widget, VALUE selection)
+rg_m_clear_targets(VALUE self, VALUE widget, VALUE selection)
 {
     gtk_selection_clear_targets(RVAL2WIDGET(widget), RVAL2ATOM(selection));
     return self;
 }
 
 static VALUE
-gtkdrag_selection_convert(VALUE self, VALUE widget, VALUE selection, VALUE target, VALUE time)
+rg_m_convert(G_GNUC_UNUSED VALUE self, VALUE widget, VALUE selection, VALUE target, VALUE time)
 {
     gboolean ret = gtk_selection_convert(RVAL2WIDGET(widget), 
                                          RVAL2ATOM(selection), RVAL2ATOM(target),
@@ -76,7 +92,7 @@ gtkdrag_selection_convert(VALUE self, VALUE widget, VALUE selection, VALUE targe
 }
 
 static VALUE
-gtkdrag_selection_remove_all(VALUE self, VALUE widget)
+rg_m_remove_all(VALUE self, VALUE widget)
 {
     gtk_selection_remove_all(RVAL2WIDGET(widget));
     return self;
@@ -84,76 +100,80 @@ gtkdrag_selection_remove_all(VALUE self, VALUE widget)
 
 #if GTK_CHECK_VERSION(2,10,0)
 static VALUE
-targets_include_image(VALUE self, VALUE targets, VALUE writable)
+rg_m_include_image_p(G_GNUC_UNUSED VALUE self, VALUE rbtargets, VALUE rbwritable)
 {
-  gint i;
-  gint len = RARRAY_LEN(targets);
-  GdkAtom* gtargets = ALLOCA_N(GdkAtom, len);
+    gboolean writable = RVAL2CBOOL(rbwritable);
+    long n;
+    GdkAtom *targets = RVAL2GDKATOMS(rbtargets, &n);
+    gboolean result;
 
-  for (i = 0; i < len; i++){
-    gtargets[i] = RVAL2ATOM(RARRAY_PTR(targets)[i]);
-  }
+    result = gtk_targets_include_image(targets, n, writable);
 
-  return CBOOL2RVAL(gtk_targets_include_image(gtargets, len, RVAL2CBOOL(writable)));
+    g_free(targets);
+
+    return result;
 }
 
 static VALUE
-targets_include_text(VALUE self, VALUE targets)
+rg_m_include_text_p(G_GNUC_UNUSED VALUE self, VALUE rbtargets)
 {
-  gint i;
-  gint len = RARRAY_LEN(targets);
-  GdkAtom* gtargets = ALLOCA_N(GdkAtom, len);
-  for (i = 0; i < len; i++){
-    gtargets[i] = RVAL2ATOM(RARRAY_PTR(targets)[i]);
-  }
-  return CBOOL2RVAL(gtk_targets_include_text(gtargets, len));
+    long n;
+    GdkAtom *targets = RVAL2GDKATOMS(rbtargets, &n);
+    gboolean result;
+
+    result = gtk_targets_include_text(targets, n);
+
+    g_free(targets);
+
+    return result;
 }
 
 static VALUE
-targets_include_uri(VALUE self, VALUE targets)
+rg_m_include_uri_p(G_GNUC_UNUSED VALUE self, VALUE rbtargets)
 {
-  gint i;
-  gint len = RARRAY_LEN(targets);
-  GdkAtom* gtargets = ALLOCA_N(GdkAtom, len);
+    long n;
+    GdkAtom *targets = RVAL2GDKATOMS(rbtargets, &n);
+    gboolean result;
+
+    result = gtk_targets_include_uri(targets, n);
 
-  for (i = 0; i < len; i++){
-    gtargets[i] = RVAL2ATOM(RARRAY_PTR(targets)[i]);
-  }
+    g_free(targets);
 
-  return CBOOL2RVAL(gtk_targets_include_uri(gtargets, len));
+    return result;
 }
 
 static VALUE
-targets_include_rich_text(VALUE self, VALUE targets, VALUE buffer)
+rg_m_include_rich_text_p(G_GNUC_UNUSED VALUE self, VALUE rbtargets, VALUE rbbuffer)
 {
-  gint i;
-  gint len = RARRAY_LEN(targets);
-  GdkAtom* gtargets = ALLOCA_N(GdkAtom, len);
+    GtkTextBuffer *buffer = GTK_TEXT_BUFFER(RVAL2GOBJ(rbbuffer));
+    long n;
+    GdkAtom *targets = RVAL2GDKATOMS(rbtargets, &n);
+    gboolean result;
+
+    result = gtk_targets_include_rich_text(targets, n, buffer);
 
-  for (i = 0; i < len; i++){
-    gtargets[i] = RVAL2ATOM(RARRAY_PTR(targets)[i]);
-  }
+    g_free(targets);
 
-  return CBOOL2RVAL(gtk_targets_include_rich_text(gtargets, len, RVAL2GOBJ(buffer)));
+    return result;
 }
 #endif
 
 void
-Init_gtk_selection()
+Init_gtk_selection(VALUE mGtk)
 {
-    VALUE mSelection =  rb_define_module_under(mGtk, "Selection");
+    VALUE RG_TARGET_NAMESPACE =  rb_define_module_under(mGtk, "Selection");
 
-    rb_define_module_function(mSelection, "owner_set", gtkdrag_selection_owner_set, 3);
-    rb_define_module_function(mSelection, "add_target", gtkdrag_selection_add_target, 4);
-    rb_define_module_function(mSelection, "add_targets", gtkdrag_selection_add_targets, 3);
-    rb_define_module_function(mSelection, "clear_targets", gtkdrag_selection_clear_targets, 2);
-    rb_define_module_function(mSelection, "convert", gtkdrag_selection_convert, 4);
-    rb_define_module_function(mSelection, "remove_all", gtkdrag_selection_remove_all, 1);
+    RG_DEF_MODFUNC(owner_set, 3);
+    RG_DEF_MODFUNC(add_target, 4);
+    RG_DEF_MODFUNC(add_targets, 3);
+    RG_DEF_MODFUNC(clear_targets, 2);
+    RG_DEF_MODFUNC(convert, 4);
+    RG_DEF_MODFUNC(remove_all, 1);
 
 #if GTK_CHECK_VERSION(2,10,0)
-    rb_define_module_function(mSelection, "include_image?", targets_include_image, 2);
-    rb_define_module_function(mSelection, "include_text?", targets_include_text, 1);
-    rb_define_module_function(mSelection, "include_uri?", targets_include_uri, 1);
-    rb_define_module_function(mSelection, "include_rich_text?", targets_include_rich_text, 2);
+    RG_DEF_MODFUNC_P(include_image, 2);
+    RG_DEF_MODFUNC_P(include_text, 1);
+    RG_DEF_MODFUNC_P(include_uri, 1);
+    RG_DEF_MODFUNC_P(include_rich_text, 2);
 #endif
 }