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

data/ext/gtk2/rbgdkcolormap.c

@@ -1,26 +1,34 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgdkcolormap.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  Copyright (C) 2002,2003 Masao Mutoh
-
-  This file is devided from rbgdkcolor.c.
-  rbgdkcolor.c -
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 Masao Mutoh
+ *  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 cColormap
 #define _SELF(self) (GDK_COLORMAP(RVAL2GOBJ(self)))
 
 static VALUE
-gdkcmap_initialize(VALUE self, VALUE visual, VALUE allocate)
+rg_initialize(VALUE self, VALUE visual, VALUE allocate)
 {
     GdkColormap *cmap  = gdk_colormap_new(GDK_VISUAL(RVAL2GOBJ(visual)),
                                           RVAL2CBOOL(allocate));
@@ -29,7 +37,7 @@ gdkcmap_initialize(VALUE self, VALUE visual, VALUE allocate)
 }
 
 static VALUE
-gdkcmap_s_get_system(VALUE self)
+rg_s_system(G_GNUC_UNUSED VALUE self)
 {
     return GOBJ2RVAL(gdk_colormap_get_system());
 }
@@ -46,7 +54,7 @@ gint        gdk_colormap_alloc_colors       (GdkColormap *colormap,
 */
 
 static VALUE
-gdkcmap_alloc_color(VALUE self, VALUE color, VALUE writeable, VALUE best_match)
+rg_alloc_color(VALUE self, VALUE color, VALUE writeable, VALUE best_match)
 {
     gboolean result;
     GdkColor *c = RVAL2GDKCOLOR(color);
@@ -58,14 +66,14 @@ gdkcmap_alloc_color(VALUE self, VALUE color, VALUE writeable, VALUE best_match)
 /* Don't implement Gdk::Colormap#free_colors.
    Because it should be pair with Gdk::Colormap#alloc_colors */
 static VALUE
-gdkcmap_free_color(VALUE self, VALUE color)
+rg_free_color(VALUE self, VALUE color)
 {
     gdk_colormap_free_colors(_SELF(self), RVAL2GDKCOLOR(color), 1);
     return self;
 }
 
 static VALUE
-gdkcmap_query_color(VALUE self, VALUE pixel)
+rg_query_color(VALUE self, VALUE pixel)
 {
     GdkColor color;
     gdk_colormap_query_color(_SELF(self), NUM2ULONG(pixel), &color);
@@ -73,21 +81,21 @@ gdkcmap_query_color(VALUE self, VALUE pixel)
 }
 
 static VALUE
-gdkcmap_get_visual(VALUE self)
+rg_visual(VALUE self)
 {
     return GOBJ2RVAL(gdk_colormap_get_visual(_SELF(self)));
 }
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-gdkcmap_get_screen(VALUE self)
+rg_screen(VALUE self)
 {
     return GOBJ2RVAL(gdk_colormap_get_screen(_SELF(self)));
 }
 #endif
 
 static VALUE
-gdkcmap_colors(VALUE self)
+rg_colors(VALUE self)
 {
     GdkColormap *cmap;
     GdkColor *colors;
@@ -114,21 +122,18 @@ gdkcmap_colors(VALUE self)
 }
 
 void
-Init_gtk_gdk_colormap()
+Init_gtk_gdk_colormap(VALUE mGdk)
 {
-    VALUE gdkColormap = G_DEF_CLASS(GDK_TYPE_COLORMAP, "Colormap", mGdk);
-
-    rb_define_singleton_method(gdkColormap, "system",
-                               gdkcmap_s_get_system, 0);
-    rb_define_method(gdkColormap, "initialize", gdkcmap_initialize, 2);
-    rb_define_method(gdkColormap, "alloc_color", gdkcmap_alloc_color, 3);
-    rb_define_method(gdkColormap, "free_color", gdkcmap_free_color, 1);
-    rb_define_method(gdkColormap, "query_color", gdkcmap_query_color, 1);
-    rb_define_method(gdkColormap, "visual", gdkcmap_get_visual, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_COLORMAP, "Colormap", mGdk);
+
+    RG_DEF_SMETHOD(system, 0);
+    RG_DEF_METHOD(initialize, 2);
+    RG_DEF_METHOD(alloc_color, 3);
+    RG_DEF_METHOD(free_color, 1);
+    RG_DEF_METHOD(query_color, 1);
+    RG_DEF_METHOD(visual, 0);
 #if GTK_CHECK_VERSION(2,2,0)
-    rb_define_method(gdkColormap, "screen", gdkcmap_get_screen, 0);
+    RG_DEF_METHOD(screen, 0);
 #endif
-    rb_define_method(gdkColormap, "colors", gdkcmap_colors, 0);
+    RG_DEF_METHOD(colors, 0);
 }
-
-

data/ext/gtk2/rbgdkconst.c

@@ -1,16 +1,26 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgdkconst.c -
-
-  $Author: mutoh $
-  $Date: 2003/11/02 18:29:28 $
-
-  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 @@
  * Gdk module constants
  */
 void
-Init_gtk_gdk_const()
+Init_gtk_gdk_const(VALUE mGdk)
 {
     /* GdkStatus */
     G_DEF_CLASS(GDK_TYPE_STATUS, "Status", mGdk);

data/ext/gtk2/rbgdkconversions.h

@@ -1,10 +1,23 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgdkconversions.h -
-
-  Copyright (C) 2008 Ruby-GNOME2 Project Team
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2008  Ruby-GNOME2 Project Team
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
 #ifndef __RB_GDK_CONVERSIONS_H__
 #define __RB_GDK_CONVERSIONS_H__

data/ext/gtk2/rbgdkcursor.c

@@ -1,18 +1,30 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgdkcursor.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 14:27:08 $
-
-  Copyright (C) 2001-2004 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2001-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"
 
+#define RG_TARGET_NAMESPACE cCursor
+
 static VALUE
-gdkcursor_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     GdkCursor* cursor = NULL;
 
@@ -52,57 +64,57 @@ gdkcursor_initialize(int argc, VALUE *argv, VALUE self)
                                             NIL_P(mask)?NULL:GDK_PIXMAP(RVAL2GOBJ(mask)), 
                                             RVAL2GDKCOLOR(fg),
                                             RVAL2GDKCOLOR(bg),
-					    NUM2INT(x), NUM2INT(y));
+                                            NUM2INT(x), NUM2INT(y));
     }
     G_INITIALIZE(self, cursor);
