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

data/ext/gtk2/rbgtkcombobox.c

@@ -1,23 +1,34 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkcombobox.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  Copyright (C) 2004 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2004  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 cComboBox
 #define _SELF(self) (GTK_COMBO_BOX(RVAL2GOBJ(self)))
 #define RVAL2WIDGET(w) (GTK_WIDGET(RVAL2GOBJ(w)))
 
 static VALUE
-combobox_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE model_or_false;
     GtkWidget* widget;
@@ -39,22 +50,8 @@ combobox_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-/* Defined as properties.
-void        gtk_combo_box_set_wrap_width    (GtkComboBox *combo_box,
-                                             gint width);
-void        gtk_combo_box_set_row_span_column
-                                            (GtkComboBox *combo_box,
-                                             gint row_span);
-void        gtk_combo_box_set_column_span_column
-                                            (GtkComboBox *combo_box,
-                                             gint column_span);
-gint        gtk_combo_box_get_active        (GtkComboBox *combo_box);
-void        gtk_combo_box_set_active        (GtkComboBox *combo_box,
-                                             gint index);
-*/
-
 static VALUE
-combobox_get_active_iter(VALUE self)
+rg_active_iter(VALUE self)
 {
     GtkTreeIter iter;
     VALUE val = Qnil;
@@ -67,75 +64,50 @@ combobox_get_active_iter(VALUE self)
 }
 
 static VALUE
-combobox_set_active_iter(VALUE self, VALUE iter)
+rg_set_active_iter(VALUE self, VALUE iter)
 {
     gtk_combo_box_set_active_iter(_SELF(self), RVAL2GTKTREEITER(iter));
     return self;
 }
 
-/* Defined as properties 
-GtkTreeModel* gtk_combo_box_get_model       (GtkComboBox *combo_box);
-void        gtk_combo_box_set_model         (GtkComboBox *combo_box,
-                                             GtkTreeModel *model);
-*/
-
-
 static VALUE
-combobox_append_text(VALUE self, VALUE text)
+rg_append_text(VALUE self, VALUE text)
 {
     gtk_combo_box_append_text(_SELF(self), RVAL2CSTR(text));
     return self;
 }
 
 static VALUE
-combobox_insert_text(VALUE self, VALUE position, VALUE text)
+rg_insert_text(VALUE self, VALUE position, VALUE text)
 {
     gtk_combo_box_insert_text(_SELF(self), NUM2INT(position), RVAL2CSTR(text));
     return self;
 }
 
 static VALUE
-combobox_prepend_text(VALUE self, VALUE text)
+rg_prepend_text(VALUE self, VALUE text)
 {
     gtk_combo_box_prepend_text(_SELF(self), RVAL2CSTR(text));
     return self;
 }
 
 static VALUE
-combobox_remove_text(VALUE self, VALUE position)
+rg_remove_text(VALUE self, VALUE position)
 {
     gtk_combo_box_remove_text(_SELF(self), NUM2INT(position));
     return self;
 }
-    
-/* Defined as Signals
-void                gtk_combo_box_popup                 (GtkComboBox *combo_box);
-void                gtk_combo_box_popdown               (GtkComboBox *combo_box);
-*/
 
 #if GTK_CHECK_VERSION(2,6,0)
-/* Defined as Property
-void        gtk_combo_box_set_add_tearoffs  (GtkComboBox *combo_box,
-                                             gboolean add_tearoffs);
-gboolean    gtk_combo_box_get_add_tearoffs  (GtkComboBox *combo_box);
-gint        gtk_combo_box_get_column_span_column
-                                            (GtkComboBox *combo_box);
-gint        gtk_combo_box_get_wrap_width    (GtkComboBox *combo_box);
-
-gboolean    gtk_combo_box_get_focus_on_click
-                                            (GtkComboBox *combo);
-gint        gtk_combo_box_get_row_span_column
-                                            (GtkComboBox *combo_box);
- */
 
 static VALUE
-combobox_get_active_text(VALUE self)
+rg_active_text(VALUE self)
 {
     return CSTR2RVAL_FREE(gtk_combo_box_get_active_text(_SELF(self)));
 }
 
 static VALUE
