gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtklayout.c

@@ -1,24 +1,35 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtklayout.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"
 
+#define RG_TARGET_NAMESPACE cLayout
 #define _SELF(self) (GTK_LAYOUT(RVAL2GOBJ(self)))
 #define RVAL2ADJ(a) (GTK_ADJUSTMENT(RVAL2GOBJ(a)))
 
 static VALUE
-layout_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE hadjustment, vadjustment;
     GtkWidget* layout;
@@ -27,36 +38,36 @@ layout_initialize(int argc, VALUE *argv, VALUE self)
     layout = gtk_layout_new(
         NIL_P(hadjustment) ? 0 : RVAL2ADJ(hadjustment),
         NIL_P(vadjustment) ? 0 : RVAL2ADJ(vadjustment));
-    
+
     RBGTK_INITIALIZE(self, layout);
     return Qnil;
 }
 
 static VALUE
-layout_put(VALUE self, VALUE widget, VALUE x, VALUE y)
+rg_put(VALUE self, VALUE widget, VALUE x, VALUE y)
 {
     gtk_layout_put(_SELF(self), GTK_WIDGET(RVAL2GOBJ(widget)),
-		   NUM2INT(x), NUM2INT(y));
+                   NUM2INT(x), NUM2INT(y));
     return self;
 }
 
 static VALUE
-layout_move(VALUE self, VALUE widget, VALUE x, VALUE y)
+rg_move(VALUE self, VALUE widget, VALUE x, VALUE y)
 {
     gtk_layout_move(_SELF(self), GTK_WIDGET(RVAL2GOBJ(widget)),
-		    NUM2INT(x), NUM2INT(y));
+                    NUM2INT(x), NUM2INT(y));
     return self;
 }
 
 static VALUE
-layout_set_size(VALUE self, VALUE width, VALUE height)
+rg_set_size(VALUE self, VALUE width, VALUE height)
 {
     gtk_layout_set_size(_SELF(self), NUM2UINT(width), NUM2UINT(height));
     return self;
 }
 
 static VALUE
-layout_get_size(VALUE self)
+rg_size(VALUE self)
 {
     guint width, height;
     gtk_layout_get_size(_SELF(self), &width, &height);
@@ -64,20 +75,20 @@ layout_get_size(VALUE self)
 }
 
 static VALUE
-layout_get_bin_window(VALUE self)
+rg_bin_window(VALUE self)
 {
     return GOBJ2RVAL(_SELF(self)->bin_window);
 }
 
 void
-Init_gtk_layout()
+Init_gtk_layout(VALUE mGtk)
 {
-    VALUE gLayout = G_DEF_CLASS(GTK_TYPE_LAYOUT, "Layout", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_LAYOUT, "Layout", mGtk);
 
-    rb_define_method(gLayout, "initialize", layout_initialize, -1);
-    rb_define_method(gLayout, "put", layout_put, 3);
-    rb_define_method(gLayout, "move", layout_move, 3);
-    rb_define_method(gLayout, "set_size", layout_set_size, 2);
-    rb_define_method(gLayout, "size", layout_get_size, 0);
-    rb_define_method(gLayout, "bin_window", layout_get_bin_window, 0);
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD(put, 3);
+    RG_DEF_METHOD(move, 3);
+    RG_DEF_METHOD(set_size, 2);
+    RG_DEF_METHOD(size, 0);
+    RG_DEF_METHOD(bin_window, 0);
 }

data/ext/gtk2/rbgtklinkbutton.c

@@ -1,22 +1,33 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtklinkbutton.c -
-
-  $Author: sakai $
-  $Date: 2007/07/08 03:00:49 $
-
-  Copyright (C) 2006 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 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,10,0)
 
+#define RG_TARGET_NAMESPACE cLinkButton
 #define _SELF(self) (GTK_LINK_BUTTON(RVAL2GOBJ(self)))
 
 static VALUE
-lb_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE uri, label;
     GtkWidget *widget = NULL;
@@ -38,7 +49,7 @@ link_func(GtkLinkButton *button, const gchar *link, gpointer func)
 }
 
 static VALUE
