gtk2 1.0.3-x86-mingw32 → 1.1.0-x86-mingw32

data/ext/gtk2/rbgtkprintunixdialog.c

@@ -1,48 +1,37 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkprintunixdialog.c -
-
-  $Author: mutoh $
-  $Date: 2006/12/26 16:11:13 $
-
-  Copyright (C) 2006 Ruby-GNOME2 Project Team
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2006  Ruby-GNOME2 Project Team
+ *
+ *  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_GTK_UNIX_PRINT
 #include <gtk/gtkprintunixdialog.h>
 
+#define RG_TARGET_NAMESPACE cPrintUnixDialog
 #define _SELF(s) (GTK_PRINT_UNIX_DIALOG(RVAL2GOBJ(s)))
 #ifndef GTK_TYPE_PRINT_CAPABILITIES
 #  define GTK_TYPE_PRINT_CAPABILITIES (gtk_print_capabilities_get_type())
 #endif
 
-/* Defined as Properties
-void        gtk_print_unix_dialog_set_page_setup
-                                            (GtkPrintUnixDialog *dialog,
-                                             GtkPageSetup *page_setup);
-GtkPageSetup* gtk_print_unix_dialog_get_page_setup
-                                            (GtkPrintUnixDialog *dialog);
-void        gtk_print_unix_dialog_set_current_page
-                                            (GtkPrintUnixDialog *dialog,
-                                             gint current_page);
-gint        gtk_print_unix_dialog_get_current_page
-                                            (GtkPrintUnixDialog *dialog);
-
-void        gtk_print_unix_dialog_set_settings
-                                            (GtkPrintUnixDialog *dialog,
-                                             GtkPrintSettings *settings);
-GtkPrintSettings* gtk_print_unix_dialog_get_settings
-                                            (GtkPrintUnixDialog *dialog);
-
-GtkPrinter* gtk_print_unix_dialog_get_selected_printer
-                                            (GtkPrintUnixDialog *dialog);
-*/
-
 static VALUE
-pud_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     GtkWidget *dialog;
     VALUE title, parent;
@@ -56,7 +45,7 @@ pud_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-pud_add_custom_tab(VALUE self, VALUE child, VALUE tab_label)
+rg_add_custom_tab(VALUE self, VALUE child, VALUE tab_label)
 {
     gtk_print_unix_dialog_add_custom_tab(_SELF(self),
                                          RVAL2GOBJ(child),
@@ -65,7 +54,7 @@ pud_add_custom_tab(VALUE self, VALUE child, VALUE tab_label)
 }
 
 static VALUE
-pud_set_manual_capabilities(VALUE self, VALUE rb_capabilities)
+rg_set_manual_capability(VALUE self, VALUE rb_capabilities)
 {
     GtkPrintCapabilities capabilities;
 
@@ -76,23 +65,22 @@ pud_set_manual_capabilities(VALUE self, VALUE rb_capabilities)
 #endif
 
 void
-Init_gtk_print_unix_dialog()
+Init_gtk_print_unix_dialog(VALUE mGtk)
 {
 #ifdef HAVE_GTK_UNIX_PRINT
-    VALUE gPrintUnixDialog = G_DEF_CLASS(GTK_TYPE_PRINT_UNIX_DIALOG,
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_PRINT_UNIX_DIALOG,
                                          "PrintUnixDialog", mGtk);
 
-    rb_define_method(gPrintUnixDialog, "initialize", pud_initialize, -1);
-    rb_define_method(gPrintUnixDialog, "add_custom_tab", pud_add_custom_tab, 2);
-    rb_define_method(gPrintUnixDialog, "set_manual_capability",
-                     pud_set_manual_capabilities, 1);
-    rb_define_alias(gPrintUnixDialog, "settings", "print_settings");
-    rb_define_alias(gPrintUnixDialog, "set_settings", "set_print_settings");
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD(add_custom_tab, 2);
+    RG_DEF_METHOD(set_manual_capability, 1);
+    RG_DEF_ALIAS("settings", "print_settings");
+    RG_DEF_ALIAS("set_settings", "set_print_settings");
 
-    G_DEF_SETTERS(gPrintUnixDialog);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 
     /* GtkPrintCapabilities */
-    G_DEF_CLASS(GTK_TYPE_PRINT_CAPABILITIES, "Capabilities", gPrintUnixDialog);
-    G_DEF_CONSTANTS(gPrintUnixDialog, GTK_TYPE_PRINT_CAPABILITIES, "GTK_PRINT_");
+    G_DEF_CLASS(GTK_TYPE_PRINT_CAPABILITIES, "Capabilities", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_PRINT_CAPABILITIES, "GTK_PRINT_");
 #endif
 }

data/ext/gtk2/rbgtkprogress.c

@@ -1,21 +1,31 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkprogress.c -
-
-  $Author: mutoh $
-  $Date: 2003/02/01 16:46:23 $
-
-  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_progress()
+Init_gtk_progress(VALUE mGtk)
 {
     G_DEF_CLASS(GTK_TYPE_PROGRESS, "Progress", mGtk);
 }

data/ext/gtk2/rbgtkprogressbar.c

@@ -1,70 +1,71 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkprogressbar.c -
-
-  $Author: mutoh $
-  $Date: 2005/01/09 19:02:05 $
-
-  Copyright (C) 2002-2005 Ruby-GNOME2 Project Team
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2005 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 cProgressBar
+
 static VALUE
-pbar_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_progress_bar_new());
     return Qnil;
 }
 
 static VALUE