-combobox_get_popup_accessible(VALUE self)
+rg_popup_accessible(VALUE self)
 {
     return GOBJ2RVAL(gtk_combo_box_get_popup_accessible(_SELF(self)));
 }
@@ -154,7 +126,7 @@ row_separator_func(GtkTreeModel *model, GtkTreeIter *iter, gpointer *func)
 }
 
 static VALUE
-combobox_set_row_separator_func(VALUE self)
+rg_set_row_separator_func(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -164,39 +136,28 @@ combobox_set_row_separator_func(VALUE self)
     return self;
 }
 
-/* Defined as Properties
-void                gtk_combo_box_set_focus_on_click    (GtkComboBox *combo,
-                                                         gboolean focus_on_click);
- */
-
 #endif
 #endif
 
-/* Defined as Properties
-void        gtk_combo_box_set_title         (GtkComboBox *combo_box,
-                                             const gchar *title);
-const gchar* gtk_combo_box_get_title        (GtkComboBox *combo_box);
- */
-
 void 
-Init_gtk_combobox()
+Init_gtk_combobox(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,4,0)
-    VALUE gCombobox = G_DEF_CLASS(GTK_TYPE_COMBO_BOX, "ComboBox", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_COMBO_BOX, "ComboBox", mGtk);
 
-    rb_define_method(gCombobox, "initialize", combobox_initialize, -1);
-    rb_define_method(gCombobox, "active_iter", combobox_get_active_iter, 0);
-    rb_define_method(gCombobox, "set_active_iter", combobox_set_active_iter, 1);
-    G_DEF_SETTER(gCombobox, "active_iter");
-    rb_define_method(gCombobox, "append_text", combobox_append_text, 1);
-    rb_define_method(gCombobox, "insert_text", combobox_insert_text, 2);
-    rb_define_method(gCombobox, "prepend_text", combobox_prepend_text, 1);
-    rb_define_method(gCombobox, "remove_text", combobox_remove_text, 1);
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD(active_iter, 0);
+    RG_DEF_METHOD(set_active_iter, 1);
+    G_DEF_SETTER(RG_TARGET_NAMESPACE, "active_iter");
+    RG_DEF_METHOD(append_text, 1);
+    RG_DEF_METHOD(insert_text, 2);
+    RG_DEF_METHOD(prepend_text, 1);
+    RG_DEF_METHOD(remove_text, 1);
 
 #if GTK_CHECK_VERSION(2,6,0)
-    rb_define_method(gCombobox, "active_text", combobox_get_active_text, 0);
-    rb_define_method(gCombobox, "popup_accessible", combobox_get_popup_accessible, 0);
-    rb_define_method(gCombobox, "set_row_separator_func", combobox_set_row_separator_func, 0);
+    RG_DEF_METHOD(active_text, 0);
+    RG_DEF_METHOD(popup_accessible, 0);
+    RG_DEF_METHOD(set_row_separator_func, 0);
 #endif
 #endif
 }

data/ext/gtk2/rbgtkcomboboxentry.c

@@ -1,20 +1,32 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkcomboboxentry.c -
-
-  $Author: mutoh $
-  $Date: 2004/05/30 16:41:13 $
-
-  Copyright (C) 2004 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2004  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 cComboBoxEntry
+
 static VALUE
-comboboxentry_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE model_or_false, text_column;
     GtkWidget* widget;
@@ -38,20 +50,13 @@ comboboxentry_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-/* Defined as property.
-void        gtk_combo_box_entry_set_text_column
-                                            (GtkComboBoxEntry *entry_box,
-                                             gint text_column);
-gint        gtk_combo_box_entry_get_text_column
-                                            (GtkComboBoxEntry *entry_box);
-*/
 #endif
 
 void 
-Init_gtk_comboboxentry()
+Init_gtk_comboboxentry(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,4,0)
-    VALUE gComboboxentry = G_DEF_CLASS(GTK_TYPE_COMBO_BOX_ENTRY, "ComboBoxEntry", mGtk);
-    rb_define_method(gComboboxentry, "initialize", comboboxentry_initialize, -1);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_COMBO_BOX_ENTRY, "ComboBoxEntry", mGtk);
+    RG_DEF_METHOD(initialize, -1);
 #endif
 }

data/ext/gtk2/rbgtkconst.c

