gtk2 0.90.7 → 0.90.8

data/ext/gtk2/rbgtkadjustment.c

@@ -20,8 +20,7 @@
 #define _SELF(self) (GTK_ADJUSTMENT(RVAL2GOBJ(self)))
 
 static VALUE
-adj_initialize(self, value, lower, upper, step_inc, page_inc, page_size)
-    VALUE self, value, lower, upper, step_inc, page_inc, page_size;
+adj_initialize(VALUE self, VALUE value, VALUE lower, VALUE upper, VALUE step_inc, VALUE page_inc, VALUE page_size)
 {
     RBGTK_INITIALIZE(self, gtk_adjustment_new(NUM2DBL(value),
                                               NUM2DBL(lower),
@@ -33,32 +32,28 @@ adj_initialize(self, value, lower, upper, step_inc, page_inc, page_size)
 }
 
 static VALUE
-adj_clamp_page(self, lower, upper)
-    VALUE self, lower, upper;
+adj_clamp_page(VALUE self, VALUE lower, VALUE upper)
 {
     gtk_adjustment_clamp_page(_SELF(self), NUM2DBL(lower), NUM2DBL(upper));
     return self;
 }
 
 static VALUE
-adj_changed(self)
-    VALUE self;
+adj_changed(VALUE self)
 {
     gtk_adjustment_changed(_SELF(self));
     return self;
 }
 
 static VALUE
-adj_value_changed(self)
-    VALUE self;
+adj_value_changed(VALUE self)
 {
     gtk_adjustment_value_changed(_SELF(self));
     return self;
 }
 
 static VALUE
-adj_set_value(self, value)
-    VALUE self, value;
+adj_set_value(VALUE self, VALUE value)
 {
     gtk_adjustment_set_value(_SELF(self),
 			     NUM2DBL(value));
@@ -66,65 +61,56 @@ adj_set_value(self, value)
 }
 
 static VALUE
-adj_get_value(self)
-    VALUE self;
+adj_get_value(VALUE self)
 {
     return rb_float_new(_SELF(self)->value);
 }
 
 static VALUE
-adj_get_lower(self)
-    VALUE self;
+adj_get_lower(VALUE self)
 {
     return rb_float_new(_SELF(self)->lower);
 }
 
 static VALUE
-adj_get_upper(self)
-    VALUE self;
+adj_get_upper(VALUE self)
 {
     return rb_float_new(_SELF(self)->upper);
 }
 
 static VALUE
-adj_get_step_increment(self)
-    VALUE self;
+adj_get_step_increment(VALUE self)
 {
     return rb_float_new(_SELF(self)->step_increment);
 }
 
 static VALUE
-adj_set_step_increment(self, inc)
-    VALUE self, inc;
+adj_set_step_increment(VALUE self, VALUE inc)
 {
     _SELF(self)->step_increment = NUM2DBL(inc);
     return self;
 }
 
 static VALUE
-adj_get_page_increment(self)
-    VALUE self;
+adj_get_page_increment(VALUE self)
 {
     return rb_float_new(_SELF(self)->page_increment);
 }
 
 static VALUE
-adj_set_page_increment(self, inc)
-    VALUE self, inc;
+adj_set_page_increment(VALUE self, VALUE inc)
 {
     return _SELF(self)->page_increment = NUM2DBL(inc);
 }
 
 static VALUE
-adj_get_page_size(self)
-    VALUE self;
+adj_get_page_size(VALUE self)
 {
     return rb_float_new(_SELF(self)->page_size);
 }
 
 static VALUE
-adj_set_page_size(self, size)
-    VALUE self, size;
+adj_set_page_size(VALUE self, VALUE size)
 {
     return _SELF(self)->page_size = NUM2DBL(size);
 }

data/ext/gtk2/rbgtkalignment.c

@@ -15,8 +15,7 @@
 #include "global.h"
 
 static VALUE
-align_initialize(self, xalign, yalign, xscale, yscale)
-    VALUE self, xalign, yalign, xscale, yscale;
+align_initialize(VALUE self, VALUE xalign, VALUE yalign, VALUE xscale, VALUE yscale)
 {
     RBGTK_INITIALIZE(self, gtk_alignment_new(NUM2DBL(xalign),
                                              NUM2DBL(yalign),
@@ -26,8 +25,7 @@ align_initialize(self, xalign, yalign, xscale, yscale)
 }
 
 static VALUE
-align_set(self, xalign, yalign, xscale, yscale)
-    VALUE self, xalign, yalign, xscale, yscale;
+align_set(VALUE self, VALUE xalign, VALUE yalign, VALUE xscale, VALUE yscale)
 {
     gtk_alignment_set(GTK_ALIGNMENT(RVAL2GOBJ(self)),
 		      NUM2DBL(xalign), NUM2DBL(yalign),
@@ -36,8 +34,7 @@ align_set(self, xalign, yalign, xscale, yscale)
 }
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-align_get_padding(self)
-    VALUE self;
+align_get_padding(VALUE self)
 {
     guint top, bottom, left, right;
     gtk_alignment_get_padding(GTK_ALIGNMENT(RVAL2GOBJ(self)),
@@ -46,8 +43,7 @@ align_get_padding(self)
                        UINT2NUM(left), UINT2NUM(right));
 }
 static VALUE
-align_set_padding(self, top, bottom, left, right)
-    VALUE self;
+align_set_padding(VALUE self, VALUE top, VALUE bottom, VALUE left, VALUE right)
 {
     gtk_alignment_set_padding(GTK_ALIGNMENT(RVAL2GOBJ(self)),
                               NUM2UINT(top), NUM2UINT(bottom),

data/ext/gtk2/rbgtkallocation.c

@@ -34,8 +34,7 @@ gtk_allocation_get_type(void)
 #define _SELF(r) ((GtkAllocation*)RVAL2BOXED(r, GTK_TYPE_ALLOCATION))
 
 static VALUE
-alloc_initialize(self, x, y, width, height)
-    VALUE self, x, y, width, height;
+alloc_initialize(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
 {
     GtkAllocation new;
 
@@ -49,8 +48,7 @@ alloc_initialize(self, x, y, width, height)
 }
 
 static VALUE
-alloc_intersect(self, other)
-    VALUE self, other;
+alloc_intersect(VALUE self, VALUE other)
 {
     GtkAllocation dest;
     gboolean ret = gdk_rectangle_intersect(_SELF(self), _SELF(other), &dest);
@@ -58,8 +56,7 @@ alloc_intersect(self, other)
 }
 
 static VALUE
-alloc_union(self, other)
-    VALUE self, other;
+alloc_union(VALUE self, VALUE other)
 {
     GtkAllocation dest;
     gdk_rectangle_union(_SELF(self), _SELF(other), &dest);
@@ -68,68 +65,59 @@ alloc_union(self, other)
 
 /* Struct accessors */
 static VALUE
-alloc_x(self)
-    VALUE self;
+alloc_x(VALUE self)
 {
     return INT2NUM(_SELF(self)->x);
 }
 
 static VALUE
-alloc_y(self)
-    VALUE self;
+alloc_y(VALUE self)
 {
     return INT2NUM(_SELF(self)->y);
 }
 
 static VALUE
-alloc_w(self)
-    VALUE self;
+alloc_w(VALUE self)
 {
     return INT2NUM(_SELF(self)->width);
 }
 
 static VALUE
-alloc_h(self)
-    VALUE self;
+alloc_h(VALUE self)
 {
     return INT2NUM(_SELF(self)->height);
 }
 
 static VALUE
-alloc_set_x(self, x)
-    VALUE self, x;
+alloc_set_x(VALUE self, VALUE x)
 {
     _SELF(self)->x = NUM2INT(x);
     return self;
 }
 
 static VALUE
-alloc_set_y(self, y)
-    VALUE self, y;
+alloc_set_y(VALUE self, VALUE y)
 {
     _SELF(self)->y = NUM2INT(y);
     return self;
 }
 
 static VALUE
-alloc_set_w(self, width)
-    VALUE self, width;
+alloc_set_w(VALUE self, VALUE width)
 {
     _SELF(self)->width = NUM2INT(width);
     return self;
 }
 
 static VALUE
-alloc_set_h(self, height)
-    VALUE self, height;
+alloc_set_h(VALUE self, VALUE height)
 {
     _SELF(self)->height = NUM2INT(height);
     return self;
 }
 
 static VALUE
-alloc_to_a(self)
-    VALUE self;
+alloc_to_a(VALUE self)
 {
   GtkAllocation* a = _SELF(self);
   return rb_ary_new3(4, INT2FIX(a->x), INT2FIX(a->y),
@@ -137,8 +125,7 @@ alloc_to_a(self)
 }
 
 static VALUE
-alloc_to_rect(self)
-    VALUE self;
+alloc_to_rect(VALUE self)
 {
     return BOXED2RVAL(_SELF(self), GDK_TYPE_RECTANGLE);
 }

data/ext/gtk2/rbgtkarrow.c

@@ -15,8 +15,7 @@
 #include "global.h"
 
 static VALUE
-arrow_initialize(self, arrow_t, shadow_t)
-    VALUE self, arrow_t, shadow_t;
+arrow_initialize(VALUE self, VALUE arrow_t, VALUE shadow_t)
 {
     RBGTK_INITIALIZE(self, gtk_arrow_new(RVAL2GENUM(arrow_t, GTK_TYPE_ARROW_TYPE),
                                          RVAL2GENUM(shadow_t, GTK_TYPE_SHADOW_TYPE)));
@@ -24,8 +23,7 @@ arrow_initialize(self, arrow_t, shadow_t)
 }
 
 static VALUE
-arrow_set(self, arrow_t, shadow_t)
-    VALUE self, arrow_t, shadow_t;
+arrow_set(VALUE self, VALUE arrow_t, VALUE shadow_t)
 {
     gtk_arrow_set(GTK_ARROW(RVAL2GOBJ(self)),
 		  RVAL2GENUM(arrow_t, GTK_TYPE_ARROW_TYPE),

data/ext/gtk2/rbgtkaspectframe.c

@@ -15,8 +15,7 @@
 #include "global.h"
 
 static VALUE
-aframe_initialize(self, label, xalign, yalign, ratio, obey_child)
-    VALUE self, label, xalign, yalign, ratio, obey_child;
+aframe_initialize(VALUE self, VALUE label, VALUE xalign, VALUE yalign, VALUE ratio, VALUE obey_child)
 {
     RBGTK_INITIALIZE(self, gtk_aspect_frame_new(NIL_P(label)?NULL:RVAL2CSTR(label),
                                                 NUM2DBL(xalign),
@@ -27,8 +26,7 @@ aframe_initialize(self, label, xalign, yalign, ratio, obey_child)
 }
 
 static VALUE
-aframe_set(self, xalign, yalign, ratio, obey_child)
-    VALUE self, xalign, yalign, ratio, obey_child;
+aframe_set(VALUE self, VALUE xalign, VALUE yalign, VALUE ratio, VALUE obey_child)
 {
     gtk_aspect_frame_set(GTK_ASPECT_FRAME(RVAL2GOBJ(self)),
 			 NUM2DBL(xalign), NUM2DBL(yalign),

data/ext/gtk2/rbgtkassistant.c

@@ -16,74 +16,63 @@
 #define _SELF(s) (GTK_ASSISTANT(RVAL2GOBJ(s)))
 
 static VALUE
-ass_initialize(self)
-    VALUE self;
+ass_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_assistant_new());
     return Qnil;
 }
 
 static VALUE
-ass_get_current_page(self)
-    VALUE self;
+ass_get_current_page(VALUE self)
 {
     return INT2NUM(gtk_assistant_get_current_page(_SELF(self)));
 }
 
 static VALUE
-ass_set_current_page(self, page_num)
-    VALUE self, page_num;
+ass_set_current_page(VALUE self, VALUE page_num)
 {
     gtk_assistant_set_current_page(_SELF(self), NUM2INT(page_num));
     return self;
 }
 
 static VALUE
-ass_get_n_pages(self)
-    VALUE self;
+ass_get_n_pages(VALUE self)
 {
     return INT2NUM(gtk_assistant_get_n_pages(_SELF(self)));
 }
 
 static VALUE
-ass_get_nth_page(self, page_num)
-    VALUE self, page_num;
+ass_get_nth_page(VALUE self, VALUE page_num)
 {
     return GOBJ2RVAL(gtk_assistant_get_nth_page(_SELF(self), NUM2INT(page_num)));
 }
 
 static VALUE
-ass_prepend_page(self, page)
-    VALUE self, page;
+ass_prepend_page(VALUE self, VALUE page)
 {
     return INT2NUM(gtk_assistant_prepend_page(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page))));
 }
 
 static VALUE
-ass_append_page(self, page)
-    VALUE self, page;
+ass_append_page(VALUE self, VALUE page)
 {
     return INT2NUM(gtk_assistant_append_page(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page))));
 }
 
 static VALUE
-ass_insert_page(self, page, position)
-    VALUE self, page, position;
+ass_insert_page(VALUE self, VALUE page, VALUE position)
 {
     return INT2NUM(gtk_assistant_insert_page(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page)), NUM2INT(position)));
 }
 
 static gint
-ass_page_func(current_page, func)
-    gint current_page;
-    gpointer func;
+ass_page_func(gint current_page, gpointer func)
 {
     return NUM2INT(rb_funcall((VALUE)func, id_call, 1, INT2NUM(current_page)));
 }
 
 static VALUE
-ass_set_forward_page_func(self)
-    VALUE self;
+ass_set_forward_page_func(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -92,99 +81,86 @@ ass_set_forward_page_func(self)
 }
 
 static VALUE
-ass_set_page_type(self, page, type)
-    VALUE self, page, type;
+ass_set_page_type(VALUE self, VALUE page, VALUE type)
 {
     gtk_assistant_set_page_type(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page)), RVAL2GENUM(type, GTK_TYPE_ASSISTANT_PAGE_TYPE));
     return self;
 }
 
 static VALUE
-ass_get_page_type(self, page)
-    VALUE self, page;
+ass_get_page_type(VALUE self, VALUE page)
 {
     return GENUM2RVAL(gtk_assistant_get_page_type(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page))), GTK_TYPE_ASSISTANT_PAGE_TYPE);
 }
 
 static VALUE
-ass_set_page_title(self, page, title)
-    VALUE self, page, title;
+ass_set_page_title(VALUE self, VALUE page, VALUE title)
 {
     gtk_assistant_set_page_title(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page)), RVAL2CSTR(title));
     return self;
 }
 
 static VALUE
-ass_get_page_title(self, page)
-    VALUE self, page;
+ass_get_page_title(VALUE self, VALUE page)
 {
     return CSTR2RVAL(gtk_assistant_get_page_title(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page))));
 }
 
 static VALUE
