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

data/ext/gtk2/rbgtk.h

@@ -1,16 +1,26 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtk.h -
-
-  $Author: sakai $
-  $Date: 2007/07/06 10:13:27 $
-
-  Copyright (C) 2003-2006 Ruby-GNOME2 Project Team
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003-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
+ */
 
 #ifndef _RBGTK_H
 #define _RBGTK_H
@@ -72,13 +82,13 @@ extern GtkTreeRowReference* rbgtk_get_tree_row_reference(VALUE obj);
  */
 extern void rbgtk_initialize_gtkobject(VALUE obj, GtkObject *gtkobj);
 extern void exec_callback(GtkWidget *widget, gpointer proc);
-extern GType gtk_allocation_get_type();
-extern GType gtk_accel_key_get_type();
-extern GType gtk_accel_group_entry_get_type();
-extern GType gtk_bindingset_get_type();
-extern GType gtk_text_appearance_get_type();
-extern GType gtk_recent_filter_info_get_type();
-extern GType gtk_recent_data_get_type();
+extern GType gtk_allocation_get_type(void);
+extern GType gtk_accel_key_get_type(void);
+extern GType gtk_accel_group_entry_get_type(void);
+extern GType gtk_bindingset_get_type(void);
+extern GType gtk_text_appearance_get_type(void);
+extern GType gtk_recent_filter_info_get_type(void);
+extern GType gtk_recent_data_get_type(void);
 
 /*
  * Gtk::TreeIter callback
@@ -97,7 +107,12 @@ extern void rbgtk_atom2selectiondata_free(GdkAtom gtype, void* data);
 /*
  * Gtk::Drag
  */
-extern GtkTargetEntry* rbgtk_get_target_entry(VALUE targets);
+#define RVAL2GTKTARGETENTRIES(value, n) rbgtk_rval2gtktargetentries(value, n)
+extern GtkTargetEntry *rbgtk_rval2gtktargetentries(VALUE value, long *n);
+#define RVAL2GTKTARGETENTRIES_ACCEPT_NIL(value, n) rbgtk_rval2gtktargetentries_accept_nil(value, n)
+GtkTargetEntry *rbgtk_rval2gtktargetentries_accept_nil(VALUE value, long *n);
+/* Only for backwards compatibility. */
+GtkTargetEntry *rbgtk_get_target_entry(VALUE targets);
 
 /*
  * Gtk::Container

data/ext/gtk2/rbgtkaboutdialog.c

@@ -1,84 +1,38 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkaboutdialog.c -
-
-  $Author: ktou $
-  $Date: 2007/08/17 11:52:05 $
-
-  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 cAboutDialog
 #define _SELF(self) (GTK_ABOUT_DIALOG(RVAL2GOBJ(self)))
 
 static VALUE
-aboutdialog_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_about_dialog_new());
     return Qnil;
 }
 
-/* Defined as Properties
-const gchar* gtk_about_dialog_get_name      (GtkAboutDialog *about);
-void        gtk_about_dialog_set_name       (GtkAboutDialog *about,
-                                             const gchar *name);
-const gchar* gtk_about_dialog_get_version   (GtkAboutDialog *about);
-void        gtk_about_dialog_set_version    (GtkAboutDialog *about,
-                                             const gchar *version);
-const gchar* gtk_about_dialog_get_copyright (GtkAboutDialog *about);
-void        gtk_about_dialog_set_copyright  (GtkAboutDialog *about,
-                                             const gchar *copyright);
-const gchar* gtk_about_dialog_get_comments  (GtkAboutDialog *about);
-void        gtk_about_dialog_set_comments   (GtkAboutDialog *about,
-                                             const gchar *comments);
-const gchar* gtk_about_dialog_get_license   (GtkAboutDialog *about);
-void        gtk_about_dialog_set_license    (GtkAboutDialog *about,
-                                             const gchar *license);
-const gchar* gtk_about_dialog_get_website   (GtkAboutDialog *about);
-void        gtk_about_dialog_set_website    (GtkAboutDialog *about,
-                                             const gchar *website);
-const gchar* gtk_about_dialog_get_website_label
-                                            (GtkAboutDialog *about);
-void        gtk_about_dialog_set_website_label
-                                            (GtkAboutDialog *about,
-                                             const gchar *website_label);
-const gchar* const * gtk_about_dialog_get_authors
-                                            (GtkAboutDialog *about);
-void        gtk_about_dialog_set_authors    (GtkAboutDialog *about,
-                                             const gchar **authors);
-const gchar* const * gtk_about_dialog_get_artists
-                                            (GtkAboutDialog *about);
-void        gtk_about_dialog_set_artists    (GtkAboutDialog *about,
-                                             const gchar **artists);
-const gchar* const * gtk_about_dialog_get_documenters
-                                            (GtkAboutDialog *about);
-void        gtk_about_dialog_set_documenters
-                                            (GtkAboutDialog *about,
-                                             const gchar **documenters);
-const gchar* gtk_about_dialog_get_translator_credits
-                                            (GtkAboutDialog *about);
-void        gtk_about_dialog_set_translator_credits
-                                            (GtkAboutDialog *about,
-                                             const gchar *translator_credits);
-GdkPixbuf*  gtk_about_dialog_get_logo       (GtkAboutDialog *about);
-void        gtk_about_dialog_set_logo       (GtkAboutDialog *about,
-                                             GdkPixbuf *logo);
-const gchar* gtk_about_dialog_get_logo_icon_name
-                                            (GtkAboutDialog *about);
-void        gtk_about_dialog_set_logo_icon_name
-                                            (GtkAboutDialog *about,
-                                             const gchar *icon_name);
-gboolean    gtk_about_dialog_get_wrap_license
-                                            (GtkAboutDialog *about);
-void        gtk_about_dialog_set_wrap_license
-                                            (GtkAboutDialog *about,
-                                             gboolean wrap_license);
-*/
-
 static void
 activate_link_func(GtkAboutDialog *about, const gchar *link, gpointer func)
 {
@@ -86,7 +40,7 @@ activate_link_func(GtkAboutDialog *about, const gchar *link, gpointer func)
 }
 
 static VALUE