-pbar_pulse(VALUE self)
+rg_pulse(VALUE self)
 {
     gtk_progress_bar_pulse(GTK_PROGRESS_BAR(RVAL2GOBJ(self)));
     return self;
 }
 
-/* Defined as Property
-void        gtk_progress_bar_set_ellipsize  (GtkProgressBar *pbar,
-                                             PangoEllipsizeMode mode);
-*/
-
 void 
-Init_gtk_progress_bar()
+Init_gtk_progress_bar(VALUE mGtk)
 {
-    VALUE gProgressBar = G_DEF_CLASS(GTK_TYPE_PROGRESS_BAR, "ProgressBar", mGtk);
-
-    /* GtkProgressBarStyle */
-/* Deprecated.
-    rb_define_const(gProgressBar, "CONTINUOUS", INT2FIX(GTK_PROGRESS_CONTINUOUS));
-    rb_define_const(gProgressBar, "DISCRETE", INT2FIX(GTK_PROGRESS_DISCRETE));
-*/
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_PROGRESS_BAR, "ProgressBar", mGtk);
 
     /* GtkProgressBarOrientation */
-    G_DEF_CLASS(GTK_TYPE_PROGRESS_BAR_ORIENTATION, "Orientation", gProgressBar);
-    G_DEF_CONSTANTS(gProgressBar, GTK_TYPE_PROGRESS_BAR_ORIENTATION, "GTK_PROGRESS_");
+    G_DEF_CLASS(GTK_TYPE_PROGRESS_BAR_ORIENTATION, "Orientation", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_PROGRESS_BAR_ORIENTATION, "GTK_PROGRESS_");
 
-    rb_define_method(gProgressBar, "initialize", pbar_initialize, 0);
-    rb_define_method(gProgressBar, "pulse", pbar_pulse, 0);
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(pulse, 0);
 
     /* undef deprecated properties */
-    rb_undef_method(gProgressBar, "adjustment");
-    rb_undef_method(gProgressBar, "adjustment=");
-    rb_undef_method(gProgressBar, "set_adjustment");
-    rb_undef_method(gProgressBar, "bar_style");
-    rb_undef_method(gProgressBar, "bar_style=");
-    rb_undef_method(gProgressBar, "set_bar_style");
-    rb_undef_method(gProgressBar, "discrete_blocks");
-    rb_undef_method(gProgressBar, "discrete_blocks=");
-    rb_undef_method(gProgressBar, "set_discrete_blocks");
-    rb_undef_method(gProgressBar, "activity_blocks");
-    rb_undef_method(gProgressBar, "activity_blocks=");
-    rb_undef_method(gProgressBar, "set_activity_blocks");
-    rb_undef_method(gProgressBar, "activity_step");
-    rb_undef_method(gProgressBar, "activity_step=");
-    rb_undef_method(gProgressBar, "set_activity_step");
+    rb_undef_method(RG_TARGET_NAMESPACE, "adjustment");
+    rb_undef_method(RG_TARGET_NAMESPACE, "adjustment=");
+    rb_undef_method(RG_TARGET_NAMESPACE, "set_adjustment");
+    rb_undef_method(RG_TARGET_NAMESPACE, "bar_style");
+    rb_undef_method(RG_TARGET_NAMESPACE, "bar_style=");
+    rb_undef_method(RG_TARGET_NAMESPACE, "set_bar_style");
+    rb_undef_method(RG_TARGET_NAMESPACE, "discrete_blocks");
+    rb_undef_method(RG_TARGET_NAMESPACE, "discrete_blocks=");
+    rb_undef_method(RG_TARGET_NAMESPACE, "set_discrete_blocks");
+    rb_undef_method(RG_TARGET_NAMESPACE, "activity_blocks");
+    rb_undef_method(RG_TARGET_NAMESPACE, "activity_blocks=");
+    rb_undef_method(RG_TARGET_NAMESPACE, "set_activity_blocks");
+    rb_undef_method(RG_TARGET_NAMESPACE, "activity_step");
+    rb_undef_method(RG_TARGET_NAMESPACE, "activity_step=");
+    rb_undef_method(RG_TARGET_NAMESPACE, "set_activity_step");
 }