-ass_set_page_header_image(self, page, header_image)
-    VALUE self, page, header_image;
+ass_set_page_header_image(VALUE self, VALUE page, VALUE header_image)
 {
     gtk_assistant_set_page_header_image(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page)), GDK_PIXBUF(RVAL2GOBJ(header_image)));
     return self;
 }
 
 static VALUE
-ass_get_page_header_image(self, page)
-    VALUE self, page;
+ass_get_page_header_image(VALUE self, VALUE page)
 {
     return GOBJ2RVAL(gtk_assistant_get_page_header_image(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page))));
 }
 
 static VALUE
-ass_set_page_side_image(self, page, side_image)
-    VALUE self, page, side_image;
+ass_set_page_side_image(VALUE self, VALUE page, VALUE side_image)
 {
     gtk_assistant_set_page_side_image(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page)), GDK_PIXBUF(RVAL2GOBJ(side_image)));
     return self;
 }
 
 static VALUE
-ass_get_page_side_image(self, page)
-    VALUE self, page;
+ass_get_page_side_image(VALUE self, VALUE page)
 {
     return GOBJ2RVAL(gtk_assistant_get_page_side_image(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page))));
 }
 
 static VALUE
-ass_set_page_complete(self, page, complete)
-    VALUE self, page, complete;
+ass_set_page_complete(VALUE self, VALUE page, VALUE complete)
 {
     gtk_assistant_set_page_complete(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page)), RVAL2CBOOL(complete));
     return self;
 }
 
 static VALUE
-ass_get_page_complete(self, page)
-    VALUE self, page;
+ass_get_page_complete(VALUE self, VALUE page)
 {
     return CBOOL2RVAL(gtk_assistant_get_page_complete(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page))));
 }
 
 static VALUE
-ass_add_action_widget(self, child)
-    VALUE self, child;
+ass_add_action_widget(VALUE self, VALUE child)
 {
     gtk_assistant_add_action_widget(_SELF(self), GTK_WIDGET(RVAL2GOBJ(child)));
     return self;
 }
 
 static VALUE
-ass_remove_action_widget(self, child)
-    VALUE self, child;
+ass_remove_action_widget(VALUE self, VALUE child)
 {
     gtk_assistant_remove_action_widget(_SELF(self), GTK_WIDGET(RVAL2GOBJ(child)));
     return self;
 }
 
 static VALUE
-ass_update_buttons_state(self)
-    VALUE self;
+ass_update_buttons_state(VALUE self)
 {
     gtk_assistant_update_buttons_state(_SELF(self));
     return self;