-       
+
     return Qnil;
 }
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-gdkcursor_get_display(VALUE self)
+rg_display(VALUE self)
 {
     return GOBJ2RVAL(gdk_cursor_get_display((GdkCursor*)RVAL2BOXED(self, GDK_TYPE_CURSOR)));
 }
 #endif
 
 static VALUE
-gdkcursor_is_pixmap(VALUE self)
+rg_pixmap_p(VALUE self)
 {
     return CBOOL2RVAL(((GdkCursor*)RVAL2BOXED(self, GDK_TYPE_COLOR))->type == 
                       GDK_CURSOR_IS_PIXMAP);
 }
 
 static VALUE
-gdkcursor_cursor_type(VALUE self)
+rg_cursor_type(VALUE self)
 {
     return GENUM2RVAL(((GdkCursor*)RVAL2BOXED(self, GDK_TYPE_CURSOR))->type, GDK_TYPE_CURSOR_TYPE);
 }
 
 #if GTK_CHECK_VERSION(2,8,0)
 static VALUE
-gdkcursor_get_image(VALUE self)
+rg_image(VALUE self)
 {
     return GOBJ2RVAL(gdk_cursor_get_image((GdkCursor*)RVAL2BOXED(self, GDK_TYPE_CURSOR)));
 }
 #endif
 
 void
