gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtkwindow.c

@@ -1,23 +1,33 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkwindow.c -
-
-  $Author: ktou $
-  $Date: 2007/09/08 12:49:10 $
-
-  Copyright (C) 2002-2011 Ruby-GNOME2 Project Team
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2002-2011 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 cWindow
 #define _SELF(s) (GTK_WINDOW(RVAL2GOBJ(s)))
 
 static VALUE
-gwin_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg;
     GtkWindowType tp = GTK_WINDOW_TOPLEVEL;
@@ -42,7 +52,7 @@ gwin_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-gwin_set_wmclass(VALUE self, VALUE wmclass_name, VALUE wmclass_class)
+rg_set_wmclass(VALUE self, VALUE wmclass_name, VALUE wmclass_class)
 {
     gtk_window_set_wmclass(_SELF(self),
                            NIL_P(wmclass_name)?NULL:RVAL2CSTR(wmclass_name),
@@ -51,7 +61,7 @@ gwin_set_wmclass(VALUE self, VALUE wmclass_name, VALUE wmclass_class)
 }
 
 static VALUE
-gwin_add_accel_group(VALUE self, VALUE accel)
+rg_add_accel_group(VALUE self, VALUE accel)
 {
     gtk_window_add_accel_group(_SELF(self),
                                GTK_ACCEL_GROUP(RVAL2GOBJ(accel)));
@@ -60,7 +70,7 @@ gwin_add_accel_group(VALUE self, VALUE accel)
 }
 
 static VALUE
-gwin_remove_accel_group(VALUE self, VALUE accel)
+rg_remove_accel_group(VALUE self, VALUE accel)
 {
     gtk_window_remove_accel_group(_SELF(self),
                                   GTK_ACCEL_GROUP(RVAL2GOBJ(accel)));
@@ -81,7 +91,7 @@ gwin_activate_default(VALUE self)
 }
 
 static VALUE
-gwin_active_focus(VALUE self)
+rg_active_focus(VALUE self)
 {
     rb_warning("Gtk::Window#active_focus is deprecated. Use Gtk::Window#activate_focus");
     gtk_window_activate_focus(_SELF(self));
@@ -89,7 +99,7 @@ gwin_active_focus(VALUE self)
 }
 
 static VALUE
-gwin_active_default(VALUE self)
+rg_active_default(VALUE self)
 {
     rb_warning("Gtk::Window#active_default is deprecated. Use Gtk::Window#activate_default");
     gtk_window_activate_default(_SELF(self));
@@ -97,7 +107,7 @@ gwin_active_default(VALUE self)
 }
 
 static VALUE
-gwin_set_default_size(VALUE self, VALUE w, VALUE h)
+rg_set_default_size(VALUE self, VALUE w, VALUE h)
 {
     gtk_window_set_default_size(_SELF(self),
                                 NUM2INT(w), NUM2INT(h));
@@ -105,7 +115,7 @@ gwin_set_default_size(VALUE self, VALUE w, VALUE h)
 }
 
 static VALUE
-gwin_set_geometry_hints(VALUE self, VALUE geometry_widget, VALUE geometry, VALUE geom_mask)
+rg_set_geometry_hints(VALUE self, VALUE geometry_widget, VALUE geometry, VALUE geom_mask)
 {
     gtk_window_set_geometry_hints(_SELF(self),
                                   GTK_WIDGET(RVAL2GOBJ(geometry_widget)),
@@ -114,26 +124,8 @@ gwin_set_geometry_hints(VALUE self, VALUE geometry_widget, VALUE geometry, VALUE
     return self;
 }
 
-/* Defined as Properties:
-void                gtk_window_set_gravity              (GtkWindow *window,
-                                                         GdkGravity gravity);
-GdkGravity          gtk_window_get_gravity              (GtkWindow *window);
-void                gtk_window_set_transient_for        (GtkWindow *window,
-                                                         GtkWindow *parent);
-void                gtk_window_set_destroy_with_parent  (GtkWindow *window,
-                                                         gboolean setting);
-*/
-
-/* Define as Properties.
-void        gtk_window_set_screen           (GtkWindow *window,
-                                             GdkScreen *screen);
-GdkScreen*  gtk_window_get_screen           (GtkWindow *window);
-gboolean    gtk_window_is_active            (GtkWindow *window);
-gboolean    gtk_window_has_toplevel_focus   (GtkWindow *window);
-*/
-
 static VALUE
-gwin_s_list_toplevels(VALUE self)
+rg_s_toplevels(G_GNUC_UNUSED VALUE self)
 {
     GList* list = gtk_window_list_toplevels();
     VALUE ret = GLIST2ARY(list);
@@ -143,21 +135,21 @@ gwin_s_list_toplevels(VALUE self)
 }
 
 static VALUE
-gwin_add_mnemonic(VALUE self, VALUE keyval, VALUE target)
+rg_add_mnemonic(VALUE self, VALUE keyval, VALUE target)
 {
     gtk_window_add_mnemonic(_SELF(self), NUM2INT(keyval), GTK_WIDGET(RVAL2GOBJ(target)));
     return self;
 }
 
 static VALUE
-gwin_remove_mnemonic(VALUE self, VALUE keyval, VALUE target)
+rg_remove_mnemonic(VALUE self, VALUE keyval, VALUE target)
 {
     gtk_window_remove_mnemonic(_SELF(self), NUM2INT(keyval), GTK_WIDGET(RVAL2GOBJ(target)));
     return self;
 }
 
 static VALUE
-gwin_mnemonic_activate(VALUE self, VALUE keyval, VALUE modifier)
+rg_mnemonic_activate(VALUE self, VALUE keyval, VALUE modifier)
 {
     return CBOOL2RVAL(gtk_window_mnemonic_activate(_SELF(self), 
                                         NUM2INT(keyval), 
@@ -165,13 +157,13 @@ gwin_mnemonic_activate(VALUE self, VALUE keyval, VALUE modifier)
 }
 
 static VALUE
-gwin_get_focus(VALUE self)
+rg_focus(VALUE self)
 {
     return GOBJ2RVAL(gtk_window_get_focus(_SELF(self)));
 }
 
 static VALUE
-gwin_set_focus(VALUE self, VALUE win)
+rg_set_focus(VALUE self, VALUE win)
 {
     gtk_window_set_focus(_SELF(self), 
                          NIL_P(win) ? NULL : GTK_WIDGET(RVAL2GOBJ(win)));
@@ -179,7 +171,7 @@ gwin_set_focus(VALUE self, VALUE win)
 }
 
 static VALUE
-gwin_set_default(VALUE self, VALUE win)
+rg_set_default(VALUE self, VALUE win)
 {
     gtk_window_set_default(_SELF(self), 
                            NIL_P(win) ? NULL : GTK_WIDGET(RVAL2GOBJ(win)));
@@ -188,7 +180,7 @@ gwin_set_default(VALUE self, VALUE win)
 
 #if GTK_CHECK_VERSION(2,8,0)
 static VALUE
-gwin_present(int argc, VALUE *argv, VALUE self)
+rg_present(int argc, VALUE *argv, VALUE self)
 {
     VALUE timestamp;
     if (rb_scan_args(argc, argv, "01", &timestamp) == 1) {
@@ -208,42 +200,42 @@ gwin_present(VALUE self)
 #endif
 
 static VALUE
-gwin_iconify(VALUE self)
+rg_iconify(VALUE self)
 {
     gtk_window_iconify(_SELF(self));
     return self;
 }
 
 static VALUE
-gwin_deiconify(VALUE self)
+rg_deiconify(VALUE self)
 {
     gtk_window_deiconify(_SELF(self));
     return self;
 }
 
 static VALUE
-gwin_stick(VALUE self)
+rg_stick(VALUE self)
 {
     gtk_window_stick(_SELF(self));
     return self;
 }
 
 static VALUE
-gwin_unstick(VALUE self)
+rg_unstick(VALUE self)
 {
     gtk_window_unstick(_SELF(self));
     return self;
 }
 
 static VALUE
-gwin_maximize(VALUE self)
+rg_maximize(VALUE self)
 {
     gtk_window_maximize(_SELF(self));
     return self;
 }
 
 static VALUE
-gwin_unmaximize(VALUE self)
+rg_unmaximize(VALUE self)
 {
     gtk_window_unmaximize(_SELF(self));
     return self;
@@ -251,13 +243,13 @@ gwin_unmaximize(VALUE self)
 
 #if GTK_CHECK_VERSION(2,2,0) 
 static VALUE
-gwin_fullscreen(VALUE self)
+rg_fullscreen(VALUE self)
 {
     gtk_window_fullscreen(_SELF(self));
     return self;
 }
 static VALUE
-gwin_unfullscreen(VALUE self)
+rg_unfullscreen(VALUE self)
 {
     gtk_window_unfullscreen(_SELF(self));
     return self;
@@ -265,13 +257,13 @@ gwin_unfullscreen(VALUE self)
 #endif
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-gwin_set_keep_above(VALUE self, VALUE setting)
+rg_set_keep_above(VALUE self, VALUE setting)
 {
     gtk_window_set_keep_above(_SELF(self), RVAL2CBOOL(setting));
     return self;
 }
 static VALUE
-gwin_set_keep_below(VALUE self, VALUE setting)
+rg_set_keep_below(VALUE self, VALUE setting)
 {
     gtk_window_set_keep_below(_SELF(self), RVAL2CBOOL(setting));
     return self;
@@ -279,7 +271,7 @@ gwin_set_keep_below(VALUE self, VALUE setting)
 #endif
 
 static VALUE
-gwin_begin_resize_drag(VALUE self, VALUE edge, VALUE button, VALUE root_x, VALUE root_y, VALUE timestamp)
+rg_begin_resize_drag(VALUE self, VALUE edge, VALUE button, VALUE root_x, VALUE root_y, VALUE timestamp)
 {
     gtk_window_begin_resize_drag(_SELF(self), RVAL2GENUM(edge, GDK_TYPE_WINDOW_EDGE),
                                  NUM2INT(button), NUM2INT(root_x),
@@ -288,7 +280,7 @@ gwin_begin_resize_drag(VALUE self, VALUE edge, VALUE button, VALUE root_x, VALUE
 }
 
 static VALUE
-gwin_begin_move_drag(VALUE self, VALUE button, VALUE root_x, VALUE root_y, VALUE timestamp)
+rg_begin_move_drag(VALUE self, VALUE button, VALUE root_x, VALUE root_y, VALUE timestamp)
 {
     gtk_window_begin_move_drag(_SELF(self), 
                                NUM2INT(button), NUM2INT(root_x),
@@ -296,13 +288,8 @@ gwin_begin_move_drag(VALUE self, VALUE button, VALUE root_x, VALUE root_y, VALUE
     return self;
 }
 
-/* Defined as Properties:
-void                gtk_window_set_decorated            (GtkWindow *window,
-                                                         gboolean setting);
-*/
-
 static VALUE
-gwin_set_frame_dimensions(VALUE self, VALUE left, VALUE top, VALUE right, VALUE bottom)
+rg_set_frame_dimensions(VALUE self, VALUE left, VALUE top, VALUE right, VALUE bottom)
 {
     gtk_window_set_frame_dimensions(_SELF(self), NUM2INT(left),
                                     NUM2INT(top), NUM2INT(right),
@@ -311,72 +298,36 @@ gwin_set_frame_dimensions(VALUE self, VALUE left, VALUE top, VALUE right, VALUE
 }
 
 static VALUE
-gwin_set_has_frame(VALUE self, VALUE setting)
+rg_set_has_frame(VALUE self, VALUE setting)
 {
     gtk_window_set_has_frame(_SELF(self), RVAL2CBOOL(setting));
     return self;
 }
 
 static VALUE
-gwin_set_mnemonic_modifier(VALUE self, VALUE modifier)
+rg_set_mnemonic_modifier(VALUE self, VALUE modifier)
 {
     gtk_window_set_mnemonic_modifier(_SELF(self), 
                                      RVAL2GFLAGS(modifier, GDK_TYPE_MODIFIER_TYPE));
     return self;
 }
 
-/* Defined as Properties
-void                gtk_window_set_decorated            (GtkWindow *window,
-                                                         gboolean setting);
-void                gtk_window_set_type_hint            (GtkWindow *window,
-                                                         GdkWindowTypeHint hint);
-void        gtk_window_set_skip_taskbar_hint
-                                            (GtkWindow *window,
-                                             gboolean setting);
-void        gtk_window_set_skip_pager_hint  (GtkWindow *window,
-                                             gboolean setting);
-void        gtk_window_set_accept_focus     (GtkWindow *window,
-                                             gboolean setting);
-
-gchar*      gtk_window_get_icon_name        (GtkWindow *window);
-void        gtk_window_set_icon_name        (GtkWindow *window,
-                                             const gchar *name);
-
-void        gtk_window_set_focus_on_map     (GtkWindow *window,
-                                             gboolean setting);
-gboolean    gtk_window_get_focus_on_map     (GtkWindow *window);
-
-void        gtk_window_set_urgency_hint     (GtkWindow *window,
-                                             gboolean setting);
-
-gboolean    gtk_window_get_deletable        (GtkWindow *window);
-
-void        gtk_window_set_deletable        (GtkWindow *window,
-                                             gboolean setting);
-gboolean            gtk_window_get_decorated            (GtkWindow *window);
-*/
-
-
 static VALUE
-gwin_s_get_default_icon_list(VALUE self)
+rg_s_default_icon_list(G_GNUC_UNUSED VALUE self)
 {
     return GLIST2ARYF(gtk_window_get_default_icon_list());
 }
 
 static VALUE
-gwin_get_default_size(VALUE self)
+rg_default_size(VALUE self)
 {
     int width, height;
     gtk_window_get_default_size(_SELF(self), &width, &height);
     return rb_ary_new3(2, INT2NUM(width), INT2NUM(height));
 }
 
-/* Defined as Properties:
-gboolean            gtk_window_get_destroy_with_parent  (GtkWindow *window);
-*/
-
 static VALUE
-gwin_get_frame_dimensions(VALUE self)
+rg_frame_dimensions(VALUE self)
 {
     int left, top, right, bottom;
     gtk_window_get_frame_dimensions(_SELF(self), &left, &top, &right, &bottom);
@@ -388,39 +339,33 @@ gwin_get_frame_dimensions(VALUE self)
 }
 
 static VALUE
-gwin_get_has_frame(VALUE self)
+rg_has_frame_p(VALUE self)
 {
     return CBOOL2RVAL(gtk_window_get_has_frame(_SELF(self)));
 }
 
 static VALUE
-gwin_get_icon_list(VALUE self)
+rg_icon_list(VALUE self)
 {
     return GLIST2ARYF(gtk_window_get_icon_list(_SELF(self)));
 }
 
 static VALUE
-gwin_get_mnemonic_modifier(VALUE self)
+rg_mnemonic_modifier(VALUE self)
 {
     return GFLAGS2RVAL(gtk_window_get_mnemonic_modifier(_SELF(self)), GDK_TYPE_MODIFIER_TYPE);
 }
 
 static VALUE
-gwin_get_position(VALUE self)
+rg_position(VALUE self)
 {
     int root_x, root_y;
     gtk_window_get_position(_SELF(self), &root_x, &root_y);
     return rb_ary_new3(2, INT2NUM(root_x), INT2NUM(root_y));
 }
 
-/* Defined as Properties:
-const gchar *       gtk_window_get_role                 (GtkWindow *window);
-GtkWindow *         gtk_window_get_transient_for        (GtkWindow *window);
-GdkWindowTypeHint   gtk_window_get_type_hint            (GtkWindow *window);
-*/
-
 static VALUE
-gwin_get_size(VALUE self)
+rg_size(VALUE self)
 {
     int width, height;
     gtk_window_get_size(_SELF(self), &width, &height);
@@ -429,56 +374,54 @@ gwin_get_size(VALUE self)
 
 #if GTK_CHECK_VERSION(2,10,0)
 static VALUE
-gwin_get_group(VALUE self)
+rg_group(VALUE self)
 {
     return GOBJ2RVAL(gtk_window_get_group(_SELF(self)));
 }
 #endif
 
 static VALUE
-gwin_move(VALUE self, VALUE x, VALUE y)
+rg_move(VALUE self, VALUE x, VALUE y)
 {
     gtk_window_move(_SELF(self), NUM2INT(x), NUM2INT(y));
     return self;
 }
 
 static VALUE
-gwin_parse_geometry(VALUE self, VALUE geometry)
+rg_parse_geometry(VALUE self, VALUE geometry)
 {
     return CBOOL2RVAL(gtk_window_parse_geometry(_SELF(self), RVAL2CSTR(geometry)));
 }
 
 static VALUE
-gwin_reshow_with_initial_size(VALUE self)
+rg_reshow_with_initial_size(VALUE self)
 {
     gtk_window_reshow_with_initial_size(_SELF(self));
     return self;
 }
 
 static VALUE
-gwin_resize(VALUE self, VALUE width, VALUE height)
+rg_resize(VALUE self, VALUE width, VALUE height)
 {
     gtk_window_resize(_SELF(self), NUM2INT(width), NUM2INT(height));
     return self;
 }
 
 static VALUE
-gwin_s_set_default_icon_list(VALUE self, VALUE list)
+rg_s_set_default_icon_list(G_GNUC_UNUSED VALUE self, VALUE rblist)
 {
-    int i;
-    GList *glist = NULL;
-    Check_Type(list, T_ARRAY);
-    for (i = 0; i < RARRAY_LEN(list); i++){
-        glist = g_list_append(glist, RVAL2GOBJ(RARRAY_PTR(list)[i]));
-    }
-    gtk_window_set_default_icon_list(glist);
-    g_list_free(glist);
-    return list;
+    GList *list = RVAL2GDKPIXBUFGLIST(rblist);
+
+    gtk_window_set_default_icon_list(list);
+
+    g_list_free(list);
+
+    return rblist;
 }
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-gwin_s_set_default_icon(VALUE self, VALUE icon_or_filename)
+rg_s_set_default_icon(VALUE self, VALUE icon_or_filename)
 {
     if (TYPE(icon_or_filename) == T_STRING){
         GError* err;
@@ -499,7 +442,7 @@ gwin_s_set_default_icon(VALUE self, VALUE icon_or_filename)
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-gwin_s_set_default_icon_name(VALUE self, VALUE name)
+rg_s_set_default_icon_name(VALUE self, VALUE name)
 {
     gtk_window_set_default_icon_name(RVAL2CSTR(name));
     return self;
@@ -527,22 +470,22 @@ gwin_set_icon(VALUE self, VALUE icon_or_filename)
 }
 
 static VALUE
-gwin_set_icon_list(VALUE self, VALUE list)
+rg_set_icon_list(VALUE self, VALUE rblist)
 {
-    int i;
-    GList *glist = NULL;
-    Check_Type(list, T_ARRAY);
-    for (i = 0; i < RARRAY_LEN(list); i++){
-        glist = g_list_append(glist, RVAL2GOBJ(RARRAY_PTR(list)[i]));
-    }
-    gtk_window_set_icon_list(_SELF(self), glist);
-    g_list_free(glist);
-    return list;
+    GtkWindow *window = _SELF(self);
+    GList *list = RVAL2GDKPIXBUFGLIST(rblist);
+
+    gtk_window_set_icon_list(window, list);
+
+    g_list_free(list);
+
+    /* TODO: Shouldn't we return self? */
+    return rblist;
 }
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-gwin_s_set_auto_startup_notification(VALUE self, VALUE setting)
+rg_s_set_auto_startup_notification(VALUE self, VALUE setting)
 {
     gtk_window_set_auto_startup_notification(RVAL2CBOOL(setting));
     return self;
@@ -551,28 +494,28 @@ gwin_s_set_auto_startup_notification(VALUE self, VALUE setting)
 
 /* They are not public methods.
 static VALUE
-gwin_decorated_window_init(VALUE self)
+rg_decorated_window_init(VALUE self)
 {
     gtk_decorated_window_init(_SELF(self));
     return self;
 }
 
 static VALUE
-gwin_decorated_window_calculate_frame_size(VALUE self)
+rg_decorated_window_calculate_frame_size(VALUE self)
 {
     gtk_decorated_window_calculate_frame_size(_SELF(self));
     return self;
 }
 
 static VALUE
-gwin_decorated_window_set_title(VALUE self, VALUE title)
+rg_decorated_window_set_title(VALUE self, VALUE title)
 {
     gtk_decorated_window_set_title(_SELF(self), RVAL2CSTR(title));
     return self;
 }
 
 static VALUE
-gwin_decorated_window_move_resize_window(VALUE self)
+rg_decorated_window_move_resize_window(VALUE self)
 {
     int x, y, width, height;
     gtk_decorated_window_move_resize_window(_SELF(self), &x, &y, &width, &height);
@@ -581,7 +524,7 @@ gwin_decorated_window_move_resize_window(VALUE self)
 */
 
 static void
-mark_toplevels(void* _)
+mark_toplevels(G_GNUC_UNUSED void *_)
 {
     GList* list = gtk_window_list_toplevels();
     GList* p;
@@ -591,96 +534,95 @@ mark_toplevels(void* _)
 }
 
 void 
-Init_gtk_window()
+Init_gtk_window(VALUE mGtk)
 {
-    VALUE gWindow = G_DEF_CLASS(GTK_TYPE_WINDOW, "Window", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_WINDOW, "Window", mGtk);
 
-    rb_define_method(gWindow, "initialize", gwin_initialize, -1);
-    rb_define_method(gWindow, "set_wmclass", gwin_set_wmclass, 2);
-    rb_define_method(gWindow, "add_accel_group", gwin_add_accel_group, 1);
-    rb_define_method(gWindow, "remove_accel_group", gwin_remove_accel_group, 1);
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD(set_wmclass, 2);
+    RG_DEF_METHOD(add_accel_group, 1);
+    RG_DEF_METHOD(remove_accel_group, 1);
     /* active_(focus|default) are deprecated. Use activate_* instead. */
-    rb_define_method(gWindow, "active_focus", gwin_active_focus, 0);
-    rb_define_method(gWindow, "active_default", gwin_active_default, 0);
-    G_REPLACE_ACTION(gWindow, "activate_focus", gwin_activate_focus, 0);
-    G_REPLACE_ACTION(gWindow, "activate_default", gwin_activate_default, 0);
-    rb_define_method(gWindow, "set_default_size", gwin_set_default_size, 2);
-    rb_define_method(gWindow, "set_geometry_hints", gwin_set_geometry_hints, 3);
-    rb_define_singleton_method(gWindow, "toplevels", gwin_s_list_toplevels, 0);
-    rb_define_method(gWindow, "add_mnemonic", gwin_add_mnemonic, 2);
-    rb_define_method(gWindow, "remove_mnemonic", gwin_remove_mnemonic, 2);
-    rb_define_method(gWindow, "mnemonic_activate", gwin_mnemonic_activate, 2);
-    rb_define_method(gWindow, "focus", gwin_get_focus, 0);
-    rb_define_method(gWindow, "set_focus", gwin_set_focus, 1);
-    rb_define_method(gWindow, "set_default", gwin_set_default, 1);
+    RG_DEF_METHOD(active_focus, 0);
+    RG_DEF_METHOD(active_default, 0);
+    G_REPLACE_ACTION(RG_TARGET_NAMESPACE, "activate_focus", gwin_activate_focus, 0);
+    G_REPLACE_ACTION(RG_TARGET_NAMESPACE, "activate_default", gwin_activate_default, 0);
+    RG_DEF_METHOD(set_default_size, 2);
+    RG_DEF_METHOD(set_geometry_hints, 3);
+    RG_DEF_SMETHOD(toplevels, 0);
+    RG_DEF_METHOD(add_mnemonic, 2);
+    RG_DEF_METHOD(remove_mnemonic, 2);
+    RG_DEF_METHOD(mnemonic_activate, 2);
+    RG_DEF_METHOD(focus, 0);
+    RG_DEF_METHOD(set_focus, 1);
+    RG_DEF_METHOD(set_default, 1);
 #if GTK_CHECK_VERSION(2,8,0)
-    rb_define_method(gWindow, "present", gwin_present, -1);
+    RG_DEF_METHOD(present, -1);
 #else
-    rb_define_method(gWindow, "present", gwin_present, 0);
+    RG_DEF_METHOD(present, 0);
 #endif
-    rb_define_method(gWindow, "iconify", gwin_iconify, 0);
-    rb_define_method(gWindow, "deiconify", gwin_deiconify, 0);
-    rb_define_method(gWindow, "stick", gwin_stick, 0);
-    rb_define_method(gWindow, "unstick", gwin_unstick, 0);
-    rb_define_method(gWindow, "maximize", gwin_maximize, 0);
-    rb_define_method(gWindow, "unmaximize", gwin_unmaximize, 0);
+    RG_DEF_METHOD(iconify, 0);
+    RG_DEF_METHOD(deiconify, 0);
+    RG_DEF_METHOD(stick, 0);
+    RG_DEF_METHOD(unstick, 0);
+    RG_DEF_METHOD(maximize, 0);
+    RG_DEF_METHOD(unmaximize, 0);
 #if GTK_CHECK_VERSION(2,2,0)
-    rb_define_method(gWindow, "fullscreen", gwin_fullscreen, 0);
-    rb_define_method(gWindow, "unfullscreen", gwin_unfullscreen, 0);
+    RG_DEF_METHOD(fullscreen, 0);
+    RG_DEF_METHOD(unfullscreen, 0);
 #endif
 #if GTK_CHECK_VERSION(2,4,0)
-    rb_define_method(gWindow, "set_keep_above", gwin_set_keep_above, 1);
-    rb_define_method(gWindow, "set_keep_below", gwin_set_keep_below, 1);
+    RG_DEF_METHOD(set_keep_above, 1);
+    RG_DEF_METHOD(set_keep_below, 1);
 #endif
-    rb_define_method(gWindow, "begin_resize_drag", gwin_begin_resize_drag, 5);
-    rb_define_method(gWindow, "begin_move_drag", gwin_begin_move_drag, 4);
-    rb_define_method(gWindow, "set_frame_dimensions", gwin_set_frame_dimensions, 4);
-    rb_define_method(gWindow, "set_mnemonic_modifier", gwin_set_mnemonic_modifier, 1);
-    rb_define_method(gWindow, "default_size", gwin_get_default_size, 0);
-    rb_define_singleton_method(gWindow, "default_icon_list", gwin_s_get_default_icon_list, 0);
-    rb_define_method(gWindow, "frame_dimensions", gwin_get_frame_dimensions, 0);
-    rb_define_method(gWindow, "set_has_frame", gwin_set_has_frame, 1);
-    rb_define_method(gWindow, "has_frame?", gwin_get_has_frame, 0);
-    rb_define_method(gWindow, "icon_list", gwin_get_icon_list, 0);
-    rb_define_method(gWindow, "mnemonic_modifier", gwin_get_mnemonic_modifier, 0);
-    rb_define_method(gWindow, "position", gwin_get_position, 0);
-    rb_define_method(gWindow, "size", gwin_get_size, 0);
+    RG_DEF_METHOD(begin_resize_drag, 5);
+    RG_DEF_METHOD(begin_move_drag, 4);
+    RG_DEF_METHOD(set_frame_dimensions, 4);
+    RG_DEF_METHOD(set_mnemonic_modifier, 1);
+    RG_DEF_METHOD(default_size, 0);
+    RG_DEF_SMETHOD(default_icon_list, 0);
+    RG_DEF_METHOD(frame_dimensions, 0);
+    RG_DEF_METHOD(set_has_frame, 1);
+    RG_DEF_METHOD_P(has_frame, 0);
+    RG_DEF_METHOD(icon_list, 0);
+    RG_DEF_METHOD(mnemonic_modifier, 0);
+    RG_DEF_METHOD(position, 0);
+    RG_DEF_METHOD(size, 0);
 #if GTK_CHECK_VERSION(2,10,0)
-    rb_define_method(gWindow, "group", gwin_get_group, 0);
+    RG_DEF_METHOD(group, 0);
 #endif
-    rb_define_method(gWindow, "move", gwin_move, 2);
-    rb_define_method(gWindow, "parse_geometry", gwin_parse_geometry, 1);
-    rb_define_method(gWindow, "reshow_with_initial_size", gwin_reshow_with_initial_size, 0);
-    rb_define_method(gWindow, "resize", gwin_resize, 2);
-    rb_define_singleton_method(gWindow, "set_default_icon_list", gwin_s_set_default_icon_list, 1);
+    RG_DEF_METHOD(move, 2);
+    RG_DEF_METHOD(parse_geometry, 1);
+    RG_DEF_METHOD(reshow_with_initial_size, 0);
+    RG_DEF_METHOD(resize, 2);
+    RG_DEF_SMETHOD(set_default_icon_list, 1);
 #if GTK_CHECK_VERSION(2,2,0)
-    rb_define_singleton_method(gWindow, "set_default_icon", gwin_s_set_default_icon, 1);
+    RG_DEF_SMETHOD(set_default_icon, 1);
 #endif
 #if GTK_CHECK_VERSION(2,6,0)
-    rb_define_singleton_method(gWindow, "set_default_icon_name", gwin_s_set_default_icon_name, 1);
+    RG_DEF_SMETHOD(set_default_icon_name, 1);
 #endif
-    G_REPLACE_SET_PROPERTY(gWindow, "icon", gwin_set_icon, 1);
-    rb_define_method(gWindow, "set_icon_list", gwin_set_icon_list, 1);
+    G_REPLACE_SET_PROPERTY(RG_TARGET_NAMESPACE, "icon", gwin_set_icon, 1);
+    RG_DEF_METHOD(set_icon_list, 1);
 #if GTK_CHECK_VERSION(2,2,0)
-    rb_define_singleton_method(gWindow, "set_auto_startup_notification", 
-                               gwin_s_set_auto_startup_notification, 1);
+    RG_DEF_SMETHOD(set_auto_startup_notification, 1);
 #endif
 
 /*
-    rb_define_method(gWindow, "decorated_window_init", gwin_decorated_window_init, 0);
-    rb_define_method(gWindow, "decorated_window_calculate_frame_size", gwin_decorated_window_calculate_frame_size, 0);   
-    rb_define_method(gWindow, "decorated_window_set_title", gwin_decorated_window_set_title, 1);
-    rb_define_method(gWindow, "decorated_window_move_resize_window", gwin_decorated_window_move_resize_window, 0);
+    RG_DEF_METHOD(decorated_window_init, 0);
+    RG_DEF_METHOD(decorated_window_calculate_frame_size, 0);   
+    RG_DEF_METHOD(decorated_window_set_title, 1);
+    RG_DEF_METHOD(decorated_window_move_resize_window, 0);
 */
-    G_DEF_SETTERS(gWindow);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 
     /* GtkWindowPosition (from General constants) */
-    G_DEF_CLASS(GTK_TYPE_WINDOW_POSITION, "Position", gWindow);
-    G_DEF_CONSTANTS(gWindow, GTK_TYPE_WINDOW_POSITION, "GTK_WIN_");
+    G_DEF_CLASS(GTK_TYPE_WINDOW_POSITION, "Position", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_WINDOW_POSITION, "GTK_WIN_");
 
     /* GtkWindowType (from General constants) */
-    G_DEF_CLASS(GTK_TYPE_WINDOW_TYPE, "Type", gWindow);
-    G_DEF_CONSTANTS(gWindow, GTK_TYPE_WINDOW_TYPE, "GTK_WINDOW_");
+    G_DEF_CLASS(GTK_TYPE_WINDOW_TYPE, "Type", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_WINDOW_TYPE, "GTK_WINDOW_");
 
     {
         static VALUE toplevels_marker;