data/ext/gtk2/rbgtkradioaction.c

@@ -1,22 +1,33 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
- 
-  rbgtkradioaction.c -
- 
-  $Author: mutoh $
-  $Date: 2006/12/26 16:11:13 $
- 
-  Copyright (C) 2004-2006 Masao Mutoh
-************************************************/
- 
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2004-2006 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,4,0)
 
+#define RG_TARGET_NAMESPACE cRadioAction
 #define _SELF(self) (GTK_RADIO_ACTION(RVAL2GOBJ(self)))
 
 static VALUE
-raction_initialize(VALUE self, VALUE name, VALUE label, VALUE tooltip, VALUE stock_id, VALUE value)
+rg_initialize(VALUE self, VALUE name, VALUE label, VALUE tooltip, VALUE stock_id, VALUE value)
 {
     const gchar *gstock = NULL;
 
@@ -40,54 +51,88 @@ raction_get_group(VALUE self)
     return GSLIST2ARY(gtk_radio_action_get_group(_SELF(self)));
 }
 
+struct rbgtk_rval2gtkradioactiongslist_args {
+    VALUE ary;
+    long n;
+    GSList *result;
+};
+
 static VALUE
-raction_set_group(VALUE self, VALUE group)
+rbgtk_rval2gtkradioactiongslist_body(VALUE value)
 {
     long i;
-    GSList *glist = NULL;
-
-    if (TYPE(group) == T_ARRAY){
-        for (i = 0; i < RARRAY_LEN(group); i++) {
-            glist = g_slist_append(glist, RVAL2GOBJ(RARRAY_PTR(group)[i]));
-        }
-        gtk_radio_action_set_group(_SELF(group), glist);
-        g_slist_free(glist);
-    } else {
-        glist = gtk_radio_action_get_group(GTK_RADIO_ACTION(RVAL2GOBJ(group)));
-        gtk_radio_action_set_group(_SELF(group), glist);
-    }
+    struct rbgtk_rval2gtkradioactiongslist_args *args = (struct rbgtk_rval2gtkradioactiongslist_args *)value;
+
+    for (i = 0; i < args->n; i++)
+        args->result = g_slist_append(args->result, GTK_RADIO_ACTION(RVAL2GOBJ(RARRAY_PTR(args->ary)[i])));
+
+    return Qnil;
+}
+
+static G_GNUC_NORETURN VALUE
+rbgtk_rval2gtkradioactiongslist_rescue(VALUE value)
+{
+    g_slist_free(((struct rbgtk_rval2gtkradioactiongslist_args *)value)->result);
+
+    rb_exc_raise(rb_errinfo());
+}
+
+static GSList *
+rbgtk_rval2gtkradioactiongslist(VALUE value)
+{
+    struct rbgtk_rval2gtkradioactiongslist_args args;
+
+    args.ary = rb_ary_to_ary(value);
+    args.n = RARRAY_LEN(args.ary);
+    args.result = NULL;
+
+    rb_rescue(rbgtk_rval2gtkradioactiongslist_body, (VALUE)&args,
+              rbgtk_rval2gtkradioactiongslist_rescue, (VALUE)&args);
+
+    return args.result;
+}
+
+#define RVAL2GTKRADIOACTIONGSLIST(value) rbgtk_rval2gtkradioactiongslist(value)
+
+static VALUE
+raction_set_group(VALUE self, VALUE rbgroup)
+{
+    GtkRadioAction *action = _SELF(self);
+
+    /* TODO: This might leak.  Use gtk_radio_action_join_group() in 3.0. */
+    if (TYPE(rbgroup) == T_ARRAY)
+        gtk_radio_action_set_group(action, RVAL2GTKRADIOACTIONGSLIST(rbgroup));
+    else if (NIL_P(rbgroup))
+        gtk_radio_action_set_group(action, NULL);
+    else
+        gtk_radio_action_set_group(action,
+                                   gtk_radio_action_get_group(GTK_RADIO_ACTION(RVAL2GOBJ(rbgroup))));
+
     return self;
 }
 
 #if ! GTK_CHECK_VERSION(2,10,0)
 static VALUE