-Init_gtk_gdk_cursor()
+Init_gtk_gdk_cursor(VALUE mGdk)
 {
-    VALUE gdkCursor = G_DEF_CLASS(GDK_TYPE_CURSOR, "Cursor", mGdk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_CURSOR, "Cursor", mGdk);
 
-    rb_define_method(gdkCursor, "initialize", gdkcursor_initialize, -1);
+    RG_DEF_METHOD(initialize, -1);
 #if GTK_CHECK_VERSION(2,2,0)
-    rb_define_method(gdkCursor, "display", gdkcursor_get_display, 0);
+    RG_DEF_METHOD(display, 0);
 #endif
-    rb_define_method(gdkCursor, "pixmap?", gdkcursor_is_pixmap, 0);
-    rb_define_method(gdkCursor, "cursor_type", gdkcursor_cursor_type, 0);
+    RG_DEF_METHOD_P(pixmap, 0);
+    RG_DEF_METHOD(cursor_type, 0);
 #if GTK_CHECK_VERSION(2,8,0)
-    rb_define_method(gdkCursor, "image", gdkcursor_get_image, 0);
+    RG_DEF_METHOD(image, 0);
 #endif
 
-    G_DEF_CLASS(GDK_TYPE_CURSOR_TYPE, "Type", gdkCursor);
-    G_DEF_CONSTANTS(gdkCursor, GDK_TYPE_CURSOR_TYPE, "GDK_");
+    G_DEF_CLASS(GDK_TYPE_CURSOR_TYPE, "Type", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GDK_TYPE_CURSOR_TYPE, "GDK_");
 }

data/ext/gtk2/rbgdkdevice.c

@@ -1,50 +1,60 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgdkdevice.c -
-
-  $Author: mutoh $
-  $Date: 2006/06/17 06:59:32 $
-
-  Copyright (C) 2003-2006 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003-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"
 
+#define RG_TARGET_NAMESPACE cDevice
 #define _SELF(self) (GDK_DEVICE(RVAL2GOBJ(self)))
 
 /* Methods */
 static VALUE
-device_s_list(VALUE self)
+rg_s_list(G_GNUC_UNUSED VALUE self)
 {
     /* Owned by GDK */
     return GLIST2ARY(gdk_devices_list());
 }
 
 static VALUE
-device_s_set_extension_events(VALUE self, VALUE window, VALUE mask, VALUE mode)
+rg_s_set_extension_events(G_GNUC_UNUSED VALUE self, VALUE window, VALUE mask, VALUE mode)
 {
     gdk_input_set_extension_events(GDK_WINDOW(RVAL2GOBJ(window)),
                                    NUM2INT(mask), FIX2INT(mode));
     return Qnil;
 }
 
-
 static VALUE
-device_set_source(VALUE self, VALUE source)
+rg_set_source(VALUE self, VALUE source)
 {
     gdk_device_set_source(_SELF(self), RVAL2GENUM(source, GDK_TYPE_INPUT_SOURCE));
     return self;
 }
 
 static VALUE
-device_set_mode(VALUE self, VALUE mode)
+rg_set_mode(VALUE self, VALUE mode)
 {
     return CBOOL2RVAL(gdk_device_set_mode(_SELF(self), RVAL2GENUM(mode, GDK_TYPE_INPUT_MODE)));
 }
 
 static VALUE
-device_set_key(VALUE self, VALUE index, VALUE keyval, VALUE modifiers)
+rg_set_key(VALUE self, VALUE index, VALUE keyval, VALUE modifiers)
 {
     gdk_device_set_key(_SELF(self), NUM2UINT(index), NUM2UINT(keyval),
                        RVAL2GFLAGS(modifiers, GDK_TYPE_MODIFIER_TYPE));
@@ -52,7 +62,7 @@ device_set_key(VALUE self, VALUE index, VALUE keyval, VALUE modifiers)
 }
 
 static VALUE
