gtk2 0.90.7 → 0.90.8

data/ext/gtk2/rbgtksizegroup.c

@@ -14,24 +14,21 @@
 #define _SELF(self) (GTK_SIZE_GROUP(RVAL2GOBJ(self)))
 
 static VALUE
-sizegrp_initialize(self, mode)
-    VALUE self, mode;
+sizegrp_initialize(VALUE self, VALUE mode)
 {
     G_INITIALIZE(self, gtk_size_group_new(RVAL2GENUM(mode, GTK_TYPE_SIZE_GROUP_MODE)));
     return Qnil;
 }
 
 static VALUE
-sizegrp_add_widget(self, widget)
-    VALUE self, widget;
+sizegrp_add_widget(VALUE self, VALUE widget)
 {
     gtk_size_group_add_widget(_SELF(self), GTK_WIDGET(RVAL2GOBJ(widget)));
     return self;
 }
 
 static VALUE
-sizegrp_remove_widget(self, widget)
-    VALUE self, widget;
+sizegrp_remove_widget(VALUE self, VALUE widget)
 {
     gtk_size_group_remove_widget(_SELF(self), GTK_WIDGET(RVAL2GOBJ(widget)));
     return self;
@@ -47,8 +44,7 @@ gboolean    gtk_size_group_get_ignore_hidden
 
 #if GTK_CHECK_VERSION(2,10,0)
 static VALUE
-sizegrp_get_widgets(self)
-    VALUE self;
+sizegrp_get_widgets(VALUE self)
 {
     return GSLIST2ARY(gtk_size_group_get_widgets(_SELF(self)));
 }

data/ext/gtk2/rbgtksocket.c

@@ -16,16 +16,14 @@
 #define _SELF(self) GTK_SOCKET(RVAL2GOBJ(self))
 
 static VALUE
-socket_initialize(self)
-    VALUE self;
+socket_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_socket_new());
     return Qnil;
 }
 
 static VALUE
