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

data/ext/gtk2/rbgdkselection.c

@@ -1,21 +1,31 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgdkselection.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  Copyright (C) 2002-2004 Masao Mutoh
-************************************************/
-
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-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 mSelection
 #define GATOM2RVAL(g) (BOXED2RVAL(g, GDK_TYPE_ATOM))
 
 static VALUE
-gdkselection_owner_set(int argc, VALUE *argv, VALUE self)
+rg_m_owner_set(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
     VALUE owner, selection, time, send_event;
     int ret;
@@ -42,7 +52,7 @@ gdkselection_owner_set(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-gdkselection_owner_get(int argc, VALUE *argv, VALUE self)
+rg_m_owner_get(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
     VALUE selection;
 
@@ -62,7 +72,7 @@ gdkselection_owner_get(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-gdkselection_convert(VALUE self, VALUE requestor, VALUE selection, VALUE target, VALUE time)
+rg_m_convert(VALUE self, VALUE requestor, VALUE selection, VALUE target, VALUE time)
 {
     gdk_selection_convert(GDK_WINDOW(RVAL2GOBJ(requestor)), 
                           RVAL2ATOM(selection), 
@@ -71,7 +81,7 @@ gdkselection_convert(VALUE self, VALUE requestor, VALUE selection, VALUE target,
 }
 
 static VALUE
-gdkselection_property_get(VALUE self, VALUE requestor)
+rg_m_property_get(G_GNUC_UNUSED VALUE self, VALUE requestor)
 {
     guchar *data;
     GdkAtom prop_type;
@@ -88,7 +98,7 @@ gdkselection_property_get(VALUE self, VALUE requestor)
 }
 
 static VALUE
-gdkselection_send_notify(int argc, VALUE *argv, VALUE self)
+rg_m_send_notify(int argc, VALUE *argv, VALUE self)
 {
     VALUE requestor, selection, target, property, time;
 
@@ -115,36 +125,36 @@ gdkselection_send_notify(int argc, VALUE *argv, VALUE self)
 }
 
 void
-Init_gtk_gdk_selection()
+Init_gtk_gdk_selection(VALUE mGdk)
 {
-    VALUE mGdkSelection = rb_define_module_under(mGdk, "Selection");
+    VALUE RG_TARGET_NAMESPACE = rb_define_module_under(mGdk, "Selection");
 
-    rb_define_module_function(mGdkSelection, "owner_set", gdkselection_owner_set, -1);
-    rb_define_module_function(mGdkSelection, "owner_get", gdkselection_owner_get, -1);
-    rb_define_module_function(mGdkSelection, "convert", gdkselection_convert, 4);
-    rb_define_module_function(mGdkSelection, "property_get", gdkselection_property_get, 1);
-    rb_define_module_function(mGdkSelection, "send_notify", gdkselection_send_notify, -1);
+    RG_DEF_MODFUNC(owner_set, -1);
+    RG_DEF_MODFUNC(owner_get, -1);
+    RG_DEF_MODFUNC(convert, 4);
+    RG_DEF_MODFUNC(property_get, 1);
+    RG_DEF_MODFUNC(send_notify, -1);
 
     /* Constants */
-    rb_define_const(mGdkSelection, "PRIMARY", GATOM2RVAL(GDK_SELECTION_PRIMARY));
-    rb_define_const(mGdkSelection, "SECONDARY", GATOM2RVAL(GDK_SELECTION_SECONDARY));
-    rb_define_const(mGdkSelection, "CLIPBOARD", GATOM2RVAL(GDK_SELECTION_CLIPBOARD));
-    
+    rb_define_const(RG_TARGET_NAMESPACE, "PRIMARY", GATOM2RVAL(GDK_SELECTION_PRIMARY));
+    rb_define_const(RG_TARGET_NAMESPACE, "SECONDARY", GATOM2RVAL(GDK_SELECTION_SECONDARY));
+    rb_define_const(RG_TARGET_NAMESPACE, "CLIPBOARD", GATOM2RVAL(GDK_SELECTION_CLIPBOARD));
+
     /* GdkSelectionType */
-    rb_define_const(mGdkSelection, "TYPE_ATOM", GATOM2RVAL(GDK_SELECTION_TYPE_ATOM));
-    rb_define_const(mGdkSelection, "TYPE_BITMAP", GATOM2RVAL(GDK_SELECTION_TYPE_BITMAP));
-    rb_define_const(mGdkSelection, "TYPE_COLORMAP", GATOM2RVAL(GDK_SELECTION_TYPE_COLORMAP));
-    rb_define_const(mGdkSelection, "TYPE_DRAWABLE", GATOM2RVAL(GDK_SELECTION_TYPE_DRAWABLE));
-    rb_define_const(mGdkSelection, "TYPE_INTEGER", GATOM2RVAL(GDK_SELECTION_TYPE_INTEGER));
-    rb_define_const(mGdkSelection, "TYPE_PIXMAP", GATOM2RVAL(GDK_SELECTION_TYPE_PIXMAP));
-    rb_define_const(mGdkSelection, "TYPE_WINDOW", GATOM2RVAL(GDK_SELECTION_TYPE_WINDOW));
-    rb_define_const(mGdkSelection, "TYPE_STRING", GATOM2RVAL(GDK_SELECTION_TYPE_STRING));
+    rb_define_const(RG_TARGET_NAMESPACE, "TYPE_ATOM", GATOM2RVAL(GDK_SELECTION_TYPE_ATOM));
+    rb_define_const(RG_TARGET_NAMESPACE, "TYPE_BITMAP", GATOM2RVAL(GDK_SELECTION_TYPE_BITMAP));
+    rb_define_const(RG_TARGET_NAMESPACE, "TYPE_COLORMAP", GATOM2RVAL(GDK_SELECTION_TYPE_COLORMAP));
+    rb_define_const(RG_TARGET_NAMESPACE, "TYPE_DRAWABLE", GATOM2RVAL(GDK_SELECTION_TYPE_DRAWABLE));
+    rb_define_const(RG_TARGET_NAMESPACE, "TYPE_INTEGER", GATOM2RVAL(GDK_SELECTION_TYPE_INTEGER));
+    rb_define_const(RG_TARGET_NAMESPACE, "TYPE_PIXMAP", GATOM2RVAL(GDK_SELECTION_TYPE_PIXMAP));
+    rb_define_const(RG_TARGET_NAMESPACE, "TYPE_WINDOW", GATOM2RVAL(GDK_SELECTION_TYPE_WINDOW));
+    rb_define_const(RG_TARGET_NAMESPACE, "TYPE_STRING", GATOM2RVAL(GDK_SELECTION_TYPE_STRING));
 
     /* GdkTarget */
-    rb_define_const(mGdkSelection, "TARGET_BITMAP", GATOM2RVAL(GDK_TARGET_BITMAP));
-    rb_define_const(mGdkSelection, "TARGET_COLORMAP", GATOM2RVAL(GDK_TARGET_COLORMAP));
-    rb_define_const(mGdkSelection, "TARGET_DRAWABLE", GATOM2RVAL(GDK_TARGET_DRAWABLE));
-    rb_define_const(mGdkSelection, "TARGET_PIXMAP", GATOM2RVAL(GDK_TARGET_PIXMAP));
-    rb_define_const(mGdkSelection, "TARGET_STRING", GATOM2RVAL(GDK_TARGET_STRING));
+    rb_define_const(RG_TARGET_NAMESPACE, "TARGET_BITMAP", GATOM2RVAL(GDK_TARGET_BITMAP));
+    rb_define_const(RG_TARGET_NAMESPACE, "TARGET_COLORMAP", GATOM2RVAL(GDK_TARGET_COLORMAP));
+    rb_define_const(RG_TARGET_NAMESPACE, "TARGET_DRAWABLE", GATOM2RVAL(GDK_TARGET_DRAWABLE));
+    rb_define_const(RG_TARGET_NAMESPACE, "TARGET_PIXMAP", GATOM2RVAL(GDK_TARGET_PIXMAP));
+    rb_define_const(RG_TARGET_NAMESPACE, "TARGET_STRING", GATOM2RVAL(GDK_TARGET_STRING));
 
 }

data/ext/gtk2/rbgdkthreads.c

@@ -1,19 +1,32 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkthreads.c -
-
-  $Author: sakai $
-  $Date: 2007/07/08 03:00:50 $
-
-  Copyright (C) 2003-2005 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003-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"
 
 #ifdef   G_THREADS_ENABLED
+
+#define RG_TARGET_NAMESPACE mThreads
+
 static VALUE
-rbgdk_threads_init(VALUE self)
+rg_m_init(VALUE self)
 {
 #ifndef GDK_WINDOWING_WIN32
     if (!g_thread_supported()){
@@ -25,21 +38,21 @@ rbgdk_threads_init(VALUE self)
 }
 
 static VALUE
-rbgdk_threads_enter(VALUE self)
+rg_m_enter(VALUE self)
 {
     gdk_threads_enter();
     return self;
 }
 
 static VALUE
-rbgdk_threads_leave(VALUE self)
+rg_m_leave(VALUE self)
 {
     gdk_threads_leave();
     return self;
 }
 
 static VALUE
-rbgdk_threads_synchronize(VALUE self)
+rg_m_synchronize(G_GNUC_UNUSED VALUE self)
 {
     VALUE func = rb_block_proc();
     gdk_threads_enter();
@@ -51,14 +64,14 @@ rbgdk_threads_synchronize(VALUE self)
 #endif
 
 void
-Init_gtk_gdk_threads()
+Init_gtk_gdk_threads(VALUE mGdk)
 {
 #ifdef   G_THREADS_ENABLED
-    VALUE mGdkThreads = rb_define_module_under(mGdk, "Threads");
+    VALUE RG_TARGET_NAMESPACE = rb_define_module_under(mGdk, "Threads");
 
-    rb_define_module_function(mGdkThreads, "init",  rbgdk_threads_init, 0);
-    rb_define_module_function(mGdkThreads, "enter", rbgdk_threads_enter, 0);
-    rb_define_module_function(mGdkThreads, "leave", rbgdk_threads_leave, 0);
-    rb_define_module_function(mGdkThreads, "synchronize", rbgdk_threads_synchronize, 0);
+    RG_DEF_MODFUNC(init, 0);
+    RG_DEF_MODFUNC(enter, 0);
+    RG_DEF_MODFUNC(leave, 0);
+    RG_DEF_MODFUNC(synchronize, 0);
 #endif
 }

data/ext/gtk2/rbgdktimecoord.c

@@ -1,15 +1,27 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003  Masao Mutoh
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
-  rbgdktimecoord.c -
-
-  $Author: sakai $
-  $Date: 2006/05/26 14:18:22 $
-
-  Copyright (C) 2003 Masao Mutoh
-************************************************/
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE cTimeCoord
 #define _SELF(s) ((GdkTimeCoord*)RVAL2BOXED(s, GDK_TYPE_TIME_COORD))
 
 /**********************************/
@@ -37,40 +49,47 @@ gdk_timecoord_get_type(void)
 /**********************************/
 
 static VALUE
-timecoord_initialize(VALUE self, VALUE time, VALUE axes)
+rg_initialize(VALUE self, VALUE rbtime, VALUE rbaxes)
 {
-    GdkTimeCoord coord;
-    int i;
-    coord.time = NUM2UINT(time);
+    guint32 time = NUM2UINT(rbtime);
+    long n;
+    gdouble *axes = RVAL2GDOUBLES(rbaxes, n);
+    GdkTimeCoord *coord;
 
-    if (RARRAY_LEN(axes) > GDK_MAX_TIMECOORD_AXES){
-        rb_raise(rb_eArgError, "axes: Out of range: %ld", RARRAY_LEN(axes));
-    }
+    if (n > GDK_MAX_TIMECOORD_AXES) {
+        g_free(axes);
 
-    for (i = 0; i < RARRAY_LEN(axes); i++){
-        coord.axes[i] = NUM2DBL(RARRAY_PTR(axes)[i]);
+        rb_raise(rb_eArgError,
+                 "axes out of range: %ld (0..%d)",
+                 n, GDK_MAX_TIMECOORD_AXES);
     }
 
-    G_INITIALIZE(self, &coord);
+    coord = g_new(GdkTimeCoord, 1);
+    coord->time = time;
+    MEMCPY(coord->axes, axes, gdouble, n);
+
+    g_free(axes);
+
+    G_INITIALIZE(self, coord);
 
     return Qnil;
 }
 
 static VALUE
-timecoord_time(VALUE self)
+rg_time(VALUE self)
 {
     return UINT2NUM(_SELF(self)->time);
 }
 
 static VALUE
-timecoord_set_time(VALUE self, VALUE time)
+rg_set_time(VALUE self, VALUE time)
 {
     _SELF(self)->time = NUM2UINT(time);
     return self;
 }
 
 static VALUE
-timecoord_axes(VALUE self)
+rg_axes(VALUE self)
 {
     VALUE ary = rb_ary_new();
     int i;
@@ -81,33 +100,36 @@ timecoord_axes(VALUE self)
 }
 
 static VALUE
-timecoord_set_axes(VALUE self, VALUE axes)
+rg_set_axes(VALUE self, VALUE rbaxes)
 {
-    int i;
-    GdkTimeCoord* coord = _SELF(self);
+    GdkTimeCoord *coord = _SELF(self);
+    VALUE axes = rb_ary_to_ary(rbaxes);
+    long i;
+    long n = RARRAY_LEN(axes);
 
-    if (RARRAY_LEN(axes) > GDK_MAX_TIMECOORD_AXES){
-        rb_raise(rb_eArgError, "axes: Out of range: %ld", RARRAY_LEN(axes));
-    }
+    if (n < 0 || n > GDK_MAX_TIMECOORD_AXES)
+        rb_raise(rb_eArgError,
+                 "axes out of range: %ld (0..%d)",
+                 n, GDK_MAX_TIMECOORD_AXES);
 
-    for (i = 0; i < RARRAY_LEN(axes); i++){
+    for (i = 0; i < n; i++)
         coord->axes[i] = NUM2DBL(RARRAY_PTR(axes)[i]);
-    }
+
     return self;
 }
 
 void
-Init_gtk_gdk_timecoord()
+Init_gtk_gdk_timecoord(VALUE mGdk)
 {
-    VALUE tc = G_DEF_CLASS(GDK_TYPE_TIME_COORD, "TimeCoord", mGdk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_TIME_COORD, "TimeCoord", mGdk);
 
-    rb_define_method(tc, "initialize", timecoord_initialize, 2);
-    rb_define_method(tc, "time", timecoord_time, 0);
-    rb_define_method(tc, "set_time", timecoord_set_time, 1);
-    rb_define_method(tc, "axes", timecoord_axes, 0);
-    rb_define_method(tc, "set_axes", timecoord_set_axes, 1);
+    RG_DEF_METHOD(initialize, 2);
+    RG_DEF_METHOD(time, 0);
+    RG_DEF_METHOD(set_time, 1);
+    RG_DEF_METHOD(axes, 0);
+    RG_DEF_METHOD(set_axes, 1);
 
-    G_DEF_SETTERS(tc);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 
-    rb_define_const(tc, "MAX_AXES", INT2NUM(GDK_MAX_TIMECOORD_AXES));
+    rb_define_const(RG_TARGET_NAMESPACE, "MAX_AXES", INT2NUM(GDK_MAX_TIMECOORD_AXES));
 }

data/ext/gtk2/rbgdkvisual.c

@@ -1,26 +1,34 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgdkvisual.c -
-
-  $Author: mutoh $
-  $Date: 2004/08/01 07:10:03 $
-
-  Copyright (C) 2002-2004 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-2004 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 cVisual
 #define _SELF(self) (GDK_VISUAL(RVAL2GOBJ(self)))
 
 static VALUE
-gdkvisual_s_query_depths(VALUE self)
+rg_s_query_depths(G_GNUC_UNUSED VALUE self)
 {
     gint *depth;
     gint count;
@@ -36,7 +44,7 @@ gdkvisual_s_query_depths(VALUE self)
 }
 
 static VALUE
-gdkvisual_s_query_visual_types(VALUE self)
+rg_s_query_visual_types(G_GNUC_UNUSED VALUE self)
 {
     GdkVisualType *visual_types;
     gint count;
@@ -52,7 +60,7 @@ gdkvisual_s_query_visual_types(VALUE self)
 }
 
 static VALUE
-gdkvisual_s_list_visuals(VALUE self)
+rg_s_visuals(G_GNUC_UNUSED VALUE self)
 {
     GList *list = gdk_list_visuals(), *cur;
     VALUE ary = rb_ary_new();
@@ -65,44 +73,44 @@ gdkvisual_s_list_visuals(VALUE self)
 }
 
 static VALUE
-gdkvisual_s_get_best_depth(VALUE self)
+rg_s_best_depth(G_GNUC_UNUSED VALUE self)
 {
     return INT2NUM(gdk_visual_get_best_depth());
 }
 
 static VALUE
-gdkvisual_s_get_best_type(VALUE self)
+rg_s_best_type(G_GNUC_UNUSED VALUE self)
 {
     return INT2NUM(gdk_visual_get_best_type());
 }
 
 static VALUE
-gdkvisual_s_get_system(VALUE self)
+rg_s_system(G_GNUC_UNUSED VALUE self)
 {
     return GOBJ2RVAL(gdk_visual_get_system());
 }
 
 static VALUE
-gdkvisual_s_get_best(VALUE self)
+rg_s_best(G_GNUC_UNUSED VALUE self)
 {
     return GOBJ2RVAL(gdk_visual_get_best());
 }
 
 static VALUE
-gdkvisual_s_get_best_with_depth(VALUE self, VALUE depth)
+rg_s_best_with_depth(G_GNUC_UNUSED VALUE self, VALUE depth)
 {
     return GOBJ2RVAL(gdk_visual_get_best_with_depth(NUM2INT(depth)));
 }
 
 static VALUE
-gdkvisual_s_get_best_with_type(VALUE self, VALUE type)
+rg_s_best_with_type(G_GNUC_UNUSED VALUE self, VALUE type)
 {
     return GOBJ2RVAL(gdk_visual_get_best_with_depth(
                                     (GdkVisualType)GENUM2RVAL(type, GDK_TYPE_VISUAL_TYPE)));
 }
 
 static VALUE
-gdkvisual_s_get_best_with_both(VALUE self, VALUE depth, VALUE type)
+rg_s_best_with_both(G_GNUC_UNUSED VALUE self, VALUE depth, VALUE type)
 {
     return GOBJ2RVAL(gdk_visual_get_best_with_both(
                                     NUM2INT(depth),
@@ -111,7 +119,7 @@ gdkvisual_s_get_best_with_both(VALUE self, VALUE depth, VALUE type)
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-gdkvisual_get_screen(VALUE self)
+rg_screen(VALUE self)
 {
     return GOBJ2RVAL(gdk_visual_get_screen(_SELF(self)));
 }
@@ -119,130 +127,130 @@ gdkvisual_get_screen(VALUE self)
 
 /* Structure accessors */
 static VALUE
-gdkvisual_type(VALUE self)
+rg_visual_type(VALUE self)
 {
     return GENUM2RVAL(_SELF(self)->type, GDK_TYPE_VISUAL_TYPE);
 }
 
 static VALUE
-gdkvisual_depth(VALUE self)
+rg_depth(VALUE self)
 {
     return INT2FIX(_SELF(self)->depth);
 }
 
 static VALUE
-gdkvisual_byte_order(VALUE self)
+rg_byte_order(VALUE self)
 {
     return GENUM2RVAL(_SELF(self)->byte_order, GDK_TYPE_BYTE_ORDER);
 }
 
 static VALUE
-gdkvisual_colormap_size(VALUE self)
+rg_colormap_size(VALUE self)
 {
     return INT2FIX(_SELF(self)->colormap_size);
 }
 
 static VALUE
-gdkvisual_bits_per_rgb(VALUE self)
+rg_bits_per_rgb(VALUE self)
 {
     return INT2FIX(_SELF(self)->bits_per_rgb);
 }
 
 static VALUE
-gdkvisual_red_mask(VALUE self)
+rg_red_mask(VALUE self)
 {
     return INT2FIX(_SELF(self)->red_mask);
 }
 
 static VALUE
-gdkvisual_red_shift(VALUE self)
+rg_red_shift(VALUE self)
 {
     return INT2FIX(_SELF(self)->red_shift);
 }
 
 static VALUE
-gdkvisual_red_prec(VALUE self)
+rg_red_prec(VALUE self)
 {
     return INT2FIX(_SELF(self)->red_prec);
 }
 
 static VALUE
-gdkvisual_green_mask(VALUE self)
+rg_green_mask(VALUE self)
 {
     return INT2FIX(_SELF(self)->green_mask);
 }
 
 static VALUE
-gdkvisual_green_shift(VALUE self)
+rg_green_shift(VALUE self)
 {
     return INT2FIX(_SELF(self)->green_shift);
 }
 
 static VALUE
-gdkvisual_green_prec(VALUE self)
+rg_green_prec(VALUE self)
 {
     return INT2FIX(_SELF(self)->green_prec);
 }
 
 static VALUE
-gdkvisual_blue_mask(VALUE self)
+rg_blue_mask(VALUE self)
 {
     return INT2FIX(_SELF(self)->blue_mask);
 }
 
 static VALUE
-gdkvisual_blue_shift(VALUE self)
+rg_blue_shift(VALUE self)
 {
     return INT2FIX(_SELF(self)->blue_shift);
 }
 
 static VALUE
-gdkvisual_blue_prec(VALUE self)
+rg_blue_prec(VALUE self)
 {
     return INT2FIX(_SELF(self)->blue_prec);
 }
 
 void
-Init_gtk_gdk_visual()
+Init_gtk_gdk_visual(VALUE mGdk)
 {
-    VALUE gdkVisual = G_DEF_CLASS(GDK_TYPE_VISUAL, "Visual", mGdk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_VISUAL, "Visual", mGdk);
 
     /* class methods */
-    rb_define_singleton_method(gdkVisual, "query_depths", gdkvisual_s_query_depths, 0);
-    rb_define_singleton_method(gdkVisual, "query_visual_types", gdkvisual_s_query_visual_types, 0);
-    rb_define_singleton_method(gdkVisual, "visuals", gdkvisual_s_list_visuals, 0);
-    rb_define_singleton_method(gdkVisual, "best_depth", gdkvisual_s_get_best_depth, 0);
-    rb_define_singleton_method(gdkVisual, "best_type", gdkvisual_s_get_best_type, 0);
-    rb_define_singleton_method(gdkVisual, "system", gdkvisual_s_get_system, 0);
-    rb_define_singleton_method(gdkVisual, "best", gdkvisual_s_get_best, 0);
-    rb_define_singleton_method(gdkVisual, "best_with_depth", gdkvisual_s_get_best_with_depth, 1);
-    rb_define_singleton_method(gdkVisual, "best_with_type", gdkvisual_s_get_best_with_type, 1);
-    rb_define_singleton_method(gdkVisual, "best_with_both", gdkvisual_s_get_best_with_both, 2);
+    RG_DEF_SMETHOD(query_depths, 0);
+    RG_DEF_SMETHOD(query_visual_types, 0);
+    RG_DEF_SMETHOD(visuals, 0);
+    RG_DEF_SMETHOD(best_depth, 0);
+    RG_DEF_SMETHOD(best_type, 0);
+    RG_DEF_SMETHOD(system, 0);
+    RG_DEF_SMETHOD(best, 0);
+    RG_DEF_SMETHOD(best_with_depth, 1);
+    RG_DEF_SMETHOD(best_with_type, 1);
+    RG_DEF_SMETHOD(best_with_both, 2);
 
     /* instance methods */
 #if GTK_CHECK_VERSION(2,2,0)
-    rb_define_method(gdkVisual, "screen", gdkvisual_get_screen, 0);
+    RG_DEF_METHOD(screen, 0);
 #endif
-    rb_define_method(gdkVisual, "visual_type", gdkvisual_type, 0);
-    rb_define_method(gdkVisual, "depth", gdkvisual_depth, 0);
-    rb_define_method(gdkVisual, "byte_order", gdkvisual_byte_order, 0);
-    rb_define_method(gdkVisual, "colormap_size", gdkvisual_colormap_size, 0);
-    rb_define_method(gdkVisual, "bits_per_rgb", gdkvisual_bits_per_rgb, 0);
-    rb_define_method(gdkVisual, "red_mask", gdkvisual_red_mask, 0);
-    rb_define_method(gdkVisual, "red_shift", gdkvisual_red_shift, 0);
-    rb_define_method(gdkVisual, "red_prec", gdkvisual_red_prec, 0);
-    rb_define_method(gdkVisual, "green_mask", gdkvisual_green_mask, 0);
-    rb_define_method(gdkVisual, "green_shift", gdkvisual_green_shift, 0);
-    rb_define_method(gdkVisual, "green_prec", gdkvisual_green_prec, 0);
-    rb_define_method(gdkVisual, "blue_mask", gdkvisual_blue_mask, 0);
-    rb_define_method(gdkVisual, "blue_shift", gdkvisual_blue_shift, 0);
-    rb_define_method(gdkVisual, "blue_prec", gdkvisual_blue_prec, 0);
+    RG_DEF_METHOD(visual_type, 0);
+    RG_DEF_METHOD(depth, 0);
+    RG_DEF_METHOD(byte_order, 0);
+    RG_DEF_METHOD(colormap_size, 0);
+    RG_DEF_METHOD(bits_per_rgb, 0);
+    RG_DEF_METHOD(red_mask, 0);
+    RG_DEF_METHOD(red_shift, 0);
+    RG_DEF_METHOD(red_prec, 0);
+    RG_DEF_METHOD(green_mask, 0);
+    RG_DEF_METHOD(green_shift, 0);
+    RG_DEF_METHOD(green_prec, 0);
+    RG_DEF_METHOD(blue_mask, 0);
+    RG_DEF_METHOD(blue_shift, 0);
+    RG_DEF_METHOD(blue_prec, 0);
 
     /* GdkVisualType */
-    G_DEF_CLASS(GDK_TYPE_VISUAL_TYPE, "Type", gdkVisual);
-    G_DEF_CONSTANTS(gdkVisual, GDK_TYPE_VISUAL_TYPE, "GDK_VISUAL_");
+    G_DEF_CLASS(GDK_TYPE_VISUAL_TYPE, "Type", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GDK_TYPE_VISUAL_TYPE, "GDK_VISUAL_");
 
     /* GdkByteOrder */
-    G_DEF_CLASS(GDK_TYPE_BYTE_ORDER, "ByteOrder", gdkVisual);
-    G_DEF_CONSTANTS(gdkVisual, GDK_TYPE_BYTE_ORDER, "GDK_");
+    G_DEF_CLASS(GDK_TYPE_BYTE_ORDER, "ByteOrder", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GDK_TYPE_BYTE_ORDER, "GDK_");
 }