-raction_get_current_value(VALUE self)
+rg_current_value(VALUE self)
 {
     return INT2NUM(gtk_radio_action_get_current_value(_SELF(self)));
 }
 #endif
-    
-#endif
 
-/* Defined as Properties
-void        gtk_radio_action_set_current_value
-                                            (GtkRadioAction *action,
-                                             gint current_value);
-*/
+#endif
 
 void 
-Init_gtk_radio_action()
+Init_gtk_radio_action(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,4,0)
-    VALUE gRadioAction = G_DEF_CLASS(GTK_TYPE_RADIO_ACTION, "RadioAction", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_RADIO_ACTION, "RadioAction", mGtk);
 
-    rb_define_method(gRadioAction, "initialize", raction_initialize, 5);
+    RG_DEF_METHOD(initialize, 5);
 #if ! GTK_CHECK_VERSION(2,10,0)
     /* Define as Property since 2.10 */
-    rb_define_method(gRadioAction, "current_value", raction_get_current_value, 0);
+    RG_DEF_METHOD(current_value, 0);
 #endif
-    G_REPLACE_GET_PROPERTY(gRadioAction, "group", raction_get_group, 0);
-    G_REPLACE_SET_PROPERTY(gRadioAction, "group", raction_get_group, 1);
+    G_REPLACE_GET_PROPERTY(RG_TARGET_NAMESPACE, "group", raction_get_group, 0);
+    G_REPLACE_SET_PROPERTY(RG_TARGET_NAMESPACE, "group", raction_set_group, 1);
 #endif
 }
-

data/ext/gtk2/rbgtkradiobutton.c

@@ -1,20 +1,32 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkradiobutton.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  Copyright (C) 2002-2006 Ruby-GNOME2 Project Team
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2006 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"
 
-static VALUE gRButton;
+#define RG_TARGET_NAMESPACE cRadioButton
+
+static VALUE RG_TARGET_NAMESPACE;
 
 #define _GROUP(s) (NIL_P(s) ? NULL : GTK_RADIO_BUTTON(RVAL2GOBJ(s)))
 
@@ -42,13 +54,13 @@ create_button(VALUE group, VALUE label, VALUE use_underline)
 }
 
 static VALUE
-rbtn_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE group_or_label, label_or_use_underline, use_underline;
     GtkWidget *widget;
 
     if (rb_scan_args(argc, argv, "03", &group_or_label, &label_or_use_underline, &use_underline) > 0) {
-        if (rb_obj_is_kind_of(group_or_label, gRButton)){
+        if (rb_obj_is_kind_of(group_or_label, RG_TARGET_NAMESPACE)){
             widget = create_button(group_or_label, label_or_use_underline, use_underline);
         } else {
             widget = create_button(Qnil, group_or_label, label_or_use_underline);
@@ -56,23 +68,23 @@ rbtn_initialize(int argc, VALUE *argv, VALUE self)
     } else {
         widget = gtk_radio_button_new(NULL);
     }
-   
+
     RBGTK_INITIALIZE(self, widget);
     return Qnil;
 }
 
 static VALUE
-rbtn_group(VALUE self)
+rg_group(VALUE self)
 {
     /* Owned by GTK+ */
     return GSLIST2ARY(gtk_radio_button_get_group(GTK_RADIO_BUTTON(RVAL2GOBJ(self))));
 }
 
 void 
-Init_gtk_radio_button()
+Init_gtk_radio_button(VALUE mGtk)
 {
-    gRButton = G_DEF_CLASS(GTK_TYPE_RADIO_BUTTON, "RadioButton", mGtk);
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_RADIO_BUTTON, "RadioButton", mGtk);
 
-    rb_define_method(gRButton, "initialize", rbtn_initialize, -1);
-    rb_define_method(gRButton, "group", rbtn_group, 0);
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD(group, 0);
 }