-socket_add_id(self, wid)
-    VALUE self, wid;
+socket_add_id(VALUE self, VALUE wid)
 {
     gtk_socket_add_id(_SELF(self),
 #ifdef GDK_NATIVE_WINDOW_POINTER
@@ -38,15 +36,13 @@ socket_add_id(self, wid)
 }
 
 static VALUE
-socket_plug_window(self)
-    VALUE self;
+socket_plug_window(VALUE self)
 {
     return GOBJ2RVAL(_SELF(self)->plug_window);
 }
 
 static VALUE
-socket_get_socket_id(self)
-    VALUE self;
+socket_get_socket_id(VALUE self)
 {
     GdkNativeWindow id =  gtk_socket_get_id(_SELF(self));
 #ifdef GDK_NATIVE_WINDOW_POINTER

data/ext/gtk2/rbgtkspinbutton.c

@@ -17,10 +17,7 @@
 #define _SELF(self) (GTK_SPIN_BUTTON(RVAL2GOBJ(self)))
 
 static VALUE
-sbtn_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+sbtn_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg1, arg2, arg3;
     GtkAdjustment *adj = NULL;
@@ -44,8 +41,7 @@ sbtn_initialize(argc, argv, self)
 }
 
 static VALUE
-sbtn_configure(self, adj, climb_rate, digits)
-    VALUE self, adj, climb_rate, digits;
+sbtn_configure(VALUE self, VALUE adj, VALUE climb_rate, VALUE digits)
 {
     gtk_spin_button_configure(_SELF(self), GTK_ADJUSTMENT(RVAL2GOBJ(adj)),
                               NUM2DBL(climb_rate), NUM2UINT(digits));
@@ -53,16 +49,14 @@ sbtn_configure(self, adj, climb_rate, digits)
 }
 
 static VALUE
-sbtn_set_increments(self, step, page)
-    VALUE self, step, page;
+sbtn_set_increments(VALUE self, VALUE step, VALUE page)
 {
     gtk_spin_button_set_increments(_SELF(self), NUM2DBL(step), NUM2DBL(page));
     return self;
 }
 
 static VALUE
-sbtn_set_range(self, min, max)
-    VALUE self, min, max;
+sbtn_set_range(VALUE self, VALUE min, VALUE max)
 {
     gtk_spin_button_set_range(_SELF(self), NUM2DBL(min), NUM2DBL(max));
     return self;
@@ -70,15 +64,13 @@ sbtn_set_range(self, min, max)
 
 
 static VALUE
-sbtn_get_value_as_int(self)
-    VALUE self;
+sbtn_get_value_as_int(VALUE self)
 {
     return INT2NUM(gtk_spin_button_get_value_as_int(_SELF(self)));
 }
 
 static VALUE
-sbtn_spin(self, direction, increment)
-    VALUE self, direction, increment;
+sbtn_spin(VALUE self, VALUE direction, VALUE increment)
 {
     gtk_spin_button_spin(_SELF(self), RVAL2GENUM(direction, GTK_TYPE_SPIN_TYPE), 
                          NUM2DBL(increment));
@@ -86,16 +78,14 @@ sbtn_spin(self, direction, increment)
 }
 
 static VALUE
-sbtn_update(self)
-    VALUE self;
+sbtn_update(VALUE self)
 {
     gtk_spin_button_update(_SELF(self));
     return self;
 }
 
 static VALUE
-sbtn_get_increments(self)
-    VALUE self;
+sbtn_get_increments(VALUE self)
 {
     gdouble step, page;
     gtk_spin_button_get_increments(_SELF(self), &step, &page);
@@ -104,8 +94,7 @@ sbtn_get_increments(self)
 }
 
 static VALUE
-sbtn_get_range(self)
-    VALUE self;
+sbtn_get_range(VALUE self)
 {
     gdouble min, max;
     gtk_spin_button_get_range(_SELF(self), &min, &max);

data/ext/gtk2/rbgtkspinner.c

@@ -0,0 +1,51 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/************************************************
+
+  rbgtkspinner.c -
+
+  $Author: masaakiaoyagi $
+  $Date: 2011-02-19 09:24:49 +0900 (土, 19  2月 2011) $
+
+  Copyright (C) 2011 Ruby-GNOME2 Project Team
+************************************************/
+
+#include "global.h"
+
+#if GTK_CHECK_VERSION(2,20,0)
+
+#define _SELF(s) (GTK_SPINNER(RVAL2GOBJ(s)))
+
+static VALUE
+spinner_initialize(VALUE self)
+{
+    RBGTK_INITIALIZE(self, gtk_spinner_new());
+    return Qnil;
+}
+
+static VALUE
+spinner_start(VALUE self)
+{
+    gtk_spinner_start(_SELF(self));
+    return self;
+}
+
+static VALUE
+spinner_stop(VALUE self)
+{
+    gtk_spinner_stop(_SELF(self));
+    return self;
+}
+
+#endif
+
+void 
+Init_gtk_spinner()
+{
+#if GTK_CHECK_VERSION(2,20,0)
+    VALUE gSpinner = G_DEF_CLASS(GTK_TYPE_SPINNER, "Spinner", mGtk);
+
+    rb_define_method(gSpinner, "initialize", spinner_initialize, 0);
+    rb_define_method(gSpinner, "start", spinner_start, 0);
+    rb_define_method(gSpinner, "stop", spinner_stop, 0);
+#endif
+}

data/ext/gtk2/rbgtkstatusbar.c

@@ -17,16 +17,14 @@
 #define _SELF(self) (GTK_STATUSBAR(RVAL2GOBJ(self)))
 
 static VALUE
-statusbar_initialize(self)
-     VALUE self;
+statusbar_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_statusbar_new());
     return Qnil;
 }
 
 static VALUE
-statusbar_get_context_id(self, text)
-    VALUE self, text;
+statusbar_get_context_id(VALUE self, VALUE text)
 {
 
     return INT2FIX(gtk_statusbar_get_context_id(_SELF(self),
@@ -34,16 +32,14 @@ statusbar_get_context_id(self, text)
 }
 
 static VALUE
-statusbar_push(self, id, text)
-    VALUE self, id, text;
+statusbar_push(VALUE self, VALUE id, VALUE text)
 {
     return INT2FIX(gtk_statusbar_push(_SELF(self), 
                                       NUM2INT(id), RVAL2CSTR(text)));
 }
     
 static VALUE
-statusbar_pop(self, id)
-    VALUE self, id;
+statusbar_pop(VALUE self, VALUE id)
 {
     gtk_statusbar_pop(_SELF(self), NUM2INT(id));
     return self;
@@ -51,24 +47,21 @@ statusbar_pop(self, id)
 }
 
 static VALUE
-statusbar_remove(self, cid, mid)
-     VALUE self, cid, mid;
+statusbar_remove(VALUE self, VALUE cid, VALUE mid)
 {
     gtk_statusbar_remove(_SELF(self), NUM2INT(cid), NUM2INT(mid)); 
     return self;
 }
 
 static VALUE
-statusbar_set_has_resize_grip(self, setting)
-     VALUE self, setting;
+statusbar_set_has_resize_grip(VALUE self, VALUE setting)
 {
     gtk_statusbar_set_has_resize_grip(_SELF(self), RVAL2CBOOL(setting));
     return self;
 }
 
 static VALUE
-statusbar_get_has_resize_grip(self)
-     VALUE self;
+statusbar_get_has_resize_grip(VALUE self)
 {
     return CBOOL2RVAL(gtk_statusbar_get_has_resize_grip(_SELF(self)));
 }

data/ext/gtk2/rbgtkstatusicon.c

@@ -16,8 +16,7 @@
 #define _SELF(w) (GTK_STATUS_ICON(RVAL2GOBJ(w)))
 
 static VALUE
-si_initialize(self)
-    VALUE self;
+si_initialize(VALUE self)
 {
     G_INITIALIZE(self, gtk_status_icon_new());
     return Qnil;
@@ -58,23 +57,20 @@ gboolean    gtk_status_icon_get_blinking    (GtkStatusIcon *status_icon);
 */
 
 static VALUE
-si_set_tooltip(self, tooltip_text)
-    VALUE self, tooltip_text;
+si_set_tooltip(VALUE self, VALUE tooltip_text)
 {
     gtk_status_icon_set_tooltip(_SELF(self), RVAL2CSTR(tooltip_text));
     return self;
 }
 
 static VALUE
-si_is_embedded(self)
-    VALUE self;
+si_is_embedded(VALUE self)
 {
     return CBOOL2RVAL(gtk_status_icon_is_embedded(_SELF(self)));
 }
 
 static VALUE
-si_position_menu(self, menu)
-    VALUE self, menu;
+si_position_menu(VALUE self, VALUE menu)
 {
     gint x, y;
     gboolean push_in;
@@ -85,8 +81,7 @@ si_position_menu(self, menu)
 }
 
 static VALUE
-si_get_geometry(self)
-    VALUE self;
+si_get_geometry(VALUE self)
 {
     GdkScreen* screen;
     GdkRectangle area;

data/ext/gtk2/rbgtkstock.c

@@ -22,9 +22,7 @@
 #define CSTR2SYM(str) ID2SYM(rb_intern(str))
 
 static VALUE
-stock_m_add(argc, argv, klass)
-    int argc;
-    VALUE *argv, klass;
+stock_m_add(int argc, VALUE *argv, VALUE klass)
 {
     VALUE stock_id, label, modifier, keyval, translation_domain;
     GtkStockItem item;
@@ -41,8 +39,7 @@ stock_m_add(argc, argv, klass)
 }
 
 static VALUE
-stock_m_lookup(klass, stock_id)
-    VALUE klass, stock_id;
+stock_m_lookup(VALUE klass, VALUE stock_id)
 {
     GtkStockItem item;
 
@@ -59,8 +56,7 @@ stock_m_lookup(klass, stock_id)
 }
 
 static VALUE
-stock_m_list_ids(klass)
-    VALUE klass;
+stock_m_list_ids(VALUE klass)
 {
     GSList *ids = gtk_stock_list_ids();
     GSList *l;
@@ -75,18 +71,14 @@ stock_m_list_ids(klass)
 
 #if GTK_CHECK_VERSION(2,8,0)
 static gchar*
-translate_func(path, func)
-    const gchar* path;
-    gpointer func;
+translate_func(const gchar *path, gpointer func)
 {
     VALUE ret = rb_funcall((VALUE)func, id_call, 1, CSTR2RVAL(path));
     return RVAL2CSTR(ret);
 }
 
 static VALUE
-stock_m_set_translate_func(klass, domain)
-    VALUE klass;
-    VALUE domain;
+stock_m_set_translate_func(VALUE klass, VALUE domain)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(klass, func);

data/ext/gtk2/rbgtkstyle.c

@@ -24,46 +24,40 @@
 #define RVAL2ORI(s) (RVAL2GENUM(s, GTK_TYPE_ORIENTATION))
 
 static VALUE
-style_initialize(self)
-    VALUE self;
+style_initialize(VALUE self)
 {
     G_INITIALIZE(self, gtk_style_new());
     return Qnil;
 }
 
 static VALUE
-style_attached(self)
-    VALUE self;
+style_attached(VALUE self)
 {
     return CBOOL2RVAL(GTK_STYLE_ATTACHED(_SELF(self)));
 }
 
 static VALUE
-style_copy(self)
-    VALUE self;
+style_copy(VALUE self)
 {
     return GOBJ2RVAL(gtk_style_copy(_SELF(self)));
 }
 
 static VALUE
-style_attach(self, win)
-    VALUE self, win;
+style_attach(VALUE self, VALUE win)
 {
     return GOBJ2RVAL(gtk_style_attach(_SELF(self),
                                       GDK_WINDOW(RVAL2GOBJ(win))));
 }
 
 static VALUE
-style_detach(self)
-    VALUE self;
+style_detach(VALUE self)
 {
     gtk_style_detach(_SELF(self));
     return self;
 }
 
 static VALUE
-style_set_background(self, win, state_type)
-    VALUE self, win, state_type;
+style_set_background(VALUE self, VALUE win, VALUE state_type)
 {
     gtk_style_set_background(_SELF(self), GDK_WINDOW(RVAL2GOBJ(win)),
                              RVAL2STATE(state_type));
@@ -71,9 +65,7 @@ style_set_background(self, win, state_type)
 }
 
 static VALUE
-style_apply_default_background(self, gdkwindow, set_bg, state_type, area,
-                               x, y, width, height)
-    VALUE self, gdkwindow, set_bg, state_type, area, x, y, width, height;
+style_apply_default_background(VALUE self, VALUE gdkwindow, VALUE set_bg, VALUE state_type, VALUE area, VALUE x, VALUE y, VALUE width, VALUE height)
 {
     gtk_style_apply_default_background(_SELF(self), 
                                        GDK_WINDOW(RVAL2GOBJ(gdkwindow)),
@@ -86,8 +78,7 @@ style_apply_default_background(self, gdkwindow, set_bg, state_type, area,
 
 #if GTK_CHECK_VERSION(2,10,0)
 static VALUE
-style_lookup_color(self, color_name)
-    VALUE self, color_name;
+style_lookup_color(VALUE self, VALUE color_name)
 {
     GdkColor color;
     if (gtk_style_lookup_color(_SELF(self), RVAL2CSTR(color_name), &color)){
@@ -99,8 +90,7 @@ style_lookup_color(self, color_name)
 #endif
 
 static VALUE
-style_lookup_icon_set(self, stock_id)
-    VALUE self, stock_id;
+style_lookup_icon_set(VALUE self, VALUE stock_id)
 {
     const gchar *id;
     GtkIconSet *ret;
@@ -115,8 +105,7 @@ style_lookup_icon_set(self, stock_id)
 }
 
 static VALUE
-style_render_icon(self, source, direction, state, size, widget, detail)
-    VALUE self, source, direction, state, size, widget, detail;
+style_render_icon(VALUE self, VALUE source, VALUE direction, VALUE state, VALUE size, VALUE widget, VALUE detail)
 {
     return GOBJ2RVAL(gtk_style_render_icon(_SELF(self), RVAL2ICONSOURCE(source),
                                            RVAL2GENUM(direction, GTK_TYPE_TEXT_DIRECTION), 
@@ -127,10 +116,7 @@ style_render_icon(self, source, direction, state, size, widget, detail)
 }
 
 static VALUE
-style_paint_arrow(self, gdkwindow, state_type, shadow_type, area, widget, detail,
-                  arrow_type, fill, x, y, width, height)
-    VALUE self, gdkwindow, state_type, shadow_type, area, widget, detail,
-    arrow_type, fill, x, y, width, height;
+style_paint_arrow(VALUE self, VALUE gdkwindow, VALUE state_type, VALUE shadow_type, VALUE area, VALUE widget, VALUE detail, VALUE arrow_type, VALUE fill, VALUE x, VALUE y, VALUE width, VALUE height)
 {
     gtk_paint_arrow(_SELF(self), GDK_WINDOW(RVAL2GOBJ(gdkwindow)),
                     RVAL2STATE(state_type), RVAL2SHADOW(shadow_type), RVAL2REC(area),
@@ -141,10 +127,7 @@ style_paint_arrow(self, gdkwindow, state_type, shadow_type, area, widget, detail
 }
 
 static VALUE
-style_paint_box(self, gdkwindow, state_type, shadow_type, area, widget, detail,
-                x, y, width, height)
-    VALUE self, gdkwindow, state_type, shadow_type, area, widget, detail,
-    x, y, width, height;
+style_paint_box(VALUE self, VALUE gdkwindow, VALUE state_type, VALUE shadow_type, VALUE area, VALUE widget, VALUE detail, VALUE x, VALUE y, VALUE width, VALUE height)
 {
     gtk_paint_box(_SELF(self), GDK_WINDOW(RVAL2GOBJ(gdkwindow)),
                     RVAL2STATE(state_type), RVAL2SHADOW(shadow_type), RVAL2REC(area),
@@ -154,10 +137,7 @@ style_paint_box(self, gdkwindow, state_type, shadow_type, area, widget, detail,
 }
 
 static VALUE
-style_paint_box_gap(self, gdkwindow, state_type, shadow_type, area, widget, detail,
-                  x, y, width, height, gap_side, gap_x, gap_width)
-    VALUE self, gdkwindow, state_type, shadow_type, area, widget, detail,
-    x, y, width, height, gap_side, gap_x, gap_width;
+style_paint_box_gap(VALUE self, VALUE gdkwindow, VALUE state_type, VALUE shadow_type, VALUE area, VALUE widget, VALUE detail, VALUE x, VALUE y, VALUE width, VALUE height, VALUE gap_side, VALUE gap_x, VALUE gap_width)
 {
     gtk_paint_box_gap(_SELF(self), GDK_WINDOW(RVAL2GOBJ(gdkwindow)),
                       RVAL2STATE(state_type), RVAL2SHADOW(shadow_type), RVAL2REC(area),
@@ -168,10 +148,7 @@ style_paint_box_gap(self, gdkwindow, state_type, shadow_type, area, widget, deta
 }
 
 static VALUE
-style_paint_check(self, gdkwindow, state_type, shadow_type, area, widget, detail,
-                  x, y, width, height)
-    VALUE self, gdkwindow, state_type, shadow_type, area, widget, detail,
-    x, y, width, height;
+style_paint_check(VALUE self, VALUE gdkwindow, VALUE state_type, VALUE shadow_type, VALUE area, VALUE widget, VALUE detail, VALUE x, VALUE y, VALUE width, VALUE height)
 {
     gtk_paint_check(_SELF(self), GDK_WINDOW(RVAL2GOBJ(gdkwindow)),
                     RVAL2STATE(state_type), RVAL2SHADOW(shadow_type), RVAL2REC(area),
@@ -181,10 +158,7 @@ style_paint_check(self, gdkwindow, state_type, shadow_type, area, widget, detail
 }
 
 static VALUE
-style_paint_diamond(self, gdkwindow, state_type, shadow_type, area, widget, detail,
-                  x, y, width, height)
-    VALUE self, gdkwindow, state_type, shadow_type, area, widget, detail,
-    x, y, width, height;
+style_paint_diamond(VALUE self, VALUE gdkwindow, VALUE state_type, VALUE shadow_type, VALUE area, VALUE widget, VALUE detail, VALUE x, VALUE y, VALUE width, VALUE height)
 {
     gtk_paint_diamond(_SELF(self), GDK_WINDOW(RVAL2GOBJ(gdkwindow)),
                     RVAL2STATE(state_type), RVAL2SHADOW(shadow_type), RVAL2REC(area),
@@ -194,10 +168,7 @@ style_paint_diamond(self, gdkwindow, state_type, shadow_type, area, widget, deta
 }
 
 static VALUE
-style_paint_extension(self, gdkwindow, state_type, shadow_type, area, widget, detail,
-                      x, y, width, height, gap_side)
-    VALUE self, gdkwindow, state_type, shadow_type, area, widget, detail,
-    x, y, width, height, gap_side;
+style_paint_extension(VALUE self, VALUE gdkwindow, VALUE state_type, VALUE shadow_type, VALUE area, VALUE widget, VALUE detail, VALUE x, VALUE y, VALUE width, VALUE height, VALUE gap_side)
 {
     gtk_paint_extension(_SELF(self), GDK_WINDOW(RVAL2GOBJ(gdkwindow)),
                         RVAL2STATE(state_type), RVAL2SHADOW(shadow_type), RVAL2REC(area),
@@ -208,10 +179,7 @@ style_paint_extension(self, gdkwindow, state_type, shadow_type, area, widget, de
 }
 
 static VALUE
-style_paint_flat_box(self, gdkwindow, state_type, shadow_type, area, widget, detail,
-                     x, y, width, height)
-    VALUE self, gdkwindow, state_type, shadow_type, area, widget, detail,
-    x, y, width, height;
+style_paint_flat_box(VALUE self, VALUE gdkwindow, VALUE state_type, VALUE shadow_type, VALUE area, VALUE widget, VALUE detail, VALUE x, VALUE y, VALUE width, VALUE height)
 {
     gtk_paint_flat_box(_SELF(self), GDK_WINDOW(RVAL2GOBJ(gdkwindow)),
                     RVAL2STATE(state_type), RVAL2SHADOW(shadow_type), RVAL2REC(area),
@@ -221,10 +189,7 @@ style_paint_flat_box(self, gdkwindow, state_type, shadow_type, area, widget, det
 }
 
 static VALUE
-style_paint_focus(self, gdkwindow, state_type, area, widget, detail,
-                  x, y, width, height)
-    VALUE self, gdkwindow, state_type, area, widget, detail,
-    x, y, width, height;
+style_paint_focus(VALUE self, VALUE gdkwindow, VALUE state_type, VALUE area, VALUE widget, VALUE detail, VALUE x, VALUE y, VALUE width, VALUE height)
 {
     gtk_paint_focus(_SELF(self), GDK_WINDOW(RVAL2GOBJ(gdkwindow)),
                     RVAL2STATE(state_type), RVAL2REC(area),
@@ -234,10 +199,7 @@ style_paint_focus(self, gdkwindow, state_type, area, widget, detail,
 }
 
 static VALUE
-style_paint_handle(self, gdkwindow, state_type, shadow_type, area, widget, detail,
-                  x, y, width, height, orientation)
-    VALUE self, gdkwindow, state_type, shadow_type, area, widget, detail,
-    x, y, width, height, orientation;
+style_paint_handle(VALUE self, VALUE gdkwindow, VALUE state_type, VALUE shadow_type, VALUE area, VALUE widget, VALUE detail, VALUE x, VALUE y, VALUE width, VALUE height, VALUE orientation)
 {
     gtk_paint_handle(_SELF(self), GDK_WINDOW(RVAL2GOBJ(gdkwindow)),
                      RVAL2STATE(state_type), RVAL2SHADOW(shadow_type), RVAL2REC(area),
@@ -248,8 +210,7 @@ style_paint_handle(self, gdkwindow, state_type, shadow_type, area, widget, detai
 }
 
 static VALUE
-style_paint_hline(self, gdkwindow, state_type, area, widget, detail, x1, x2, y)
-    VALUE self, gdkwindow, state_type, area, widget, detail, x1, x2, y;
+style_paint_hline(VALUE self, VALUE gdkwindow, VALUE state_type, VALUE area, VALUE widget, VALUE detail, VALUE x1, VALUE x2, VALUE y)
 {
     gtk_paint_hline(_SELF(self), GDK_WINDOW(RVAL2GOBJ(gdkwindow)),
                     RVAL2STATE(state_type), RVAL2REC(area),
@@ -259,10 +220,7 @@ style_paint_hline(self, gdkwindow, state_type, area, widget, detail, x1, x2, y)
 }
 
 static VALUE
-style_paint_option(self, gdkwindow, state_type, shadow_type, area, widget, detail,
-                   x, y, width, height)
-    VALUE self, gdkwindow, state_type, shadow_type, area, widget, detail,
-    x, y, width, height;
+style_paint_option(VALUE self, VALUE gdkwindow, VALUE state_type, VALUE shadow_type, VALUE area, VALUE widget, VALUE detail, VALUE x, VALUE y, VALUE width, VALUE height)
 {
     gtk_paint_option(_SELF(self), GDK_WINDOW(RVAL2GOBJ(gdkwindow)),
                      RVAL2STATE(state_type), RVAL2SHADOW(shadow_type), RVAL2REC(area),
@@ -273,10 +231,7 @@ style_paint_option(self, gdkwindow, state_type, shadow_type, area, widget, detai
 }
 
 static VALUE
-style_paint_polygon(self, gdkwindow, state_type, shadow_type, area, widget, detail,
-                    points, fill)
-    VALUE self, gdkwindow, state_type, shadow_type, area, widget, detail,
-    points, fill;
+style_paint_polygon(VALUE self, VALUE gdkwindow, VALUE state_type, VALUE shadow_type, VALUE area, VALUE widget, VALUE detail, VALUE points, VALUE fill)
 {
     int i;
     GdkPoint* gpoints = g_new (GdkPoint, RARRAY_LEN(points));
@@ -294,10 +249,7 @@ style_paint_polygon(self, gdkwindow, state_type, shadow_type, area, widget, deta
 }
 
 static VALUE
-style_paint_shadow(self, gdkwindow, state_type, shadow_type, area, widget, detail,
-                   x, y, width, height)
-    VALUE self, gdkwindow, state_type, shadow_type, area, widget, detail,
-    x, y, width, height;
+style_paint_shadow(VALUE self, VALUE gdkwindow, VALUE state_type, VALUE shadow_type, VALUE area, VALUE widget, VALUE detail, VALUE x, VALUE y, VALUE width, VALUE height)
 {
     gtk_paint_shadow(_SELF(self), GDK_WINDOW(RVAL2GOBJ(gdkwindow)),
                      RVAL2STATE(state_type), RVAL2SHADOW(shadow_type), RVAL2REC(area),
@@ -308,10 +260,7 @@ style_paint_shadow(self, gdkwindow, state_type, shadow_type, area, widget, detai
 }
 
 static VALUE
-style_paint_shadow_gap(self, gdkwindow, state_type, shadow_type, area, widget, detail,
-                  x, y, width, height, gap_side, gap_x, gap_width)
-    VALUE self, gdkwindow, state_type, shadow_type, area, widget, detail,
-    x, y, width, height, gap_side, gap_x, gap_width;
+style_paint_shadow_gap(VALUE self, VALUE gdkwindow, VALUE state_type, VALUE shadow_type, VALUE area, VALUE widget, VALUE detail, VALUE x, VALUE y, VALUE width, VALUE height, VALUE gap_side, VALUE gap_x, VALUE gap_width)
 {
     gtk_paint_shadow_gap(_SELF(self), GDK_WINDOW(RVAL2GOBJ(gdkwindow)),
                          RVAL2STATE(state_type), RVAL2SHADOW(shadow_type), RVAL2REC(area),
@@ -323,10 +272,7 @@ style_paint_shadow_gap(self, gdkwindow, state_type, shadow_type, area, widget, d
 }
 
 static VALUE
-style_paint_slider(self, gdkwindow, state_type, shadow_type, area, widget, detail,
-                   x, y, width, height, orientation)
-    VALUE self, gdkwindow, state_type, shadow_type, area, widget, detail,
-    x, y, width, height, orientation;
+style_paint_slider(VALUE self, VALUE gdkwindow, VALUE state_type, VALUE shadow_type, VALUE area, VALUE widget, VALUE detail, VALUE x, VALUE y, VALUE width, VALUE height, VALUE orientation)
 {
     gtk_paint_slider(_SELF(self), GDK_WINDOW(RVAL2GOBJ(gdkwindow)),
                      RVAL2STATE(state_type), RVAL2SHADOW(shadow_type), RVAL2REC(area),
@@ -338,10 +284,7 @@ style_paint_slider(self, gdkwindow, state_type, shadow_type, area, widget, detai
 }
 
 static VALUE
-style_paint_tab(self, gdkwindow, state_type, shadow_type, area, widget, detail,
-                x, y, width, height)
-    VALUE self, gdkwindow, state_type, shadow_type, area, widget, detail,
-    x, y, width, height;
+style_paint_tab(VALUE self, VALUE gdkwindow, VALUE state_type, VALUE shadow_type, VALUE area, VALUE widget, VALUE detail, VALUE x, VALUE y, VALUE width, VALUE height)
 {
     gtk_paint_tab(_SELF(self), GDK_WINDOW(RVAL2GOBJ(gdkwindow)),
                   RVAL2STATE(state_type), RVAL2SHADOW(shadow_type), RVAL2REC(area),
@@ -352,8 +295,7 @@ style_paint_tab(self, gdkwindow, state_type, shadow_type, area, widget, detail,
 }
 
 static VALUE
-style_paint_vline(self, gdkwindow, state_type, area, widget, detail, y1, y2, x)
-    VALUE self, gdkwindow, state_type, area, widget, detail, y1, y2, x;
+style_paint_vline(VALUE self, VALUE gdkwindow, VALUE state_type, VALUE area, VALUE widget, VALUE detail, VALUE y1, VALUE y2, VALUE x)
 {
     gtk_paint_vline(_SELF(self), GDK_WINDOW(RVAL2GOBJ(gdkwindow)),
                     RVAL2STATE(state_type), RVAL2REC(area),
@@ -364,10 +306,7 @@ style_paint_vline(self, gdkwindow, state_type, area, widget, detail, y1, y2, x)
 }
 
 static VALUE
-style_paint_expander(self, gdkwindow, state_type, area, widget, detail,
-                     x, y, expander_style)
-    VALUE self, gdkwindow, state_type, area, widget, detail,
-    x, y, expander_style;
+style_paint_expander(VALUE self, VALUE gdkwindow, VALUE state_type, VALUE area, VALUE widget, VALUE detail, VALUE x, VALUE y, VALUE expander_style)
 {
     gtk_paint_expander(_SELF(self), GDK_WINDOW(RVAL2GOBJ(gdkwindow)),
                        RVAL2STATE(state_type), RVAL2REC(area),
@@ -378,10 +317,7 @@ style_paint_expander(self, gdkwindow, state_type, area, widget, detail,
 }
 
 static VALUE
-style_paint_layout(self, gdkwindow, state_type, use_text, area, 
-                   widget, detail, x, y, layout)
-    VALUE self, gdkwindow, state_type, use_text, area, widget, detail,
-    x, y, layout;
+style_paint_layout(VALUE self, VALUE gdkwindow, VALUE state_type, VALUE use_text, VALUE area, VALUE widget, VALUE detail, VALUE x, VALUE y, VALUE layout)
 {
     gtk_paint_layout(_SELF(self), GDK_WINDOW(RVAL2GOBJ(gdkwindow)),
                      RVAL2STATE(state_type), RVAL2CBOOL(use_text), RVAL2REC(area),
@@ -392,10 +328,7 @@ style_paint_layout(self, gdkwindow, state_type, use_text, area,
 }
 
 static VALUE
-style_paint_resize_grip(self, gdkwindow, state_type, area, widget, detail,
-                        edge, x, y, width, height)
-    VALUE self, gdkwindow, state_type, area, widget, detail, edge, x, y, 
-    width, height;
+style_paint_resize_grip(VALUE self, VALUE gdkwindow, VALUE state_type, VALUE area, VALUE widget, VALUE detail, VALUE edge, VALUE x, VALUE y, VALUE width, VALUE height)
 {
     gtk_paint_resize_grip(_SELF(self), GDK_WINDOW(RVAL2GOBJ(gdkwindow)),
                           RVAL2STATE(state_type), RVAL2REC(area),
@@ -408,8 +341,7 @@ style_paint_resize_grip(self, gdkwindow, state_type, area, widget, detail,
 }
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-style_s_draw_insertion_cursor(self, widget, drawable, area, location, is_primary, direction, draw_arrow)
-    VALUE self, widget, drawable, area, location, is_primary, direction, draw_arrow;
+style_s_draw_insertion_cursor(VALUE self, VALUE widget, VALUE drawable, VALUE area, VALUE location, VALUE is_primary, VALUE direction, VALUE draw_arrow)
 {
     gtk_draw_insertion_cursor(GTK_WIDGET(RVAL2GOBJ(widget)),
                               GDK_WINDOW(RVAL2GOBJ(drawable)),
@@ -423,8 +355,7 @@ style_s_draw_insertion_cursor(self, widget, drawable, area, location, is_primary
 
 #define DEFINE_STYLE_COLOR(type) \
 static VALUE \
-style_set_ ## type(self, idx, r, g, b) \
-    VALUE self, idx, r, g, b; \
+style_set_ ## type(VALUE self, VALUE idx, VALUE r, VALUE g, VALUE b) \
 { \
   GdkColor *color; \
   int i = NUM2INT(idx); \
@@ -437,8 +368,7 @@ style_set_ ## type(self, idx, r, g, b) \
   return self; \
 } \
 static VALUE \
-style_ ## type(self, idx) \
-    VALUE self, idx; \
+style_ ## type(VALUE self, VALUE idx) \
 { \
   int i = NUM2INT(idx); \
  \
@@ -456,15 +386,13 @@ DEFINE_STYLE_COLOR(base);
 DEFINE_STYLE_COLOR(text_aa);
 
 static VALUE
-style_black(self)
-    VALUE self;
+style_black(VALUE self)
 {
     return BOXED2RVAL(&_SELF(self)->black, GDK_TYPE_COLOR);
 }
 
 static VALUE
-style_set_black(self, r, g, b)
-    VALUE self, r, g, b;
+style_set_black(VALUE self, VALUE r, VALUE g, VALUE b)
 {
    GdkColor* color =  &(_SELF(self)->black);
    color->red   = NUM2INT(r); 
@@ -475,15 +403,13 @@ style_set_black(self, r, g, b)
 }
 
 static VALUE
-style_white(self)
-    VALUE self;
+style_white(VALUE self)
 {
     return BOXED2RVAL(&_SELF(self)->white, GDK_TYPE_COLOR);
 }
 
 static VALUE
-style_set_white(self, r, g, b)
-    VALUE self, r, g, b;
+style_set_white(VALUE self, VALUE r, VALUE g, VALUE b)
 {
     GdkColor* color =  &(_SELF(self)->white);
     color->red   = NUM2INT(r); 
@@ -493,16 +419,14 @@ style_set_white(self, r, g, b)
 }
 
 static VALUE
-style_font_desc(self)
-    VALUE self;
+style_font_desc(VALUE self)
 {
     PangoFontDescription* desc = _SELF(self)->font_desc;
     return BOXED2RVAL(desc, PANGO_TYPE_FONT_DESCRIPTION);
 }
 
 static VALUE
-style_set_font_desc(self, font_desc)
-    VALUE self, font_desc;
+style_set_font_desc(VALUE self, VALUE font_desc)
 {
     GtkStyle *style = _SELF(self);
     if (style->font_desc)
@@ -512,30 +436,26 @@ style_set_font_desc(self, font_desc)
 }
 
 static VALUE
-style_xthickness(self)
-    VALUE self;
+style_xthickness(VALUE self)
 {
     return INT2NUM(_SELF(self)->xthickness);
 }
 
 static VALUE
-style_set_xthickness(self, xthickness)
-    VALUE self, xthickness;
+style_set_xthickness(VALUE self, VALUE xthickness)
 {
     _SELF(self)->xthickness = NUM2INT(xthickness);
     return self;
 }
 
 static VALUE
-style_ythickness(self)
-    VALUE self;
+style_ythickness(VALUE self)
 {
     return INT2NUM(_SELF(self)->ythickness);
 }
 
 static VALUE
-style_set_ythickness(self, ythickness)
-    VALUE self, ythickness;
+style_set_ythickness(VALUE self, VALUE ythickness)
 {
     _SELF(self)->ythickness = NUM2INT(ythickness);
     return self;
@@ -543,8 +463,7 @@ style_set_ythickness(self, ythickness)
 
 #define DEFINE_STYLE_GC(type) \
 static VALUE \
-style_set_ ## type(self, idx, gc) \
-    VALUE self, idx, gc; \
+style_set_ ## type(VALUE self, VALUE idx, VALUE gc) \
 { \
   int i = NUM2INT(idx); \
  \
@@ -553,8 +472,7 @@ style_set_ ## type(self, idx, gc) \
   return self;\
 } \
 static VALUE \
-style_ ## type(self, idx) \
-    VALUE self, idx; \
+style_ ## type(VALUE self, VALUE idx) \
 { \
   int i = NUM2INT(idx); \
  \
@@ -572,38 +490,33 @@ DEFINE_STYLE_GC(base_gc);
 DEFINE_STYLE_GC(text_aa_gc);
 
 static VALUE
-style_black_gc(self)
-    VALUE self;
+style_black_gc(VALUE self)
 {
     return GOBJ2RVAL(_SELF(self)->black_gc);
 }
 
 static VALUE
-style_set_black_gc(self, gc)
-    VALUE self, gc;
+style_set_black_gc(VALUE self, VALUE gc)
 {
     _SELF(self)->black_gc = GDK_GC(RVAL2GOBJ(gc));
     return self;
 }
 
 static VALUE
-style_white_gc(self)
-    VALUE self;
+style_white_gc(VALUE self)
 {
     return GOBJ2RVAL(_SELF(self)->white_gc);
 }
 
 static VALUE
-style_set_white_gc(self, gc)
-    VALUE self, gc;
+style_set_white_gc(VALUE self, VALUE gc)
 {
     _SELF(self)->white_gc = GDK_GC(RVAL2GOBJ(gc));
     return self;
 }
 
 static VALUE
-style_bg_pixmap(self, idx)
-    VALUE self, idx;
+style_bg_pixmap(VALUE self, VALUE idx)
 {
     int i = NUM2INT(idx);
 
@@ -613,8 +526,7 @@ style_bg_pixmap(self, idx)
 }
 
 static VALUE
-style_set_bg_pixmap(self, idx, bg_pixmap)
-    VALUE self, idx, bg_pixmap;
+style_set_bg_pixmap(VALUE self, VALUE idx, VALUE bg_pixmap)
 {
     int i = NUM2INT(idx);
     GdkPixmap* pixmap = RVAL2GOBJ(bg_pixmap);