@@ -1,16 +1,26 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkconst.c -
-
-  $Author: mutoh $
-  $Date: 2005/09/28 17:54:00 $
-
-  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"
 
@@ -18,7 +28,7 @@
  * constants
  */
 void 
-Init_gtk_const()
+Init_gtk_const(VALUE mGtk)
 {
     /*
      * version information

data/ext/gtk2/rbgtkcontainer.c

@@ -1,19 +1,30 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkcontainer.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"
 
+#define RG_TARGET_NAMESPACE cContainer
 #define _SELF(s) (GTK_CONTAINER(RVAL2GOBJ(self)))
 
 /*
@@ -25,13 +36,13 @@ static VALUE type_to_prop_setter_table;
 static VALUE type_to_prop_getter_table;
 
 static VALUE
-cont_is_resize_container(VALUE self)
+rg_resize_container_p(VALUE self)
 {
     return CBOOL2RVAL(GTK_IS_RESIZE_CONTAINER(_SELF(self)));
 }
 
 static VALUE
-cont_remove(VALUE self, VALUE other)
+rg_remove(VALUE self, VALUE other)
 {
     G_CHILD_REMOVE(self, other);
     gtk_container_remove(_SELF(self), GTK_WIDGET(RVAL2GOBJ(other)));
@@ -39,14 +50,14 @@ cont_remove(VALUE self, VALUE other)
 }
 
 static VALUE
-cont_check_resize(VALUE self)
+rg_check_resize(VALUE self)
 {
     gtk_container_check_resize(_SELF(self));
     return self;
 }
 
 static VALUE
-cont_foreach(int argc, VALUE *argv, VALUE self)
+rg_each(int argc, VALUE *argv, VALUE self)
 {
     VALUE callback;
 
@@ -59,7 +70,7 @@ cont_foreach(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-cont_forall(int argc, VALUE *argv, VALUE self)
+rg_each_forall(int argc, VALUE *argv, VALUE self)
 {
     VALUE callback;
 
@@ -72,28 +83,27 @@ cont_forall(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-cont_get_children(VALUE self)
+rg_children(VALUE self)
 {
    return GLIST2ARYF(gtk_container_get_children(_SELF(self)));
 }
 
 static VALUE
-cont_set_reallocate_redraws(VALUE self, VALUE needs_redraws)
+rg_set_reallocate_redraws(VALUE self, VALUE needs_redraws)
 {
     gtk_container_set_reallocate_redraws(_SELF(self), RVAL2CBOOL(needs_redraws));
     return self;
 }
 
-
 static VALUE
-cont_set_focus_child(VALUE self, VALUE child)
+rg_set_focus_child(VALUE self, VALUE child)
 {
     gtk_container_set_focus_child(_SELF(self), GTK_WIDGET(RVAL2GOBJ(child)));
     return self;
 }
 
 static VALUE
-cont_set_focus_vadjustment(VALUE self, VALUE adjustment)
+rg_set_focus_vadjustment(VALUE self, VALUE adjustment)
 {
     gtk_container_set_focus_vadjustment(_SELF(self),
                                         NIL_P(adjustment) ? NULL : GTK_ADJUSTMENT(RVAL2GOBJ(adjustment)));
@@ -101,7 +111,7 @@ cont_set_focus_vadjustment(VALUE self, VALUE adjustment)
 }
 
 static VALUE
-cont_set_focus_hadjustment(VALUE self, VALUE adjustment)
+rg_set_focus_hadjustment(VALUE self, VALUE adjustment)
 {
     gtk_container_set_focus_hadjustment(_SELF(self),
                                         NIL_P(adjustment) ? NULL : GTK_ADJUSTMENT(RVAL2GOBJ(adjustment)));
@@ -109,28 +119,28 @@ cont_set_focus_hadjustment(VALUE self, VALUE adjustment)
 }
 
 static VALUE
-cont_get_focus_vadjustment(VALUE self)
+rg_focus_vadjustment(VALUE self)
 {
     GtkAdjustment* adj = gtk_container_get_focus_vadjustment(_SELF(self));
     return adj ? GOBJ2RVAL(adj) : Qnil;
 }
 
 static VALUE
-cont_get_focus_hadjustment(VALUE self)
+rg_focus_hadjustment(VALUE self)
 {
     GtkAdjustment* adj = gtk_container_get_focus_hadjustment(_SELF(self));
     return adj ? GOBJ2RVAL(adj) : Qnil;
 }
 
 static VALUE
-cont_get_resize_children(VALUE self)
+rg_resize_children(VALUE self)
 {
     gtk_container_resize_children(_SELF(self));
     return self;
 }
 
 static VALUE
-cont_get_child_type(VALUE self)
+rg_child_type(VALUE self)
 {
     return GTYPE2CLASS(gtk_container_child_type(_SELF(self)));
 }
@@ -187,7 +197,7 @@ rbgtkcontainer_register_child_property_getter(GType gtype, const char *name, GVa
 }
 
 static VALUE
-cont_child_get_property(VALUE self, VALUE child, VALUE prop_name)
+rg_child_get_property(VALUE self, VALUE child, VALUE prop_name)
 {
     GParamSpec* pspec;
     const char* name;
@@ -205,9 +215,9 @@ cont_child_get_property(VALUE self, VALUE child, VALUE prop_name)
         rb_raise(rb_eArgError, "No such property: %s", name);
     else {
         GValueToRValueFunc getter = NULL;
-        GValue gval = {0,};
+        GValue gval = G_VALUE_INIT;
         VALUE ret;
-        
+
         {
             VALUE table = rb_hash_aref(type_to_prop_getter_table,
                                        INT2FIX(pspec->owner_type));
@@ -231,7 +241,7 @@ cont_child_get_property(VALUE self, VALUE child, VALUE prop_name)
 }
 
 static VALUE
-cont_child_set_property(VALUE self, VALUE child, VALUE prop_name, VALUE val)
+rg_child_set_property(VALUE self, VALUE child, VALUE prop_name, VALUE val)
 {
     GParamSpec* pspec;
     const char* name;
@@ -249,7 +259,7 @@ cont_child_set_property(VALUE self, VALUE child, VALUE prop_name, VALUE val)
         rb_raise(rb_eArgError, "No such property: %s", name);
     else {
         RValueToGValueFunc setter = NULL;
-        GValue gval = {0,};
+        GValue gval = G_VALUE_INIT;
         g_value_init(&gval, G_PARAM_SPEC_VALUE_TYPE(pspec));
 
         {
@@ -280,7 +290,7 @@ cont_child_set_property(VALUE self, VALUE child, VALUE prop_name, VALUE val)
 }
 
 static VALUE
-cont_add(int argc, VALUE *argv, VALUE self)
+rg_add(int argc, VALUE *argv, VALUE self)
 {
     VALUE other, properties;
     GtkWidget *child;
@@ -297,13 +307,13 @@ cont_add(int argc, VALUE *argv, VALUE self)
         int i;
         VALUE ary;
         GObject* obj;
-                                                                                
+
         Check_Type(properties, T_HASH);
         ary = rb_funcall(properties, rb_intern("to_a"), 0);
         obj = RVAL2GOBJ(self);
-        
+
         for (i = 0; i < RARRAY_LEN(ary); i++) {
-            cont_child_set_property(self, other, 
+            rg_child_set_property(self, other, 
                        RARRAY_PTR(RARRAY_PTR(ary)[i])[0],
                        RARRAY_PTR(RARRAY_PTR(ary)[i])[1]);
         }
@@ -324,7 +334,7 @@ void        gtk_container_child_set_valist  (GtkContainer *container,
 */
 
 static VALUE
-cont_propagate_expose(VALUE self, VALUE child, VALUE event)
+rg_propagate_expose(VALUE self, VALUE child, VALUE event)
 {
     gtk_container_propagate_expose(_SELF(self), GTK_WIDGET(RVAL2GOBJ(child)),
                                    (GdkEventExpose *)RVAL2GEV(event));
@@ -332,7 +342,7 @@ cont_propagate_expose(VALUE self, VALUE child, VALUE event)
 }
 
 static VALUE
-cont_get_focus_chain(VALUE self)
+rg_focus_chain(VALUE self)
 {
     gboolean ret;
     GList *glist = NULL;
@@ -340,31 +350,71 @@ cont_get_focus_chain(VALUE self)
     return GLIST2ARYF(glist);
 }
 
+struct rval2gtkwidgetglist_args {
+    VALUE ary;
+    long n;
+    GList *result;
+};
+
 static VALUE
-cont_set_focus_chain(VALUE self, VALUE focusable_widgets)
+rbg_rval2gtkwidgetglist_body(VALUE value)
 {
-    int i;
-    GList *glist = NULL;
+    long i;
+    struct rval2gtkwidgetglist_args *args = (struct rval2gtkwidgetglist_args *)value;
 
-    Check_Type(focusable_widgets, T_ARRAY);
-    for (i = 0; i < RARRAY_LEN(focusable_widgets); i++) {
-        glist = g_list_append(glist, RVAL2GOBJ(RARRAY_PTR(focusable_widgets)[i]));
-    }
-    gtk_container_set_focus_chain(_SELF(self), glist);
-    g_list_free(glist);
+    for (i = 0; i < args->n; i++)
+        args->result = g_list_append(args->result, GTK_WIDGET(RVAL2GOBJ(RARRAY_PTR(args->ary)[i])));
+
+    return Qnil;
+}
+
+static G_GNUC_NORETURN VALUE
+rbg_rval2gtkwidgetglist_rescue(VALUE value)
+{
+    g_list_free(((struct rval2gtkwidgetglist_args *)value)->result);
+
+    rb_exc_raise(rb_errinfo());
+}
+
+static GList *
+rbg_rval2gtkwidgetglist(VALUE value)
+{
+    struct rval2gtkwidgetglist_args args;
+
+    args.ary = rb_ary_to_ary(value);
+    args.n = RARRAY_LEN(args.ary);
+    args.result = NULL;
+
+    rb_rescue(rbg_rval2gtkwidgetglist_body, (VALUE)&args,
+              rbg_rval2gtkwidgetglist_rescue, (VALUE)&args);
+
+    return args.result;
+}
+
+#define RVAL2GTKWIDGETGLIST(value) rbg_rval2gtkwidgetglist(value)
+
+static VALUE
+rg_set_focus_chain(VALUE self, VALUE rbfocusable_widgets)
+{
+    GtkContainer *container = _SELF(self);
+    GList *focusable_widgets = RVAL2GTKWIDGETGLIST(rbfocusable_widgets);
+
+    gtk_container_set_focus_chain(container, focusable_widgets);
+
+    g_list_free(focusable_widgets);
 
     return self;
 }
 
 static VALUE
-cont_unset_focus_chain(VALUE self)
+rg_unset_focus_chain(VALUE self)
 {
     gtk_container_unset_focus_chain(_SELF(self));
     return self;
 }
 
 static VALUE
-cont_s_child_property(VALUE self, VALUE property_name)
+rg_s_child_property(VALUE self, VALUE property_name)
 {
     GObjectClass* oclass;
     const char* name;
@@ -391,7 +441,7 @@ cont_s_child_property(VALUE self, VALUE property_name)
 }
 
 static VALUE
-cont_s_install_child_property(int argc, VALUE *argv, VALUE self)
+rg_s_install_child_property(int argc, VALUE *argv, VALUE self)
 {
     const RGObjClassInfo* cinfo = rbgobj_lookup_class(self);
     GtkContainerClass* gclass;
@@ -415,7 +465,7 @@ cont_s_install_child_property(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-cont_s_child_properties(int argc, VALUE *argv, VALUE self)
+rg_s_child_properties(int argc, VALUE *argv, VALUE self)
 {
     GObjectClass* oclass = g_type_class_ref(CLASS2GTYPE(self));
     guint n_properties;
@@ -451,7 +501,7 @@ cont_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE params_hash;
     GObject* gobj;
-    
+
     rb_scan_args(argc, argv, "01", &params_hash);
 
     if (!NIL_P(params_hash))
@@ -466,7 +516,7 @@ cont_initialize(int argc, VALUE *argv, VALUE self)
 // FIXME: use rb_protect
 static void
 get_prop_func(GObject* object,
-              guint property_id,
+              G_GNUC_UNUSED guint property_id,
               GValue* value,
               GParamSpec* pspec)
 {
@@ -492,7 +542,7 @@ get_prop_func(GObject* object,
 // FIXME: use rb_protect
 static void
 set_prop_func(GObject* object,
-              guint property_id,
+              G_GNUC_UNUSED guint property_id,
               const GValue* value,
               GParamSpec* pspec)
 {
@@ -514,11 +564,11 @@ set_prop_func(GObject* object,
 
 // FIXME: use rb_protect
 static void
-get_child_prop_func(GtkContainer* container,
-                    GtkWidget*    child,
-                    guint         property_id,
-                    GValue*       value,
-                    GParamSpec*   pspec)
+get_child_prop_func(GtkContainer *container,
+                    GtkWidget *child,
+                    G_GNUC_UNUSED guint property_id,
+                    GValue *value,
+                    GParamSpec *pspec)
 {
     ID ruby_getter = (ID)g_param_spec_get_qdata(pspec, q_ruby_getter);
     if (!ruby_getter) {
@@ -541,11 +591,11 @@ get_child_prop_func(GtkContainer* container,
 
 // FIXME: use rb_protect
 static void
-set_child_prop_func(GtkContainer* container,
-                    GtkWidget*    child,
-                    guint         property_id,
-                    const GValue* value,
-                    GParamSpec*   pspec)
+set_child_prop_func(GtkContainer *container,
+                    GtkWidget *child,
+                    G_GNUC_UNUSED guint property_id,
+                    const GValue *value,
+                    GParamSpec *pspec)
 {
     ID ruby_setter = (ID)g_param_spec_get_qdata(pspec, q_ruby_setter);
     if (!ruby_setter) {
@@ -565,7 +615,7 @@ set_child_prop_func(GtkContainer* container,
 
 // FIXME: use rb_protect
 static void
-class_init_func(gpointer g_class, gpointer class_data)
+class_init_func(gpointer g_class, G_GNUC_UNUSED gpointer class_data)
 {
     GObjectClass* g_class1 = G_OBJECT_CLASS(g_class);
     GtkContainerClass* g_class2 = GTK_CONTAINER_CLASS(g_class);
@@ -584,7 +634,7 @@ class_init_func(gpointer g_class, gpointer class_data)
 }
 
 static VALUE
-type_register(int argc, VALUE* argv, VALUE self)
+rg_s_type_register(int argc, VALUE* argv, VALUE self)
 {
     VALUE type_name, flags;
     volatile VALUE class_init_proc = Qnil;
@@ -593,6 +643,7 @@ type_register(int argc, VALUE* argv, VALUE self)
 
     rb_scan_args(argc, argv, "03", &type_name, &info, &flags);
 
+    /* TODO: Replace this copy-paste job with the real thing in glib2. */
     {
         const RGObjClassInfo* cinfo = rbgobj_lookup_class(self);
         if (cinfo->klass == self)
@@ -622,6 +673,8 @@ type_register(int argc, VALUE* argv, VALUE self)
         GTypeQuery query;
         g_type_query(parent_type, &query);
 
+        /* TODO: This should not require a new GTypeInfo, as GLib doesn't
+         * retain a copy. */
         info = g_new0(GTypeInfo, 1);
         info->class_size     = query.class_size;
         info->base_init      = NULL;
@@ -667,7 +720,7 @@ type_register(int argc, VALUE* argv, VALUE self)
 /**********************************************************************/
 
 static void
-cont_mark_callback(GtkWidget* w, gpointer data)
+cont_mark_callback(GtkWidget *w, G_GNUC_UNUSED gpointer data)
 {
     rbgobj_gc_mark_instance(w);
 }
@@ -681,47 +734,47 @@ cont_mark(void* p)
 /**********************************************************************/
 
 void 
-Init_gtk_container()
-{
-    VALUE gContainer;
-
-    gContainer = G_DEF_CLASS_WITH_GC_FUNC(GTK_TYPE_CONTAINER, "Container",
-					  mGtk, cont_mark, NULL);
-    rb_define_method(gContainer, "resize_container?", cont_is_resize_container, 0);
-    rb_define_method(gContainer, "add", cont_add, -1);
-    rb_define_alias(gContainer, "<<", "add");
-    rb_define_method(gContainer, "remove", cont_remove, 1);
-    rb_define_method(gContainer, "check_resize", cont_check_resize, 0);
-    rb_define_method(gContainer, "each", cont_foreach, -1);
-    rb_define_method(gContainer, "each_forall", cont_forall, -1);
-    rb_define_method(gContainer, "children", cont_get_children, 0);
-    rb_define_method(gContainer, "set_reallocate_redraws", cont_set_reallocate_redraws, 1);
-    rb_define_method(gContainer, "set_focus_child", cont_set_focus_child, 1);
-    rb_define_method(gContainer, "set_focus_vadjustment", cont_set_focus_vadjustment, 1);
-    rb_define_method(gContainer, "set_focus_hadjustment", cont_set_focus_hadjustment, 1);
-    rb_define_method(gContainer, "focus_vadjustment", cont_get_focus_vadjustment, 0);
-    rb_define_method(gContainer, "focus_hadjustment", cont_get_focus_hadjustment, 0);
-    rb_define_method(gContainer, "resize_children", cont_get_resize_children, 0);
-    rb_define_method(gContainer, "child_type", cont_get_child_type, 0);
-    rb_define_method(gContainer, "child_get_property", cont_child_get_property, 2);
-    rb_define_method(gContainer, "child_set_property", cont_child_set_property, 3);
-    rb_define_method(gContainer, "propagate_expose", cont_propagate_expose, 2);
-    rb_define_method(gContainer, "focus_chain", cont_get_focus_chain, 0);
-    rb_define_method(gContainer, "set_focus_chain", cont_set_focus_chain, 1);
-    rb_define_method(gContainer, "unset_focus_chain", cont_unset_focus_chain, 0);
-    rb_define_singleton_method(gContainer, "child_property", cont_s_child_property, 1);
-    rb_define_singleton_method(gContainer, "child_properties", cont_s_child_properties, -1);
-    rb_define_singleton_method(gContainer, "install_child_property", cont_s_install_child_property, -1);
+Init_gtk_container(VALUE mGtk)
+{
+    VALUE RG_TARGET_NAMESPACE;
+
+    RG_TARGET_NAMESPACE = G_DEF_CLASS_WITH_GC_FUNC(GTK_TYPE_CONTAINER, "Container",
+                                                  mGtk, cont_mark, NULL);
+    RG_DEF_METHOD_P(resize_container, 0);
+    RG_DEF_METHOD(add, -1);
+    RG_DEF_ALIAS("<<", "add");
+    RG_DEF_METHOD(remove, 1);
+    RG_DEF_METHOD(check_resize, 0);
+    RG_DEF_METHOD(each, -1);
+    RG_DEF_METHOD(each_forall, -1);
+    RG_DEF_METHOD(children, 0);
+    RG_DEF_METHOD(set_reallocate_redraws, 1);
+    RG_DEF_METHOD(set_focus_child, 1);
+    RG_DEF_METHOD(set_focus_vadjustment, 1);
+    RG_DEF_METHOD(set_focus_hadjustment, 1);
+    RG_DEF_METHOD(focus_vadjustment, 0);
+    RG_DEF_METHOD(focus_hadjustment, 0);
+    RG_DEF_METHOD(resize_children, 0);
+    RG_DEF_METHOD(child_type, 0);
+    RG_DEF_METHOD(child_get_property, 2);
+    RG_DEF_METHOD(child_set_property, 3);
+    RG_DEF_METHOD(propagate_expose, 2);
+    RG_DEF_METHOD(focus_chain, 0);
+    RG_DEF_METHOD(set_focus_chain, 1);
+    RG_DEF_METHOD(unset_focus_chain, 0);
+    RG_DEF_SMETHOD(child_property, 1);
+    RG_DEF_SMETHOD(child_properties, -1);
+    RG_DEF_SMETHOD(install_child_property, -1);
 
     q_ruby_getter = g_quark_from_static_string("__ruby_getter");
     q_ruby_setter = g_quark_from_static_string("__ruby_setter");
 
-    rb_define_singleton_method(gContainer, "type_register", type_register, -1);
+    RG_DEF_SMETHOD(type_register, -1);
 
     rb_global_variable(&proc_mod_eval);
     proc_mod_eval = rb_eval_string("lambda{|obj,proc| obj.module_eval(&proc)}");
 
-    G_DEF_SETTERS(gContainer);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 
     rb_global_variable(&type_to_prop_setter_table);
     rb_global_variable(&type_to_prop_getter_table);