-aboutdialog_s_set_email_hook(VALUE self)
+rg_s_set_email_hook(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -95,7 +49,7 @@ aboutdialog_s_set_email_hook(VALUE self)
 }
 
 static VALUE
-aboutdialog_s_set_url_hook(VALUE self)
+rg_s_set_url_hook(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -103,7 +57,6 @@ aboutdialog_s_set_url_hook(VALUE self)
     return self;
 }
 
-
 typedef struct {
     const char *name;
     gpointer value;
@@ -112,7 +65,7 @@ typedef struct {
 #define ABOUT_PROP_NUM (15)
 
 static VALUE
-aboutdialog_s_show_about_dialog(VALUE self, VALUE parent, VALUE props)
+rg_s_show(VALUE self, VALUE parent, VALUE props)
 {
     int i;
     VALUE ary;
@@ -121,7 +74,7 @@ aboutdialog_s_show_about_dialog(VALUE self, VALUE parent, VALUE props)
     Check_Type(props, T_HASH);
 
     ary = rb_funcall(props, rb_intern("to_a"), 0);
-    
+
     if (RARRAY_LEN(ary) > ABOUT_PROP_NUM)
         rb_raise(rb_eArgError, "Too many args.");
 
@@ -138,7 +91,7 @@ aboutdialog_s_show_about_dialog(VALUE self, VALUE parent, VALUE props)
         if (strncmp(pd[i].name, "artists", strlen("artists")) == 0||
             strncmp(pd[i].name, "authors", strlen("authors")) == 0||
             strncmp(pd[i].name, "documenters", strlen("documenters")) == 0){
-            GValue gval = {0,};
+            GValue gval = G_VALUE_INIT;
             g_value_init(&gval, G_TYPE_STRV);
             rbgobj_rvalue_to_gvalue(RARRAY_PTR(RARRAY_PTR(ary)[i])[1], &gval);
 
@@ -175,14 +128,14 @@ aboutdialog_s_show_about_dialog(VALUE self, VALUE parent, VALUE props)
 #endif
 
 void 
-Init_gtk_aboutdialog()
+Init_gtk_aboutdialog(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,6,0)
-    VALUE gAboutDialog = G_DEF_CLASS(GTK_TYPE_ABOUT_DIALOG, "AboutDialog", mGtk);
-    rb_define_method(gAboutDialog, "initialize", aboutdialog_initialize, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ABOUT_DIALOG, "AboutDialog", mGtk);
+    RG_DEF_METHOD(initialize, 0);
 
-    rb_define_singleton_method(gAboutDialog, "set_email_hook", aboutdialog_s_set_email_hook, 0);
-    rb_define_singleton_method(gAboutDialog, "set_url_hook", aboutdialog_s_set_url_hook, 0);
-    rb_define_singleton_method(gAboutDialog, "show", aboutdialog_s_show_about_dialog, 2);
+    RG_DEF_SMETHOD(set_email_hook, 0);
+    RG_DEF_SMETHOD(set_url_hook, 0);
+    RG_DEF_SMETHOD(show, 2);
 #endif
 }

data/ext/gtk2/rbgtkaccelerator.c

@@ -1,25 +1,38 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  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
+ */
 
-  rbgtkaccelerator.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 14:27:09 $
-
-  Copyright (C) 2002,2003 Masao Mutoh
-************************************************/
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE mAccelerator
+
 #define RVAL2MOD(mods) RVAL2GFLAGS(mods, GDK_TYPE_MODIFIER_TYPE)
 
 static VALUE
-accel_valid(VALUE self, VALUE keyval, VALUE modifiers)
+rg_s_valid(G_GNUC_UNUSED VALUE self, VALUE keyval, VALUE modifiers)
 {
     return CBOOL2RVAL(gtk_accelerator_valid(NUM2UINT(keyval), RVAL2MOD(modifiers)));
 }
 
 static VALUE
-accel_parse(VALUE self, VALUE accelerator)
+rg_s_parse(G_GNUC_UNUSED VALUE self, VALUE accelerator)
 {
     guint key;
     GdkModifierType mods;
@@ -28,45 +41,45 @@ accel_parse(VALUE self, VALUE accelerator)
 }
 
 static VALUE
-accel_name(VALUE self, VALUE key, VALUE mods)
+rg_s_to_name(G_GNUC_UNUSED VALUE self, VALUE key, VALUE mods)
 {
     return CSTR2RVAL(gtk_accelerator_name(NUM2UINT(key), RVAL2MOD(mods)));
 }
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-accel_get_label(VALUE self, VALUE key, VALUE mods)
+rg_s_get_label(G_GNUC_UNUSED VALUE self, VALUE key, VALUE mods)
 {
     return CSTR2RVAL(gtk_accelerator_get_label(NUM2UINT(key), RVAL2MOD(mods)));
 }
 #endif
 
 static VALUE
-accel_set_default_mod_mask(VALUE self, VALUE default_mod_mask)
+rg_s_set_default_mod_mask(VALUE self, VALUE default_mod_mask)
 {
     gtk_accelerator_set_default_mod_mask(RVAL2MOD(default_mod_mask));
     return self;
 }
 
 static VALUE
-accel_get_default_mod_mask(VALUE self)
+rg_s_default_mod_mask(G_GNUC_UNUSED VALUE self)
 {
     return GFLAGS2RVAL(gtk_accelerator_get_default_mod_mask(), GDK_TYPE_MODIFIER_TYPE);
 }
 
 void
-Init_gtk_accelerator()
+Init_gtk_accelerator(VALUE mGtk)
 {
-    VALUE mGtkAccel = rb_define_module_under(mGtk, "Accelerator");
+    VALUE RG_TARGET_NAMESPACE = rb_define_module_under(mGtk, "Accelerator");
 
-    rb_define_singleton_method(mGtkAccel, "valid", accel_valid, 2);
-    rb_define_singleton_method(mGtkAccel, "parse", accel_parse, 1);
+    RG_DEF_SMETHOD(valid, 2);
+    RG_DEF_SMETHOD(parse, 1);
     /* name is reserved by Ruby */
-    rb_define_singleton_method(mGtkAccel, "to_name", accel_name, 2);
+    RG_DEF_SMETHOD(to_name, 2);
 #if GTK_CHECK_VERSION(2,6,0)
-    rb_define_singleton_method(mGtkAccel, "get_label", accel_get_label, 2);
+    RG_DEF_SMETHOD(get_label, 2);
 #endif
-    rb_define_singleton_method(mGtkAccel, "set_default_mod_mask", accel_set_default_mod_mask, 1);
-    rb_define_singleton_method(mGtkAccel, "default_mod_mask", accel_get_default_mod_mask, 0);
-    G_DEF_SETTERS(mGtkAccel);
+    RG_DEF_SMETHOD(set_default_mod_mask, 1);
+    RG_DEF_SMETHOD(default_mod_mask, 0);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/gtk2/rbgtkaccelgroup.c

@@ -1,35 +1,46 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkaccelgroup.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  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 cAccelGroup
 #define _SELF(w) GTK_ACCEL_GROUP(RVAL2GOBJ(w))
 #define RVAL2MOD(mods) (NIL_P(mods) ? 0 : RVAL2GFLAGS(mods, GDK_TYPE_MODIFIER_TYPE))
 
 static VALUE
-gaccelgrp_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     G_INITIALIZE(self, gtk_accel_group_new());
     return Qnil;
 }
 
 static VALUE
-gaccelgrp_connect(int argc, VALUE *argv, VALUE self)
+rg_connect(int argc, VALUE *argv, VALUE self)
 {
     VALUE key, mods, flags, path, closure;
     GClosure *rclosure;
-    
+
     if (argc > 2){
         rb_scan_args(argc, argv, "31", &key, &mods, &flags, &closure);
         if (NIL_P(closure)){
@@ -56,14 +67,14 @@ gaccelgrp_connect(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-gaccelgrp_disconnect_key(VALUE self, VALUE key, VALUE mods)
+rg_disconnect_key(VALUE self, VALUE key, VALUE mods)
 {
     return CBOOL2RVAL(gtk_accel_group_disconnect_key(_SELF(self), NUM2UINT(key),
                                                      RVAL2MOD(mods)));
 }
 
 static VALUE
-gaccelgrp_query(VALUE self, VALUE key, VALUE mods)
+rg_query(VALUE self, VALUE key, VALUE mods)
 {
     GtkAccelGroupEntry *entries;
     guint n_entries;
@@ -84,14 +95,14 @@ gaccelgrp_query(VALUE self, VALUE key, VALUE mods)
 }
 
 static VALUE
-gaccelgrp_disconnect(VALUE self, VALUE closure)
+rg_disconnect(VALUE self, VALUE closure)
 {
     return CBOOL2RVAL(gtk_accel_group_disconnect(_SELF(self),
                                                  (GClosure*)RVAL2BOXED(closure, G_TYPE_CLOSURE)));
 }
 
 static VALUE
-gaccelgrp_s_from_accel_closure(VALUE self, VALUE closure)
+rg_s_from_accel_closure(G_GNUC_UNUSED VALUE self, VALUE closure)
 {
     return GOBJ2RVAL(gtk_accel_group_from_accel_closure(
                          (GClosure*)RVAL2BOXED(closure, G_TYPE_CLOSURE)));
@@ -107,7 +118,7 @@ gaccelgrp_find_func(GtkAccelKey *key, GClosure *closure, gpointer func)
 }
 
 static VALUE
-gaccelgrp_find(VALUE self)
+rg_find(VALUE self)
 {
     GtkAccelKey *result;
     volatile VALUE func = rb_block_proc();
@@ -121,7 +132,7 @@ gaccelgrp_find(VALUE self)
 
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-gaccelgrp_activate(VALUE self, VALUE accel_quark, VALUE acceleratable, VALUE accel_key, VALUE accel_mods)
+rg_activate(VALUE self, VALUE accel_quark, VALUE acceleratable, VALUE accel_key, VALUE accel_mods)
 {
     GQuark quark = 0;
     if (TYPE(accel_quark) == T_STRING){
@@ -142,7 +153,7 @@ _gaccelgrp_lock_ensure(VALUE self)
 }
 
 static VALUE
-gaccelgrp_lock(VALUE self)
+rg_lock(VALUE self)
 {
     gtk_accel_group_lock(_SELF(self));
     if (rb_block_given_p()){
@@ -152,15 +163,14 @@ gaccelgrp_lock(VALUE self)
 }
 
 static VALUE
-gaccelgrp_unlock(VALUE self)
+rg_unlock(VALUE self)
 {
     gtk_accel_group_unlock(_SELF(self));
     return self;
 }
 
-
 static VALUE
-gaccelgrp_s_activate(VALUE self, VALUE obj, VALUE key, VALUE modtype)
+rg_s_activate(G_GNUC_UNUSED VALUE self, VALUE obj, VALUE key, VALUE modtype)
 {
     return CBOOL2RVAL(gtk_accel_groups_activate(G_OBJECT(RVAL2GOBJ(obj)),
                                                 NUM2UINT(key),
@@ -168,31 +178,31 @@ gaccelgrp_s_activate(VALUE self, VALUE obj, VALUE key, VALUE modtype)
 }
 
 static VALUE
-gaccelgrp_s_from_object(VALUE self, VALUE object)
+rg_s_from_object(G_GNUC_UNUSED VALUE self, VALUE object)
 {
     /* Owned by GTK+ */
     return GSLIST2ARY(gtk_accel_groups_from_object(RVAL2GOBJ(object)));
 }
 
 void 
-Init_gtk_accel_group()
+Init_gtk_accel_group(VALUE mGtk)
 {
-    VALUE gAccelGroup = G_DEF_CLASS(GTK_TYPE_ACCEL_GROUP, "AccelGroup", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ACCEL_GROUP, "AccelGroup", mGtk);
 
-    rb_define_singleton_method(gAccelGroup, "activate", gaccelgrp_s_activate, 3);
-    rb_define_singleton_method(gAccelGroup, "from_object", gaccelgrp_s_from_object, 1);
-    rb_define_singleton_method(gAccelGroup, "from_accel_closure", gaccelgrp_s_from_accel_closure, 1);
-    rb_define_method(gAccelGroup, "initialize", gaccelgrp_initialize, 0);
+    RG_DEF_SMETHOD(activate, 3);
+    RG_DEF_SMETHOD(from_object, 1);
+    RG_DEF_SMETHOD(from_accel_closure, 1);
+    RG_DEF_METHOD(initialize, 0);
 #if GTK_CHECK_VERSION(2,4,0)
-    rb_define_method(gAccelGroup, "activate", gaccelgrp_activate, 4);
+    RG_DEF_METHOD(activate, 4);
 #endif
-    rb_define_method(gAccelGroup, "lock", gaccelgrp_lock, 0);
-    rb_define_method(gAccelGroup, "unlock", gaccelgrp_unlock, 0);
-    rb_define_method(gAccelGroup, "connect", gaccelgrp_connect, -1);
-    rb_define_method(gAccelGroup, "disconnect", gaccelgrp_disconnect, 1);
-    rb_define_method(gAccelGroup, "disconnect_key", gaccelgrp_disconnect_key, 2);
-    rb_define_method(gAccelGroup, "query", gaccelgrp_query, 2);
+    RG_DEF_METHOD(lock, 0);
+    RG_DEF_METHOD(unlock, 0);
+    RG_DEF_METHOD(connect, -1);
+    RG_DEF_METHOD(disconnect, 1);
+    RG_DEF_METHOD(disconnect_key, 2);
+    RG_DEF_METHOD(query, 2);
 #if GTK_CHECK_VERSION(2,2,0)
-    rb_define_method(gAccelGroup, "find", gaccelgrp_find, 0);
+    RG_DEF_METHOD(find, 0);
 #endif
 }