gtk2 0.90.7 → 0.90.8

data/ext/gtk2/rbgdkpixmap.c

@@ -18,8 +18,7 @@
 #endif /* HAVE_XREADBITMAPFILEDATA */
 
 static VALUE
-gdkpmap_initialize(self, win, w, h, depth)
-    VALUE self, win, w, h, depth;
+gdkpmap_initialize(VALUE self, VALUE win, VALUE w, VALUE h, VALUE depth)
 {
 	G_INITIALIZE(self, gdk_pixmap_new(GDK_WINDOW(RVAL2GOBJ(win)), 
                                           NUM2INT(w), NUM2INT(h), 
@@ -28,10 +27,7 @@ gdkpmap_initialize(self, win, w, h, depth)
 }
 
 static VALUE
-gdkpmap_create_from_data(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+gdkpmap_create_from_data(int argc, VALUE *argv, VALUE self)
 {
     VALUE win, data, w, h, depth, fg, bg, ret;
 
@@ -52,8 +48,7 @@ gdkpmap_create_from_data(argc, argv, self)
 }
 
 static VALUE
-gdkpmap_create_from_xpm(self, win, color, fname)
-    VALUE self, win, color, fname;
+gdkpmap_create_from_xpm(VALUE self, VALUE win, VALUE color, VALUE fname)
 {
     GdkPixmap *new;
     GdkBitmap *mask;
@@ -67,8 +62,7 @@ gdkpmap_create_from_xpm(self, win, color, fname)
 }
 
 static VALUE
-gdkpmap_create_from_xpm_d(self, win, tcolor, data)
-    VALUE self, win, tcolor, data;
+gdkpmap_create_from_xpm_d(VALUE self, VALUE win, VALUE tcolor, VALUE data)
 {
     GdkPixmap *new;
     GdkBitmap *mask;
@@ -87,8 +81,7 @@ gdkpmap_create_from_xpm_d(self, win, tcolor, data)
 }
 
 static VALUE
-gdkpmap_colormap_create_from_xpm(self, win, colormap, tcolor, fname)
-    VALUE self, win, colormap, tcolor, fname;
+gdkpmap_colormap_create_from_xpm(VALUE self, VALUE win, VALUE colormap, VALUE tcolor, VALUE fname)
 {
     GdkPixmap *new;
     GdkBitmap *mask;
@@ -104,8 +97,7 @@ gdkpmap_colormap_create_from_xpm(self, win, colormap, tcolor, fname)
 }
 
 static VALUE
-gdkpmap_colormap_create_from_xpm_d(self, win, colormap, tcolor, data)
-    VALUE self, win, colormap, tcolor, data;
+gdkpmap_colormap_create_from_xpm_d(VALUE self, VALUE win, VALUE colormap, VALUE tcolor, VALUE data)
 {
     GdkPixmap *new;
     GdkBitmap *mask;
@@ -128,8 +120,7 @@ gdkpmap_colormap_create_from_xpm_d(self, win, colormap, tcolor, data)
 
 #ifdef HAVE_XREADBITMAPFILEDATA
 static VALUE
-gdkpmap_create_from_xbm(self, win, fname)
-    VALUE self, win, fname;
+gdkpmap_create_from_xbm(VALUE self, VALUE win, VALUE fname)
 {
     GdkBitmap *new;
     unsigned char *data;
@@ -155,10 +146,7 @@ gdkpmap_create_from_xbm(self, win, fname)
  */
 
 static VALUE
-gdkpmap_foreign_new(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+gdkpmap_foreign_new(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg[5];
     GdkPixmap* win = NULL;
@@ -196,10 +184,7 @@ gdkpmap_foreign_new(argc, argv, self)
 }
 
 static VALUE
-gdkpmap_lookup(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+gdkpmap_lookup(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg[2];
     GdkPixmap* win = NULL;

data/ext/gtk2/rbgdkproperty.c

@@ -19,10 +19,7 @@
 #include "global.h"
 
 static VALUE
-gdkprop_text_property_to_text_list(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+gdkprop_text_property_to_text_list(int argc, VALUE *argv, VALUE self)
 {
     gint num, i;
     gchar** list;
@@ -69,10 +66,7 @@ gdkprop_text_property_to_text_list(argc, argv, self)
 }
 
 static VALUE
-gdkprop_text_property_to_utf8_list(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+gdkprop_text_property_to_utf8_list(int argc, VALUE *argv, VALUE self)
 {
     gint num, i;
     gchar** list;
@@ -121,10 +115,7 @@ gdkprop_text_property_to_utf8_list(argc, argv, self)
 }
 
 static VALUE
-gdkprop_string_to_compound_text(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+gdkprop_string_to_compound_text(int argc, VALUE *argv, VALUE self)
 {
     gint num;
     GdkAtom encoding;
@@ -169,17 +160,13 @@ gdkprop_string_to_compound_text(argc, argv, self)
 }
 
 static VALUE
-gdkprop_utf8_to_string_target(self, str)
-    VALUE self, str;
+gdkprop_utf8_to_string_target(VALUE self, VALUE str)
 {
     return CSTR2RVAL((const char*)gdk_utf8_to_string_target(RVAL2CSTR(str)));
 }
 
 static VALUE
-gdkprop_utf8_to_compound_text(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+gdkprop_utf8_to_compound_text(int argc, VALUE *argv, VALUE self)
 {
     GdkAtom encoding;
     gint format;
@@ -227,10 +214,7 @@ gdkprop_utf8_to_compound_text(argc, argv, self)
 
 
 static VALUE
-gdkprop_change(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+gdkprop_change(int argc, VALUE *argv, VALUE self)
 {
     int        fmt, len;
     void*      dat;
@@ -253,10 +237,7 @@ gdkprop_change(argc, argv, self)
 }
 
 static VALUE
-gdkprop_get(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+gdkprop_get(int argc, VALUE *argv, VALUE self)
 {
     /* for argument processing */
     GdkAtom     rtype;
@@ -314,8 +295,7 @@ gdkprop_get(argc, argv, self)
 }
 
 static VALUE
-gdkprop_delete(self, win, property)
-    VALUE self, win, property;
+gdkprop_delete(VALUE self, VALUE win, VALUE property)
 {
     gdk_property_delete(GDK_WINDOW(RVAL2GOBJ(win)), RVAL2ATOM(property));
     return self;

data/ext/gtk2/rbgdkrectangle.c

@@ -20,8 +20,7 @@
 #define _SELF(r) ((GdkRectangle*)RVAL2BOXED(r, GDK_TYPE_RECTANGLE))
 
 static VALUE
-gdkrect_initialize(self, x, y, width, height)
-    VALUE self, x, y, width, height;
+gdkrect_initialize(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
 {
     GdkRectangle new;
 
@@ -35,8 +34,7 @@ gdkrect_initialize(self, x, y, width, height)
 }
 
 static VALUE
-gdkrect_intersect(self, other)
-    VALUE self, other;
+gdkrect_intersect(VALUE self, VALUE other)
 {
     GdkRectangle dest;
     gboolean ret = gdk_rectangle_intersect(_SELF(self), _SELF(other), &dest);
@@ -44,8 +42,7 @@ gdkrect_intersect(self, other)
 }
 
 static VALUE
-gdkrect_union(self, other)
-    VALUE self, other;
+gdkrect_union(VALUE self, VALUE other)
 {
     GdkRectangle dest;
     gdk_rectangle_union(_SELF(self), _SELF(other), &dest);
@@ -54,68 +51,59 @@ gdkrect_union(self, other)
 
 /* Struct accessors */
 static VALUE
-gdkrect_x(self)
-    VALUE self;
+gdkrect_x(VALUE self)
 {
     return INT2NUM(_SELF(self)->x);
 }
 
 static VALUE
-gdkrect_y(self)
-    VALUE self;
+gdkrect_y(VALUE self)
 {
     return INT2NUM(_SELF(self)->y);
 }
 
 static VALUE
-gdkrect_w(self)
-    VALUE self;
+gdkrect_w(VALUE self)
 {
     return INT2NUM(_SELF(self)->width);
 }
 
 static VALUE
-gdkrect_h(self)
-    VALUE self;
+gdkrect_h(VALUE self)
 {
     return INT2NUM(_SELF(self)->height);
 }
 
 static VALUE
-gdkrect_set_x(self, x)
-    VALUE self, x;
+gdkrect_set_x(VALUE self, VALUE x)
 {
     _SELF(self)->x = NUM2INT(x);
     return self;
 }
 
 static VALUE
-gdkrect_set_y(self, y)
-    VALUE self, y;
+gdkrect_set_y(VALUE self, VALUE y)
 {
     _SELF(self)->y = NUM2INT(y);
     return self;
 }
 
 static VALUE
-gdkrect_set_w(self, width)
-    VALUE self, width;
+gdkrect_set_w(VALUE self, VALUE width)
 {
     _SELF(self)->width = NUM2INT(width);
     return self;
 }
 
 static VALUE
-gdkrect_set_h(self, height)
-    VALUE self, height;
+gdkrect_set_h(VALUE self, VALUE height)
 {
     _SELF(self)->height = NUM2INT(height);
     return self;
 }
 
 static VALUE
-gdkrect_to_a(self)
-    VALUE self;
+gdkrect_to_a(VALUE self)
 {
   GdkRectangle* a = _SELF(self);
   return rb_ary_new3(4, INT2FIX(a->x), INT2FIX(a->y),

data/ext/gtk2/rbgdkregion.c

@@ -29,10 +29,7 @@ gdk_region_get_type(void)
 }
 /**********************************/
 static VALUE
-gdkregion_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+gdkregion_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE points_or_rectangle, fill_rule;
     GdkRegion* region;
@@ -69,8 +66,7 @@ gdkregion_initialize(argc, argv, self)
 }
 
 static VALUE
-gdkregion_get_rectangles(self)
-    VALUE self;
+gdkregion_get_rectangles(VALUE self)
 {
     GdkRectangle* rectangles;
     gint n_rect, i;
@@ -86,17 +82,14 @@ gdkregion_get_rectangles(self)
 }
 
 static void
-gdkregion_span_func(span, func)
-    GdkSpan* span;
-    gpointer func;
+gdkregion_span_func(GdkSpan *span, gpointer func)
 {
     rb_funcall((VALUE)func, id_call, 3, 
                INT2NUM(span->x), INT2NUM(span->y), INT2NUM(span->width));
 }
 
 static VALUE
-gdkregion_spans_intersect_foreach(self, spans, sorted)
-    VALUE self, spans, sorted;
+gdkregion_spans_intersect_foreach(VALUE self, VALUE spans, VALUE sorted)
 {
     int i;
     GdkSpan* gspans = ALLOCA_N(GdkSpan, RARRAY_LEN(spans));
@@ -115,8 +108,7 @@ gdkregion_spans_intersect_foreach(self, spans, sorted)
 }
 
 static VALUE
-gdkregion_get_clipbox(self)
-    VALUE self;
+gdkregion_get_clipbox(VALUE self)
 {
     GdkRectangle rect;
     gdk_region_get_clipbox(_SELF(self), &rect);
@@ -124,15 +116,13 @@ gdkregion_get_clipbox(self)
 }
 
 static VALUE
-gdkregion_empty(self)
-    VALUE self;
+gdkregion_empty(VALUE self)
 {
     return CBOOL2RVAL(gdk_region_empty(_SELF(self)));
 }
 
 static VALUE
-gdkregion_equal(self, obj)
-    VALUE self, obj;
+gdkregion_equal(VALUE self, VALUE obj)
 {
     if (!rb_obj_is_instance_of(obj, GTYPE2CLASS(GDK_TYPE_REGION))) {
         return Qnil;
@@ -141,16 +131,14 @@ gdkregion_equal(self, obj)
 }
 
 static VALUE
-gdkregion_point_in(self, x, y)
-    VALUE self, x, y;
+gdkregion_point_in(VALUE self, VALUE x, VALUE y)
 {
     return CBOOL2RVAL(gdk_region_point_in(_SELF(self), NUM2INT(x),
                                           NUM2INT(y)));
 }
 
 static VALUE
-gdkregion_rect_in(self, rect)
-    VALUE self, rect;
+gdkregion_rect_in(VALUE self, VALUE rect)
 {
     return GENUM2RVAL(gdk_region_rect_in(
                           _SELF(self),
@@ -159,32 +147,28 @@ gdkregion_rect_in(self, rect)
 }
 
 static VALUE
-gdkregion_offset(self, dx, dy)
-    VALUE self, dx, dy;
+gdkregion_offset(VALUE self, VALUE dx, VALUE dy)
 {
     gdk_region_offset(_SELF(self), NUM2INT(dx), NUM2INT(dy));
     return self;
 }
 
 static VALUE
-gdkregion_shrink(self, dx, dy)
-    VALUE self, dx, dy;
+gdkregion_shrink(VALUE self, VALUE dx, VALUE dy)
 {
     gdk_region_shrink(_SELF(self), NUM2INT(dx), NUM2INT(dy));
     return self;
 }
 
 static VALUE
-gdkregion_intersect(self, region)
-    VALUE self, region;
+gdkregion_intersect(VALUE self, VALUE region)
 {
     gdk_region_intersect(_SELF(self), _SELF(region));
     return self;
 }
 
 static VALUE
-gdkregion_union(self, other)
-    VALUE self, other;
+gdkregion_union(VALUE self, VALUE other)
 {
     if (RVAL2GTYPE(other) == GDK_TYPE_RECTANGLE){
         gdk_region_union_with_rect(_SELF(self),
@@ -196,16 +180,14 @@ gdkregion_union(self, other)
 }
 
 static VALUE
-gdkregion_subtract(self, region)
-    VALUE self, region;
+gdkregion_subtract(VALUE self, VALUE region)
 {
     gdk_region_subtract(_SELF(self), _SELF(region));
     return self;
 }
 
 static VALUE
-gdkregion_xor(self, region)
-    VALUE self, region;
+gdkregion_xor(VALUE self, VALUE region)
 {
     gdk_region_xor(_SELF(self), _SELF(region));
     return self;

data/ext/gtk2/rbgdkrgb.c

@@ -18,10 +18,7 @@
 
 
 static VALUE
-rgb_draw_rgb_image(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+rgb_draw_rgb_image(int argc, VALUE *argv, VALUE self)
 {
     VALUE win, gc, x, y, w, h, dither, buf, rowstride, xdith, ydith;
 
@@ -49,8 +46,7 @@ rgb_draw_rgb_image(argc, argv, self)
 }
 
 static VALUE
-rgb_draw_indexed_image(self, win, gc, x, y, w, h, dither, buf, rowstride, colors)
-    VALUE self, win, gc, x, y, w, h, dither, buf, rowstride, colors;
+rgb_draw_indexed_image(VALUE self, VALUE win, VALUE gc, VALUE x, VALUE y, VALUE w, VALUE h, VALUE dither, VALUE buf, VALUE rowstride, VALUE colors)
 {
     GdkRgbCmap* cmap;
     guint32* gcolors;
@@ -79,8 +75,7 @@ rgb_draw_indexed_image(self, win, gc, x, y, w, h, dither, buf, rowstride, colors
 }
 
 static VALUE
-rgb_draw_gray_image(self, win, gc, x, y, w, h, dither, buf, rowstride)
-    VALUE self, win, gc, x, y, w, h, dither, buf, rowstride;
+rgb_draw_gray_image(VALUE self, VALUE win, VALUE gc, VALUE x, VALUE y, VALUE w, VALUE h, VALUE dither, VALUE buf, VALUE rowstride)
 {
     gdk_draw_gray_image(RVAL2DRAW(win), GDK_GC(RVAL2GOBJ(gc)),
                         NUM2INT(x), NUM2INT(y),
@@ -92,10 +87,7 @@ rgb_draw_gray_image(self, win, gc, x, y, w, h, dither, buf, rowstride)
 }
 
 static VALUE
-rgb_draw_rgb_32_image(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+rgb_draw_rgb_32_image(int argc, VALUE *argv, VALUE self)
 {
     VALUE win, gc, x, y, w, h, dither, buf, rowstride, xdith, ydith;
 
@@ -121,8 +113,7 @@ rgb_draw_rgb_32_image(argc, argv, self)
 }
 
 static VALUE
-rgb_find_color(self, colormap, color)
-    VALUE self, colormap, color;
+rgb_find_color(VALUE self, VALUE colormap, VALUE color)
 {
     gdk_rgb_find_color(GDK_COLORMAP(RVAL2GOBJ(colormap)),
                        RVAL2GDKCOLOR(color));
@@ -130,45 +121,39 @@ rgb_find_color(self, colormap, color)
 }
 
 static VALUE
-rgb_set_install(self, install)
-    VALUE self, install;
+rgb_set_install(VALUE self, VALUE install)
 {
     gdk_rgb_set_install(RVAL2CBOOL(install));
     return self;
 }
 
 static VALUE
-rgb_set_min_colors(self, min_colors)
-    VALUE self, min_colors;
+rgb_set_min_colors(VALUE self, VALUE min_colors)
 {
     gdk_rgb_set_min_colors(NUM2INT(min_colors));
     return self;
 }
 
 static VALUE
-rgb_get_visual(self)
-    VALUE self;
+rgb_get_visual(VALUE self)
 {
     return GOBJ2RVAL(gdk_rgb_get_visual());
 }
 
 static VALUE
-rgb_get_cmap(self)
-    VALUE self;
+rgb_get_cmap(VALUE self)
 {
     return GOBJ2RVAL(gdk_rgb_get_colormap());
 }
 
 static VALUE
-rgb_ditherable(self)
-    VALUE self;
+rgb_ditherable(VALUE self)
 {
     return CBOOL2RVAL(gdk_rgb_ditherable());
 }
 
 static VALUE
-rgb_set_verbose(self, verbose)
-    VALUE self, verbose;
+rgb_set_verbose(VALUE self, VALUE verbose)
 {
     gdk_rgb_set_verbose(RVAL2CBOOL(verbose));
     return self;