-lb_set_uri_hook(VALUE self)
+rg_s_set_uri_hook(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -48,12 +59,12 @@ lb_set_uri_hook(VALUE self)
 #endif 
 
 void 
-Init_gtk_link_button()
+Init_gtk_link_button(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,10,0)
-    VALUE button = G_DEF_CLASS(GTK_TYPE_LINK_BUTTON, "LinkButton", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_LINK_BUTTON, "LinkButton", mGtk);
 
-    rb_define_method(button, "initialize", lb_initialize, -1);
-    rb_define_singleton_method(button, "set_uri_hook", lb_set_uri_hook, 0);
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_SMETHOD(set_uri_hook, 0);
 #endif
 }

data/ext/gtk2/rbgtkliststore.c

@@ -1,22 +1,33 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkliststore.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 14:27:09 $
-
-  Copyright (C) 2002-2005 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-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"
 
+#define RG_TARGET_NAMESPACE cListStore
 #define _SELF(s) (GTK_LIST_STORE(RVAL2GOBJ(s)))
 
 static ID id_to_a, id_size;
 
 static VALUE
-lstore_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     gint cnt;
     GtkListStore* store;
@@ -30,18 +41,18 @@ lstore_initialize(int argc, VALUE *argv, VALUE self)
     }
 
     store = gtk_list_store_newv(argc, buf);
- 
+
     G_INITIALIZE(self, store);
 
     return Qnil;
 }
 
 static VALUE