-device_set_axis_use(VALUE self, VALUE index, VALUE use)
+rg_set_axis_use(VALUE self, VALUE index, VALUE use)
 {
     gdk_device_set_axis_use(_SELF(self), NUM2UINT(index), 
                             RVAL2GENUM(use, GDK_TYPE_AXIS_USE));
@@ -60,13 +70,13 @@ device_set_axis_use(VALUE self, VALUE index, VALUE use)
 }
 
 static VALUE
-device_s_get_core_pointer(VALUE self)
+rg_s_core_pointer(G_GNUC_UNUSED VALUE self)
 {
     return GOBJ2RVAL(gdk_device_get_core_pointer());
 }
 
 static VALUE
-device_get_state(VALUE self, VALUE window)
+rg_get_state(VALUE self, VALUE window)
 {
     gdouble axes[2];
     GdkModifierType mask;
@@ -78,7 +88,7 @@ device_get_state(VALUE self, VALUE window)
 }
 
 static VALUE
-device_get_history(VALUE self, VALUE window, VALUE start, VALUE stop)
+rg_get_history(VALUE self, VALUE window, VALUE start, VALUE stop)
 {
     gboolean ret;
     GdkTimeCoord** events;
@@ -99,55 +109,55 @@ device_get_history(VALUE self, VALUE window, VALUE start, VALUE stop)
 }
 
 static VALUE
-device_get_axis(VALUE self, VALUE axes, VALUE use)
+rg_get_axis(VALUE self, VALUE rbaxes, VALUE rbuse)
 {
+    GdkDevice *device = _SELF(self);
+    GdkAxisUse use = RVAL2GENUM(rbuse, GDK_TYPE_AXIS_USE);
+    long n;
+    gdouble *axes = RVAL2GDOUBLES(rbaxes, n);
+    gint device_n_axes = gdk_device_get_n_axes(device);
     gdouble value;
-    gboolean ret;
-    gdouble* gaxes;
-    gint i;
-    gint len = RARRAY_LEN(axes);
-
-    gaxes = g_new(gdouble, len);
+    gboolean found;
 
-    for (i = 0; i < len; i++){
-        gaxes[i] = RARRAY_PTR(axes)[i];
-    }
+    if (n != device_n_axes)
+        rb_raise(rb_eArgError,
+                 "unexpected number of axes: %ld != %d",
+                 n, device_n_axes);
 
-    ret = gdk_device_get_axis(_SELF(self), gaxes, RVAL2GENUM(use, GDK_TYPE_AXIS_USE),
-                              &value);
+    found = gdk_device_get_axis(device, axes, use, &value);
 
-    g_free(gaxes);
+    g_free(axes);
 
-    return ret ? rb_float_new(value) : Qnil;
+    return found ? DBL2NUM(value) : Qnil;
 }
 
 /* Accessor */
 static VALUE
-device_name(VALUE self)
+rg_name(VALUE self)
 {
     return CSTR2RVAL(_SELF(self)->name);
 }
 
 static VALUE
-device_source(VALUE self)
+rg_source(VALUE self)
 {
     return GENUM2RVAL(_SELF(self)->source, GDK_TYPE_INPUT_SOURCE);
 }
 
 static VALUE
-device_mode(VALUE self)
+rg_mode(VALUE self)
 {
     return GENUM2RVAL(_SELF(self)->mode, GDK_TYPE_INPUT_MODE);
 }
 
 static VALUE
-device_has_cursor(VALUE self)
+rg_has_cursor_p(VALUE self)
 {
     return CBOOL2RVAL(_SELF(self)->has_cursor);
 }
 
 static VALUE
-device_axes(VALUE self)
+rg_axes(VALUE self)
 {
     gint i;
     VALUE ary = rb_ary_new();
@@ -161,7 +171,7 @@ device_axes(VALUE self)
 }
 
 static VALUE
-device_keys(VALUE self)
+rg_keys(VALUE self)
 {
     gint i;
     VALUE ary = rb_ary_new();
@@ -175,45 +185,45 @@ device_keys(VALUE self)
 }
 
 void 
