gtk2 0.90.7 → 0.90.8

data/ext/gtk2/rbgdkimage.c

@@ -17,8 +17,7 @@
 #define _SELF(i) GDK_IMAGE(RVAL2GOBJ(i))
 
 static VALUE
-gdkimage_initialize(self, type, visual, w, h)
-    VALUE self, type, visual, w, h;
+gdkimage_initialize(VALUE self, VALUE type, VALUE visual, VALUE w, VALUE h)
 {
     GdkImage* image = gdk_image_new((GdkImageType)RVAL2GENUM(type, GDK_TYPE_IMAGE_TYPE),
                                     GDK_VISUAL(RVAL2GOBJ(visual)),
@@ -33,23 +32,20 @@ gdkimage_initialize(self, type, visual, w, h)
 }
 
 static VALUE
-gdkimage_get_colormap(self)
-    VALUE self;
+gdkimage_get_colormap(VALUE self)
 {
     return GOBJ2RVAL(gdk_image_get_colormap(_SELF(self)));
 }
 
 static VALUE
-gdkimage_set_colormap(self, colormap)
-    VALUE self;
+gdkimage_set_colormap(VALUE self, VALUE colormap)
 {
     gdk_image_set_colormap(_SELF(self), RVAL2GOBJ(colormap));
     return self;
 }
 
 static VALUE
-gdkimage_put_pixel(self, x, y, pix)
-    VALUE self, x, y, pix;
+gdkimage_put_pixel(VALUE self, VALUE x, VALUE y, VALUE pix)
 {
     gdk_image_put_pixel(_SELF(self),
                         NUM2INT(x), NUM2INT(y), NUM2INT(pix));
@@ -57,72 +53,62 @@ gdkimage_put_pixel(self, x, y, pix)
 }
 
 static VALUE
-gdkimage_get_pixel(self, x, y)
-    VALUE self, x, y;
+gdkimage_get_pixel(VALUE self, VALUE x, VALUE y)
 {
     return INT2NUM(gdk_image_get_pixel(_SELF(self),
                                        NUM2INT(x), NUM2INT(y)));
 }
 
 static VALUE
-gdkimage_image_type(self)
-    VALUE self;
+gdkimage_image_type(VALUE self)
 {
     return GENUM2RVAL((_SELF(self))->type, GDK_TYPE_IMAGE_TYPE);
 }
 
 static VALUE
-gdkimage_visual(self)
-    VALUE self;
+gdkimage_visual(VALUE self)
 {
     return GOBJ2RVAL((_SELF(self))->visual);
 }
 
 static VALUE
-gdkimage_byte_order(self)
-    VALUE self;
+gdkimage_byte_order(VALUE self)
 {
     return GENUM2RVAL((_SELF(self))->byte_order, GDK_TYPE_BYTE_ORDER);
 }
 
 static VALUE
-gdkimage_bits_per_pixel(self)
-    VALUE self;
+gdkimage_bits_per_pixel(VALUE self)
 {
     return INT2NUM((_SELF(self))->bits_per_pixel);
 }
 
 static VALUE
-gdkimage_width(self)
-    VALUE self;
+gdkimage_width(VALUE self)
 {
     return INT2NUM((_SELF(self))->width);
 }
 
 static VALUE
-gdkimage_height(self)
-    VALUE self;
+gdkimage_height(VALUE self)
 {
     return INT2NUM((_SELF(self))->height);
 }
 
 static VALUE
-gdkimage_depth(self)
-    VALUE self;
+gdkimage_depth(VALUE self)
 {
     return INT2NUM((_SELF(self))->depth);
 }
 
 static VALUE
-gdkimage_bpp(self)
-    VALUE self;
+gdkimage_bpp(VALUE self)
 {
     return INT2NUM((_SELF(self))->bpp);
 }
 
 static VALUE
-gdkimage_bpl(self)
-    VALUE self;
+gdkimage_bpl(VALUE self)
 {
     return INT2NUM((_SELF(self))->bpl);
 }

data/ext/gtk2/rbgdkinput.c

@@ -18,18 +18,14 @@
 #include "global.h"
 
 static void
-exec_input(data, source, condition)
-    gpointer data;
-    gint source;
-    GdkInputCondition condition;
+exec_input(gpointer data, gint source, GdkInputCondition condition)
 {
     rb_funcall((VALUE)data, id_call, 1, 
                GFLAGS2RVAL(condition, GDK_TYPE_INPUT_CONDITION));
 }
 
 static VALUE
-input_add(self, filedescriptor, gdk_input_condition)
-    VALUE self, filedescriptor, gdk_input_condition;
+input_add(VALUE self, VALUE filedescriptor, VALUE gdk_input_condition)
 {
     VALUE id;
     VALUE func;
@@ -45,8 +41,7 @@ input_add(self, filedescriptor, gdk_input_condition)
 }
 
 static VALUE
-input_remove(self, id)
-    VALUE self, id;
+input_remove(VALUE self, VALUE id)
 {
     gdk_input_remove(NUM2INT(id));
     G_REMOVE_RELATIVE(self, id_relative_callbacks, id);

data/ext/gtk2/rbgdkkeymap.c

@@ -13,22 +13,19 @@
 #define _SELF(s) GDK_KEYMAP(RVAL2GOBJ(s))
 
 static VALUE
-gdkkeymap_s_get_default(self)
-     VALUE self;
+gdkkeymap_s_get_default(VALUE self)
 {
   return GOBJ2RVAL(gdk_keymap_get_default());
 }
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-gdkkeymap_s_get_for_display(self, display)
-    VALUE self, display;
+gdkkeymap_s_get_for_display(VALUE self, VALUE display)
 {
   return GOBJ2RVAL(gdk_keymap_get_for_display(GDK_DISPLAY_OBJECT(RVAL2GOBJ(display))));
 }
 #endif
 static VALUE
-gdkkeymap_lookup_key(self, keycode, group, level)
-     VALUE self, keycode, group, level;
+gdkkeymap_lookup_key(VALUE self, VALUE keycode, VALUE group, VALUE level)
 {
   GdkKeymapKey key;
 
@@ -40,8 +37,7 @@ gdkkeymap_lookup_key(self, keycode, group, level)
 }
 
 static VALUE
-gdkkeymap_translate_keyboard_state(self, hardware_keycode, state, group)
-     VALUE self, hardware_keycode, state, group;
+gdkkeymap_translate_keyboard_state(VALUE self, VALUE hardware_keycode, VALUE state, VALUE group)
 {
   guint keyval;
   gint effective_group, level;
@@ -60,8 +56,7 @@ gdkkeymap_translate_keyboard_state(self, hardware_keycode, state, group)
 }
 
 static VALUE
-gdkkeymap_get_entries_for_keyval(self, keyval)
-     VALUE self, keyval;
+gdkkeymap_get_entries_for_keyval(VALUE self, VALUE keyval)
 {
   GdkKeymapKey* keys;
   gint n_keys;
@@ -86,8 +81,7 @@ gdkkeymap_get_entries_for_keyval(self, keyval)
 }
 
 static VALUE
-gdkkeymap_get_entries_for_keycode(self, hardware_keycode)
-     VALUE self, hardware_keycode;
+gdkkeymap_get_entries_for_keycode(VALUE self, VALUE hardware_keycode)
 {
   GdkKeymapKey* keys;
   guint* keyvals;
@@ -113,8 +107,7 @@ gdkkeymap_get_entries_for_keycode(self, hardware_keycode)
 }
 
 static VALUE
-gdkkeymap_get_direction(self)
-     VALUE self;
+gdkkeymap_get_direction(VALUE self)
 {
   return GENUM2RVAL(gdk_keymap_get_direction(_SELF(self)), PANGO_TYPE_DIRECTION);
 }

data/ext/gtk2/rbgdkkeyval.c

@@ -16,37 +16,32 @@
 #include <gdk/gdkkeysyms.h>
 
 static VALUE
-keyval_to_name(self, keyval)
-    VALUE self, keyval;
+keyval_to_name(VALUE self, VALUE keyval)
 {
     gchar* name = gdk_keyval_name(NUM2UINT(keyval));
     return name ? CSTR2RVAL(name) : Qnil;
 }
 
 static VALUE
-keyval_from_name(self, keyval_name)
-    VALUE self, keyval_name;
+keyval_from_name(VALUE self, VALUE keyval_name)
 {
     return UINT2NUM(gdk_keyval_from_name(RVAL2CSTR(keyval_name)));
 }
 
 static VALUE
-keyval_is_upper(self, keyval)
-    VALUE self, keyval;
+keyval_is_upper(VALUE self, VALUE keyval)
 {
     return CBOOL2RVAL(gdk_keyval_is_upper(NUM2UINT(keyval)));
 }
 
 static VALUE
-keyval_is_lower(self, keyval)
-    VALUE self, keyval;
+keyval_is_lower(VALUE self, VALUE keyval)
 {
     return CBOOL2RVAL(gdk_keyval_is_lower(NUM2UINT(keyval)));
 }
 
 static VALUE
-keyval_convert_case(self, symbol)
-    VALUE self, symbol;
+keyval_convert_case(VALUE self, VALUE symbol)
 {
     guint upper, lower;
     gdk_keyval_convert_case(NUM2UINT(symbol), &lower, &upper);
@@ -54,29 +49,25 @@ keyval_convert_case(self, symbol)
 }
 
 static VALUE
-keyval_to_upper(self, keyval)
-    VALUE self, keyval;
+keyval_to_upper(VALUE self, VALUE keyval)
 {
     return INT2NUM(gdk_keyval_to_upper(NUM2UINT(keyval)));
 }
 
 static VALUE
-keyval_to_lower(self, keyval)
-    VALUE self, keyval;
+keyval_to_lower(VALUE self, VALUE keyval)
 {
     return INT2NUM(gdk_keyval_to_lower(NUM2UINT(keyval)));
 }
 
 static VALUE
-keyval_to_unicode(self, keyval)
-    VALUE self, keyval;
+keyval_to_unicode(VALUE self, VALUE keyval)
 {
     return UINT2NUM(gdk_keyval_to_unicode(NUM2UINT(keyval)));
 }
 
 static VALUE
-unicode_to_keyval(self, wc)
-    VALUE self, wc;
+unicode_to_keyval(VALUE self, VALUE wc)
 {
     VALUE unicode;
     if (TYPE(wc) == T_STRING) {

data/ext/gtk2/rbgdkpango.c

@@ -13,10 +13,7 @@
 #include "rbpango.h"
 
 static VALUE
-gdkpango_s_context_get(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+gdkpango_s_context_get(int argc, VALUE *argv, VALUE self)
 {
     VALUE screen, ret;
     rb_scan_args(argc, argv, "01", &screen);
@@ -34,8 +31,7 @@ gdkpango_s_context_get(argc, argv, self)
 }
 
 static VALUE
-gdkpango_context_set_colormap(self, colormap)
-    VALUE self, colormap;
+gdkpango_context_set_colormap(VALUE self, VALUE colormap)
 {
     gdk_pango_context_set_colormap(PANGO_CONTEXT(RVAL2GOBJ(self)),
                                    GDK_COLORMAP(RVAL2GOBJ(self)));
@@ -43,38 +39,33 @@ gdkpango_context_set_colormap(self, colormap)
 }
 
 static VALUE
-gdkpango_attr_embossed_initialize(self, embossed)
-    VALUE self, embossed;
+gdkpango_attr_embossed_initialize(VALUE self, VALUE embossed)
 {
     DATA_PTR(self) = gdk_pango_attr_embossed_new(RVAL2CBOOL(embossed));
     return Qnil;
 }
 
 static VALUE
-gdkpango_attr_embossed_value(self)
-    VALUE self;
+gdkpango_attr_embossed_value(VALUE self)
 {
     return CBOOL2RVAL(((GdkPangoAttrEmbossed*)RVAL2ATTR(self))->embossed);
 }
 
 static VALUE
-gdkpango_attr_stipple_initialize(self, stipple)
-    VALUE self, stipple;
+gdkpango_attr_stipple_initialize(VALUE self, VALUE stipple)
 {
     DATA_PTR(self) = gdk_pango_attr_stipple_new(GDK_BITMAP(RVAL2GOBJ(stipple)));
     return Qnil;
 }
 
 static VALUE
-gdkpango_attr_stipple_value(self)
-    VALUE self;
+gdkpango_attr_stipple_value(VALUE self)
 {
     return GOBJ2RVAL(((GdkPangoAttrStipple*)RVAL2ATTR(self))->stipple);
 }
 
 static VALUE
-gdkpango_layout_get_clip_region(self, x_origin, y_origin, index_ranges)
-    VALUE self, x_origin, y_origin, index_ranges;
+gdkpango_layout_get_clip_region(VALUE self, VALUE x_origin, VALUE y_origin, VALUE index_ranges)
 {
     int i;
     gint len = RARRAY_LEN(index_ranges);
@@ -90,8 +81,7 @@ gdkpango_layout_get_clip_region(self, x_origin, y_origin, index_ranges)
 }
 
 static VALUE
-gdkpango_layout_line_get_clip_region(self, x_origin, y_origin, index_ranges)
-    VALUE self, x_origin, y_origin, index_ranges;
+gdkpango_layout_line_get_clip_region(VALUE self, VALUE x_origin, VALUE y_origin, VALUE index_ranges)
 {
     int i;
     gint len = RARRAY_LEN(index_ranges);

data/ext/gtk2/rbgdkpangorenderer.c

@@ -16,10 +16,7 @@
 #define _SELF(s) (GDK_PANGO_RENDERER(RVAL2GOBJ(s)))
 
 static VALUE
-prenderer_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+prenderer_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE screen;
     GdkScreen* gscreen;
@@ -38,10 +35,7 @@ prenderer_initialize(argc, argv, self)
 }
 
 static VALUE
-prenderer_s_get_default(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+prenderer_s_get_default(int argc, VALUE *argv, VALUE self)
 {
     VALUE screen;
     GdkScreen* gscreen;
@@ -57,16 +51,14 @@ prenderer_s_get_default(argc, argv, self)
 }
 
 static VALUE
-prenderer_s_default(self)
-    VALUE self;
+prenderer_s_default(VALUE self)
 {
     GdkScreen* gscreen = gdk_screen_get_default();
     return GOBJ2RVAL(gdk_pango_renderer_get_default(gscreen));
 }
 
 static VALUE
-prenderer_set_drawable(self, drawable)
-    VALUE self, drawable;
+prenderer_set_drawable(VALUE self, VALUE drawable)
 {
     gdk_pango_renderer_set_drawable(_SELF(self), 
                                     GDK_DRAWABLE(RVAL2GOBJ(drawable)));
@@ -74,8 +66,7 @@ prenderer_set_drawable(self, drawable)
 }
 
 static VALUE
-prenderer_set_gc(self, gc)
-    VALUE self, gc;
+prenderer_set_gc(VALUE self, VALUE gc)
 {
     gdk_pango_renderer_set_gc(_SELF(self), 
                               NIL_P(gc) ? NULL : GDK_GC(RVAL2GOBJ(gc)));
@@ -83,8 +74,7 @@ prenderer_set_gc(self, gc)
 }
 
 static VALUE
-prenderer_set_stipple(self, part, stipple)
-    VALUE self, part, stipple;
+prenderer_set_stipple(VALUE self, VALUE part, VALUE stipple)
 {
 #if HAVE_PANGO_RENDER_PART_GET_TYPE
     gdk_pango_renderer_set_stipple(_SELF(self), RVAL2GENUM(part, PANGO_TYPE_RENDER_PART),
@@ -96,8 +86,7 @@ prenderer_set_stipple(self, part, stipple)
 }
 
 static VALUE
-prenderer_set_override_color(self, part, color)
-    VALUE self, part, color;
+prenderer_set_override_color(VALUE self, VALUE part, VALUE color)
 {
 #if HAVE_PANGO_RENDER_PART_GET_TYPE
     gdk_pango_renderer_set_override_color(_SELF(self), 

data/ext/gtk2/rbgdkpixbuf.c

@@ -14,10 +14,7 @@
 #define _SELF(s) GDK_PIXBUF(RVAL2GOBJ(s)) 
 
 static VALUE
-pixbuf_render_threshold_alpha(self, bitmap, src_x, src_y, dest_x, dest_y,
-                              width, height, alpha_threshold)
-    VALUE self, bitmap, src_x, src_y, dest_x, dest_y,
-    width, height, alpha_threshold;
+pixbuf_render_threshold_alpha(VALUE self, VALUE bitmap, VALUE src_x, VALUE src_y, VALUE dest_x, VALUE dest_y, VALUE width, VALUE height, VALUE alpha_threshold)
 {
     gdk_pixbuf_render_threshold_alpha(_SELF(self), GDK_BITMAP(RVAL2GOBJ(bitmap)),
                                       NUM2INT(src_x), NUM2INT(src_y),
@@ -28,10 +25,7 @@ pixbuf_render_threshold_alpha(self, bitmap, src_x, src_y, dest_x, dest_y,
 }
 
 static VALUE
-pixbuf_render_to_drawable(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+pixbuf_render_to_drawable(int argc, VALUE *argv, VALUE self)
 {
     VALUE gc, src_x, src_y, dest_x, dest_y, width, height,
         dither, x_dither, y_dither;
@@ -71,10 +65,7 @@ pixbuf_render_to_drawable(argc, argv, self)
 }
 
 static VALUE
-pixbuf_render_pixmap_and_mask(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+pixbuf_render_pixmap_and_mask(int argc, VALUE *argv, VALUE self)
 {
     VALUE colormap_or_alpha, alpha;
     GdkPixmap *pixmap;
@@ -102,10 +93,7 @@ pixbuf_render_pixmap_and_mask(argc, argv, self)
 }
 
 static VALUE
-pixbuf_s_from_drawable(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+pixbuf_s_from_drawable(int argc, VALUE *argv, VALUE self)
 {
     VALUE cmap, src, src_x, src_y, width, height, dest, dest_x, dest_y;
     GdkPixbuf* buf;
@@ -132,10 +120,7 @@ pixbuf_s_from_drawable(argc, argv, self)
 }
  
 static VALUE
-pixbuf_s_from_image(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+pixbuf_s_from_image(int argc, VALUE *argv, VALUE self)
 {
     VALUE cmap, src, src_x, src_y, width, height, dest, dest_x, dest_y;
     GdkPixbuf* buf;