-lstore_set_column_types(int argc, VALUE *argv, VALUE self)
+rg_set_column_types(int argc, VALUE *argv, VALUE self)
 {
     gint cnt;
     GType* buf;
-  
+
     if (argc == 0) rb_raise(rb_eArgError, "need more than 1 class type.");
     buf = ALLOCA_N(GType, argc);
     for (cnt = 0; cnt < argc; cnt++) {
@@ -54,17 +65,17 @@ lstore_set_column_types(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-lstore_set_value(VALUE self, VALUE iter, VALUE column, VALUE value)
+rg_set_value(VALUE self, VALUE iter, VALUE column, VALUE value)
 {
     GType gtype = gtk_tree_model_get_column_type(GTK_TREE_MODEL(RVAL2GOBJ(self)), NUM2INT(column));
-    GValue gval = {0,};
+    GValue gval = G_VALUE_INIT;
     g_value_init(&gval, gtype);
 
     rbgobj_rvalue_to_gvalue(value, &gval);
 
     G_CHILD_ADD(self, iter);
     G_CHILD_ADD(iter, value);
-    
+
     gtk_list_store_set_value(_SELF(self), RVAL2GTKTREEITER(iter), NUM2INT(column), &gval);
 
     g_value_unset(&gval);
@@ -100,7 +111,7 @@ collect_value(VALUE key, VALUE value, ValuesInfo *info)
 
 static void
 hash_to_values(VALUE hash, VALUE iter, GtkTreeModel *model,
-	       gint *g_columns, GValue *g_values, gint length)
+               gint *g_columns, GValue *g_values, G_GNUC_UNUSED gint length)
 {
     ValuesInfo info;
 
@@ -114,12 +125,12 @@ hash_to_values(VALUE hash, VALUE iter, GtkTreeModel *model,
 
 static void
 array_to_values(VALUE array, VALUE iter, GtkTreeModel *model,
-		gint *g_columns, GValue *g_values, gint length)
+                gint *g_columns, GValue *g_values, gint length)
 {
     gint i;
 
     for (i = 0; i < length; i++) {
-	GType g_type;
+        GType g_type;
 
         g_columns[i] = i;
         g_type = gtk_tree_model_get_column_type(model, i);
@@ -130,7 +141,7 @@ array_to_values(VALUE array, VALUE iter, GtkTreeModel *model,
 }
 
 static VALUE
-lstore_set_valuesv(VALUE self, VALUE iter, VALUE values)
+rg_set_values(VALUE self, VALUE iter, VALUE values)
 {
     GValue *g_values;
     GtkListStore *store;
@@ -151,17 +162,17 @@ lstore_set_valuesv(VALUE self, VALUE iter, VALUE values)
     store = _SELF(self);
     model = GTK_TREE_MODEL(store);
     if (RVAL2CBOOL(rb_obj_is_kind_of(values, rb_cHash))) {
-	hash_to_values(values, iter, model, g_columns, g_values, length);
+        hash_to_values(values, iter, model, g_columns, g_values, length);
     }
     else if (RVAL2CBOOL(rb_obj_is_kind_of(values, rb_cArray))) {
-	array_to_values(values, iter, model, g_columns, g_values, length);
+        array_to_values(values, iter, model, g_columns, g_values, length);
     }
     else {
-	rb_raise(rb_eArgError, "must be array or hash of values");
+        rb_raise(rb_eArgError, "must be array or hash of values");
     }
 
     gtk_list_store_set_valuesv(store, RVAL2GTKTREEITER(iter),
-			       g_columns, g_values, length);
+                               g_columns, g_values, length);
 
     for (i = 0; i < length; i++)
         g_value_unset(&g_values[i]);
@@ -179,9 +190,9 @@ lstore_set_valuesv(VALUE self, VALUE iter, VALUE values)
   GtkTreeIter *iter,
   va_list var_args);
 */
-    
+
 static VALUE
-lstore_remove(VALUE self, VALUE iter)
+rg_remove(VALUE self, VALUE iter)
 {
     G_CHILD_REMOVE(self, iter);
 #if GTK_CHECK_VERSION(2,2,0)
@@ -192,64 +203,98 @@ lstore_remove(VALUE self, VALUE iter)
 #endif
 }
 
+struct lstore_insert_args {
+    GtkListStore *store;
+    GtkTreeIter iter;
+    gint position;
+    VALUE ary;
+    long i;
+    long n;
+    gint *columns;
+    GValue *values;
+};
+
+static VALUE
+lstore_insert_body(VALUE value)
+{
+    struct lstore_insert_args *args = (struct lstore_insert_args *)value;
+    GtkTreeModel *model = GTK_TREE_MODEL(args->store);
+
+    for (args->i = 0; args->i < args->n; args->i++) {
+        VALUE ary = rb_ary_to_ary(RARRAY_PTR(args->ary)[args->i]);
+
+        args->columns[args->i] = NUM2INT(RARRAY_PTR(ary)[1]);
+        g_value_init(&args->values[args->i],
+                     gtk_tree_model_get_column_type(model, args->columns[args->i]));
+        rbgobj_rvalue_to_gvalue(RARRAY_PTR(ary)[0], &args->values[args->i]);
+    }
+
+    gtk_list_store_insert_with_valuesv(args->store,
+                                       &args->iter,
+                                       args->position,
+                                       args->columns,
+                                       args->values,
+                                       args->n);
+
+    return Qnil;
+}
+
+static VALUE
+lstore_insert_ensure(VALUE value)
+{
+    long i;
+    struct lstore_insert_args *args = (struct lstore_insert_args *)value;
+
+    for (i = 0; i < args->i; i++)
+        g_value_unset(&args->values[i]);
+
+    g_free(args->values);
+    g_free(args->columns);
+
+    return Qnil;
+}
+
 /*
   Gtk::ListStore#insert(pos, val1 => 0, val2 => 2, ... )
  */
 static VALUE
-lstore_insert(int argc, VALUE *argv, VALUE self)
+rg_insert(int argc, VALUE *argv, VALUE self)
 {
-    VALUE position, values, ret;
-    GtkTreeIter iter;
-    GtkListStore* store = _SELF(self);
+    VALUE position, values, result;
+    struct lstore_insert_args args;
+    args.store = _SELF(self);
 
     rb_scan_args(argc, argv, "11", &position, &values);
+    args.position = NUM2INT(position);
 
     if (NIL_P(values)){
-        gtk_list_store_insert(store, &iter, NUM2INT(position));
+        gtk_list_store_insert(args.store, &args.iter, args.position);
     } else {
 #if GTK_CHECK_VERSION(2,6,0)
-        gint cnt, n_values;
-        gint* columns;
-        GType gtype;
-        GValue* gvalues;
-        VALUE ary = rb_funcall(values, id_to_a, 0);
-
-        n_values = RARRAY_LEN(ary);
-        
-        gvalues = g_new(GValue, n_values);
-        columns = g_new(gint, n_values);
-        
-        for (cnt = 0; cnt < n_values; cnt++) {
-            Check_Type(RARRAY_PTR(ary)[cnt], T_ARRAY);
-            columns[cnt] = NUM2INT(RARRAY_PTR(RARRAY_PTR(ary)[cnt])[1]);
-            gtype = gtk_tree_model_get_column_type(GTK_TREE_MODEL(store), columns[cnt]);
-            gvalues[cnt].g_type = 0;
-            g_value_init(&gvalues[cnt], gtype);
-            rbgobj_rvalue_to_gvalue(RARRAY_PTR(RARRAY_PTR(ary)[cnt])[0], &gvalues[cnt]);
-        }
-        
-        gtk_list_store_insert_with_valuesv(store, &iter, NUM2INT(position),
-                                           columns, gvalues, n_values);
-        
-        for (cnt = 0; cnt < n_values; cnt++) {
-            g_value_unset(&gvalues[cnt]);
-        }
-        g_free(gvalues);
-        g_free(columns);
+        args.ary = rb_funcall(values, id_to_a, 0);
+        args.n = RARRAY_LEN(args.ary);
+        args.columns = g_new(gint, args.n);
+        args.values = g_new0(GValue, args.n);
+
+        rb_ensure(lstore_insert_body, (VALUE)&args,
+                  lstore_insert_ensure, (VALUE)&args);
 #else
-        gtk_list_store_insert(store, &iter, NUM2INT(position));
-        rb_warn("Ignored 2nd argument under this environment. Because it has been supported since GTK+-2.6. ");
+        gtk_list_store_insert(args.store, &args.iter, args.position);
+        rb_warn("Ignored 2nd argument under this environment, as it has been supported since GTK+-2.6.");
 #endif
     }
-    iter.user_data3 = store;
 
-    ret = GTKTREEITER2RVAL(&iter);
-    G_CHILD_ADD(self, ret);
-    return ret;
+    args.iter.user_data3 = args.store;
+
+    result = GTKTREEITER2RVAL(&args.iter);
+
+    G_CHILD_ADD(self, result);
+
+    return result;
 }
 
 static VALUE
-lstore_insert_before(VALUE self, VALUE sibling)
+rg_insert_before(VALUE self, VALUE sibling)
 {
     VALUE ret;
     GtkTreeIter iter;
@@ -263,7 +308,7 @@ lstore_insert_before(VALUE self, VALUE sibling)
 }
 
 static VALUE
-lstore_insert_after(VALUE self, VALUE sibling)
+rg_insert_after(VALUE self, VALUE sibling)
 { 
     VALUE ret;
     GtkTreeIter iter;
@@ -277,7 +322,7 @@ lstore_insert_after(VALUE self, VALUE sibling)
 }
 
 static VALUE
-lstore_prepend(VALUE self)
+rg_prepend(VALUE self)
 {
     VALUE ret;
     GtkTreeIter iter;
@@ -291,21 +336,21 @@ lstore_prepend(VALUE self)
 }
 
 static VALUE
-lstore_append(VALUE self)
+rg_append(VALUE self)
 {
     VALUE ret;
     GtkTreeIter iter;
     GtkListStore* model = _SELF(self);
     gtk_list_store_append(model, &iter);
     iter.user_data3 = model;
-    
+
     ret = GTKTREEITER2RVAL(&iter);
     G_CHILD_ADD(self, ret);
     return ret;
 }
 
 static VALUE
-lstore_clear(VALUE self)
+rg_clear(VALUE self)
 {
     G_CHILD_REMOVE_ALL(self);
     gtk_list_store_clear(_SELF(self));
@@ -314,42 +359,40 @@ lstore_clear(VALUE self)
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-lstore_iter_is_valid(VALUE self, VALUE iter)
+rg_iter_is_valid_p(VALUE self, VALUE iter)
 {
     return (NIL_P(iter)) ? Qfalse :
         CBOOL2RVAL(gtk_list_store_iter_is_valid(_SELF(self), RVAL2GTKTREEITER(iter)));
 }
 
 static VALUE
-lstore_reorder(VALUE self, VALUE new_order)
+rg_reorder(VALUE self, VALUE rbnew_order)
 {
-    gint i;
-    gint len = RARRAY_LEN(new_order);
-    gint* gnew_order = g_new(gint, len);
+    GtkListStore *store = _SELF(self);
+    long n;
+    gint *new_order = RVAL2GINTS(rbnew_order, n);
 
-    for (i = 0; i < len; i++){
-        gnew_order[i] = NUM2INT(RARRAY_PTR(new_order)[i]);
-    }
+    gtk_list_store_reorder(store, new_order);
+
+    g_free(new_order);
 
-    gtk_list_store_reorder(_SELF(self), gnew_order);
-    g_free(gnew_order);
     return self;
 }
 static VALUE
-lstore_swap(VALUE self, VALUE iter1, VALUE iter2)
+rg_swap(VALUE self, VALUE iter1, VALUE iter2)
 {
     gtk_list_store_swap(_SELF(self), RVAL2GTKTREEITER(iter1), RVAL2GTKTREEITER(iter2));
     return self;
 }
 static VALUE
-lstore_move_before(VALUE self, VALUE iter, VALUE position)
+rg_move_before(VALUE self, VALUE iter, VALUE position)
 {
     gtk_list_store_move_before(_SELF(self), RVAL2GTKTREEITER(iter), 
                                NIL_P(position) ? NULL : RVAL2GTKTREEITER(position));
     return self;
 }
 static VALUE
-lstore_move_after(VALUE self, VALUE iter, VALUE position)
+rg_move_after(VALUE self, VALUE iter, VALUE position)
 {
     gtk_list_store_move_after(_SELF(self), RVAL2GTKTREEITER(iter), 
                                NIL_P(position) ? NULL : RVAL2GTKTREEITER(position));
@@ -358,34 +401,34 @@ lstore_move_after(VALUE self, VALUE iter, VALUE position)
 #endif
 
 void
-Init_gtk_list_store()
+Init_gtk_list_store(VALUE mGtk)
 {
-    VALUE ls = G_DEF_CLASS(GTK_TYPE_LIST_STORE, "ListStore", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_LIST_STORE, "ListStore", mGtk);
 
     id_to_a = rb_intern("to_a");
     id_size = rb_intern("size");
 
     rbgtk_register_treeiter_set_value_func(GTK_TYPE_LIST_STORE, 
                                            (rbgtkiter_set_value_func)&gtk_list_store_set_value);
-    rb_define_method(ls, "initialize", lstore_initialize, -1);
-    rb_define_method(ls, "set_column_types", lstore_set_column_types, -1);
-    rb_define_method(ls, "set_value", lstore_set_value, 3);
-    rb_define_method(ls, "remove", lstore_remove, 1);
-    rb_define_method(ls, "insert", lstore_insert, -1);
-    rb_define_method(ls, "insert_before", lstore_insert_before, 1);
-    rb_define_method(ls, "insert_after", lstore_insert_after, 1);
-    rb_define_method(ls, "prepend", lstore_prepend, 0);
-    rb_define_method(ls, "append", lstore_append, 0);
-    rb_define_method(ls, "clear", lstore_clear, 0);
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD(set_column_types, -1);
+    RG_DEF_METHOD(set_value, 3);
+    RG_DEF_METHOD(remove, 1);
+    RG_DEF_METHOD(insert, -1);
+    RG_DEF_METHOD(insert_before, 1);
+    RG_DEF_METHOD(insert_after, 1);
+    RG_DEF_METHOD(prepend, 0);
+    RG_DEF_METHOD(append, 0);
+    RG_DEF_METHOD(clear, 0);
 #if GTK_CHECK_VERSION(2,2,0)
-    rb_define_method(ls, "iter_is_valid?", lstore_iter_is_valid, 1);
-    rb_define_method(ls, "reorder", lstore_reorder, 1);
-    rb_define_method(ls, "swap", lstore_swap, 2);
-    rb_define_method(ls, "move_before", lstore_move_before, 2);
-    rb_define_method(ls, "move_after", lstore_move_after, 2);
+    RG_DEF_METHOD_P(iter_is_valid, 1);
+    RG_DEF_METHOD(reorder, 1);
+    RG_DEF_METHOD(swap, 2);
+    RG_DEF_METHOD(move_before, 2);
+    RG_DEF_METHOD(move_after, 2);
 #endif
 #if GTK_CHECK_VERSION(2, 12, 0)
-    rb_define_method(ls, "set_values", lstore_set_valuesv, 2);
+    RG_DEF_METHOD(set_values, 2);
 #endif
 
 }