-Init_gtk_gdk_device()
+Init_gtk_gdk_device(VALUE mGdk)
 {
-    VALUE dev = G_DEF_CLASS(GDK_TYPE_DEVICE, "Device", mGdk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_DEVICE, "Device", mGdk);
 
-    rb_define_singleton_method(dev, "list", device_s_list, 0);
-    rb_define_singleton_method(dev, "core_pointer", device_s_get_core_pointer, 0);
-    rb_define_singleton_method(dev, "set_extension_events", device_s_set_extension_events, 3);
+    RG_DEF_SMETHOD(list, 0);
+    RG_DEF_SMETHOD(core_pointer, 0);
+    RG_DEF_SMETHOD(set_extension_events, 3);
 
-    rb_define_method(dev, "set_source", device_set_source, 1);
-    rb_define_method(dev, "set_mode", device_set_mode, 1);
-    rb_define_method(dev, "set_key", device_set_key, 3);
-    rb_define_method(dev, "set_axis_use", device_set_axis_use, 2);
-    rb_define_method(dev, "get_state", device_get_state, 1);
-    rb_define_method(dev, "get_history", device_get_history, 3);
-    rb_define_method(dev, "get_axis", device_get_axis, 2);
+    RG_DEF_METHOD(set_source, 1);
+    RG_DEF_METHOD(set_mode, 1);
+    RG_DEF_METHOD(set_key, 3);
+    RG_DEF_METHOD(set_axis_use, 2);
+    RG_DEF_METHOD(get_state, 1);
+    RG_DEF_METHOD(get_history, 3);
+    RG_DEF_METHOD(get_axis, 2);
 
-    rb_define_method(dev, "name", device_name, 0);
-    rb_define_method(dev, "source", device_source, 0);
-    rb_define_method(dev, "mode", device_mode, 0);
-    rb_define_method(dev, "has_cursor?", device_has_cursor, 0);
-    rb_define_method(dev, "axes", device_axes, 0);
-    rb_define_method(dev, "keys", device_keys, 0);
+    RG_DEF_METHOD(name, 0);
+    RG_DEF_METHOD(source, 0);
+    RG_DEF_METHOD(mode, 0);
+    RG_DEF_METHOD_P(has_cursor, 0);
+    RG_DEF_METHOD(axes, 0);
+    RG_DEF_METHOD(keys, 0);
 
-    G_DEF_SETTERS(dev);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 
     /* GdkInputSource */
-    G_DEF_CLASS(GDK_TYPE_INPUT_SOURCE, "InputSource", dev);
-    G_DEF_CONSTANTS(dev, GDK_TYPE_INPUT_SOURCE, "GDK_");
+    G_DEF_CLASS(GDK_TYPE_INPUT_SOURCE, "InputSource", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GDK_TYPE_INPUT_SOURCE, "GDK_");
 
     /* GdkInputMode */
-    G_DEF_CLASS(GDK_TYPE_INPUT_MODE, "InputMode", dev);
-    G_DEF_CONSTANTS(dev, GDK_TYPE_INPUT_MODE, "GDK_");
-    
+    G_DEF_CLASS(GDK_TYPE_INPUT_MODE, "InputMode", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GDK_TYPE_INPUT_MODE, "GDK_");
+
     /* GdkAxisUse */
-    G_DEF_CLASS(GDK_TYPE_AXIS_USE, "AxisUse", dev);
-    G_DEF_CONSTANTS(dev, GDK_TYPE_AXIS_USE, "GDK_");
+    G_DEF_CLASS(GDK_TYPE_AXIS_USE, "AxisUse", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GDK_TYPE_AXIS_USE, "GDK_");
 
     /* GdkExtensionMode */
-    G_DEF_CLASS(GDK_TYPE_EXTENSION_MODE, "ExtensionMode", dev);
-    G_DEF_CONSTANTS(dev, GDK_TYPE_EXTENSION_MODE, "GDK_");
+    G_DEF_CLASS(GDK_TYPE_EXTENSION_MODE, "ExtensionMode", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GDK_TYPE_EXTENSION_MODE, "GDK_");
 
 }