gtk2 0.90.7 → 0.90.8

data/ext/gtk2/rbgtkbbox.c

@@ -15,8 +15,7 @@
 #include "global.h"
 
 static VALUE
-bbox_set_child_secondary(self, child, is_secondary)
-    VALUE self, child, is_secondary;
+bbox_set_child_secondary(VALUE self, VALUE child, VALUE is_secondary)
 {
     gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(RVAL2GOBJ(self)), 
                                        GTK_WIDGET(RVAL2GOBJ(child)),
@@ -25,8 +24,7 @@ bbox_set_child_secondary(self, child, is_secondary)
 }
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-bbox_get_child_secondary(self, child)
-    VALUE self, child;
+bbox_get_child_secondary(VALUE self, VALUE child)
 {
     return CBOOL2RVAL(gtk_button_box_get_child_secondary(GTK_BUTTON_BOX(RVAL2GOBJ(self)), 
                                                          GTK_WIDGET(RVAL2GOBJ(child))));

data/ext/gtk2/rbgtkbin.c

@@ -15,8 +15,7 @@
 #include "global.h"
 
 static VALUE
-bin_child(self)
-    VALUE self;
+bin_child(VALUE self)
 {
     GtkWidget *child = gtk_bin_get_child(RVAL2GOBJ(self));
     return child ? GOBJ2RVAL(child) : Qnil;

data/ext/gtk2/rbgtkbindingset.c

@@ -51,24 +51,21 @@ gtk_bindingset_get_type(void)
 #define _SELF(s) (GtkBindingSet*)(RVAL2BOXED(s, GTK_TYPE_BINDING_SET))
 
 static VALUE
-binding_initialize(self, set_name)
-    VALUE self, set_name;
+binding_initialize(VALUE self, VALUE set_name)
 {
     G_INITIALIZE(self, gtk_binding_set_new(RVAL2CSTR(set_name)));
     return Qnil;
 }
 
 static VALUE
-binding_s_find(self, set_name)
-    VALUE self, set_name;
+binding_s_find(VALUE self, VALUE set_name)
 {
     return BOXED2RVAL(gtk_binding_set_find(RVAL2CSTR(set_name)), 
                       GTK_TYPE_BINDING_SET);
 }
 
 static VALUE
-binding_activate(self, keyval, modifiers, object)
-    VALUE self, keyval, modifiers, object;
+binding_activate(VALUE self, VALUE keyval, VALUE modifiers, VALUE object)
 {
     return CBOOL2RVAL(gtk_binding_set_activate(_SELF(self), NUM2UINT(keyval),
                                                RVAL2MOD(modifiers),
@@ -76,8 +73,7 @@ binding_activate(self, keyval, modifiers, object)
 }
 
 static VALUE
-binding_entry_clear(self, keyval, modifiers)
-    VALUE self, keyval, modifiers;
+binding_entry_clear(VALUE self, VALUE keyval, VALUE modifiers)
 {
     gtk_binding_entry_clear(_SELF(self), NUM2UINT(keyval),
                             RVAL2MOD(modifiers));
@@ -85,10 +81,7 @@ binding_entry_clear(self, keyval, modifiers)
 }
 
 static VALUE
-binding_entry_add_signal(argc, argv, self)
-     int argc; 
-     VALUE* argv;
-     VALUE self;
+binding_entry_add_signal(int argc, VALUE *argv, VALUE self)
 {
     VALUE keyval, modifiers, signame, rest;
     long i;
@@ -143,8 +136,7 @@ binding_entry_add_signal(argc, argv, self)
 }
 
 static VALUE
-binding_add_path(self, path_type, path_pattern, priority)
-    VALUE self, path_type, path_pattern, priority;
+binding_add_path(VALUE self, VALUE path_type, VALUE path_pattern, VALUE priority)
 {
     gtk_binding_set_add_path(_SELF(self), RVAL2GENUM(path_type, GTK_TYPE_PATH_TYPE),
                              RVAL2CSTR(path_pattern),
@@ -153,8 +145,7 @@ binding_add_path(self, path_type, path_pattern, priority)
 }
 
 static VALUE
-binding_entry_remove(self, keyval, modifiers)
-    VALUE self, keyval, modifiers;
+binding_entry_remove(VALUE self, VALUE keyval, VALUE modifiers)
 {
     gtk_binding_entry_remove(_SELF(self), NUM2UINT(keyval), RVAL2MOD(modifiers));
     return self;
@@ -162,8 +153,7 @@ binding_entry_remove(self, keyval, modifiers)
 
 #if GTK_CHECK_VERSION(2,12,0)
 static VALUE
-binding_entry_skip(self, keyval, modifiers)
-    VALUE self, keyval, modifiers;
+binding_entry_skip(VALUE self, VALUE keyval, VALUE modifiers)
 {
     gtk_binding_entry_skip(_SELF(self), NUM2UINT(keyval), RVAL2MOD(modifiers));
     return self;

data/ext/gtk2/rbgtkborder.c

@@ -18,14 +18,12 @@
 
 #define ATTR_INT(name)\
 static VALUE \
-border_int_ ## name (self)\
-    VALUE self;\
+border_int_ ## name (VALUE self)\
 {\
     return INT2NUM(_SELF(self)->name);\
 }\
 static VALUE \
-border_int_set_ ## name (self, val)\
-    VALUE self, val;\
+border_int_set_ ## name (VALUE self, VALUE val)\
 {\
     _SELF(self)->name = NUM2INT(val); \
     return self;\
@@ -41,8 +39,7 @@ ATTR_INT(bottom);
     rb_define_method(gt, G_STRINGIFY(set_ ## name), border_ ## type ## _set_## name, 1);
 
 static VALUE
-border_initialize(self, left, right, top, bottom)
-    VALUE self, left, right, top, bottom;
+border_initialize(VALUE self, VALUE left, VALUE right, VALUE top, VALUE bottom)
 {
     GtkBorder border;
     border.left = NUM2INT(left);
@@ -55,8 +52,7 @@ border_initialize(self, left, right, top, bottom)
 }
 
 static VALUE
-border_to_a(self)
-    VALUE self;
+border_to_a(VALUE self)
 {
     GtkBorder* border = _SELF(self);
     return rb_ary_new3(4, INT2NUM(border->left), INT2NUM(border->right),

data/ext/gtk2/rbgtkbox.c

@@ -18,11 +18,7 @@
 #define RVAL2WIDGET(w) (GTK_WIDGET(RVAL2GOBJ(w)))
 
 static void
-box_pack_start_or_end(argc, argv, self, start)
-    int argc;
-    VALUE *argv;
-    VALUE self;
-    int start;
+box_pack_start_or_end(int argc, VALUE *argv, VALUE self, int start)
 {
     VALUE arg0, arg1, arg2, arg3;
     gint expand, fill, padding;
@@ -50,44 +46,35 @@ box_pack_start_or_end(argc, argv, self, start)
 }
 
 static VALUE
-box_pack_start(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+box_pack_start(int argc, VALUE *argv, VALUE self)
 {
     box_pack_start_or_end(argc, argv, self, 1);
     return self;
 }
 
 static VALUE
-box_pack_end(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+box_pack_end(int argc, VALUE *argv, VALUE self)
 {
     box_pack_start_or_end(argc, argv, self, 0);
     return self;
 }
 
 static VALUE
-box_pack_start_defaults(self, widget)
-    VALUE self, widget;
+box_pack_start_defaults(VALUE self, VALUE widget)
 {
     gtk_box_pack_start_defaults(_SELF(self), RVAL2WIDGET(widget));
     return self;
 }
 
 static VALUE
-box_pack_end_defaults(self, widget)
-    VALUE self, widget;
+box_pack_end_defaults(VALUE self, VALUE widget)
 {
     gtk_box_pack_end_defaults(_SELF(self), RVAL2WIDGET(widget));
     return self;
 }
 
 static VALUE
-box_reorder_child(self, child, pos)
-    VALUE self, child, pos;
+box_reorder_child(VALUE self, VALUE child, VALUE pos)
 {
     gtk_box_reorder_child(_SELF(self),
                           RVAL2WIDGET(child), NUM2INT(pos));
@@ -95,8 +82,7 @@ box_reorder_child(self, child, pos)
 }
 
 static VALUE
-box_query_child_packing(self, child)
-	VALUE self, child;
+box_query_child_packing(VALUE self, VALUE child)
 {
     gboolean expand, fill;
     guint padding;
@@ -117,8 +103,7 @@ box_query_child_packing(self, child)
 }
 
 static VALUE
-box_set_child_packing(self, child, expand, fill, padding, pack_type)
-	VALUE self, child, expand, fill, padding, pack_type;
+box_set_child_packing(VALUE self, VALUE child, VALUE expand, VALUE fill, VALUE padding, VALUE pack_type)
 {
     gtk_box_set_child_packing(_SELF(self), 
                               RVAL2WIDGET(child),

data/ext/gtk2/rbgtkbutton.c

@@ -17,10 +17,7 @@
 #define _SELF(self) (GTK_BUTTON(RVAL2GOBJ(self)))
 
 static VALUE
-button_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+button_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE label, use_underline;
     GtkWidget *widget = NULL;
@@ -47,40 +44,35 @@ button_initialize(argc, argv, self)
 }
 
 static VALUE
-button_pressed(self)
-    VALUE self;
+button_pressed(VALUE self)
 {
     gtk_button_pressed(GTK_BUTTON(RVAL2GOBJ(self)));
     return self;
 }
 
 static VALUE
-button_released(self)
-    VALUE self;
+button_released(VALUE self)
 {
     gtk_button_released(_SELF(self));
     return self;
 }
 
 static VALUE
-button_clicked(self)
-    VALUE self;
+button_clicked(VALUE self)
 {
     gtk_button_clicked(_SELF(self));
     return self;
 }
 
 static VALUE
-button_enter(self)
-    VALUE self;
+button_enter(VALUE self)
 {
     gtk_button_enter(_SELF(self));
     return self;
 }
 
 static VALUE
-button_leave(self)
-    VALUE self;
+button_leave(VALUE self)
 {
     gtk_button_leave(_SELF(self));
     return self;
@@ -88,16 +80,14 @@ button_leave(self)
 
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-button_set_alignment(self, xalign, yalign)
-    VALUE self, xalign, yalign;
+button_set_alignment(VALUE self, VALUE xalign, VALUE yalign)
 {
     gtk_button_set_alignment(_SELF(self), NUM2DBL(xalign), NUM2DBL(yalign));
     return self;
 }
 
 static VALUE
-button_get_alignment(self)
-    VALUE self;
+button_get_alignment(VALUE self)
 {
     gfloat xalign, yalign;
     gtk_button_get_alignment(_SELF(self), &xalign, &yalign);

data/ext/gtk2/rbgtkcalendar.c

@@ -17,16 +17,14 @@
 #define _SELF(self) (GTK_CALENDAR(RVAL2GOBJ(self)))
 
 static VALUE
-cal_init(self)
-    VALUE self;
+cal_init(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_calendar_new());
     return Qnil;
 }
 
 static VALUE
-cal_select_month(self, month, year)
-    VALUE self, month, year;
+cal_select_month(VALUE self, VALUE month, VALUE year)
 {
     gint ret = gtk_calendar_select_month(_SELF(self),
                                          NUM2INT(month)-1,
@@ -35,40 +33,35 @@ cal_select_month(self, month, year)
 }
 
 static VALUE
-cal_select_day(self, day)
-    VALUE self, day;
+cal_select_day(VALUE self, VALUE day)
 {
     gtk_calendar_select_day(_SELF(self), NUM2INT(day));
     return self;
 }
 
 static VALUE
-cal_mark_day(self, day)
-    VALUE self, day;
+cal_mark_day(VALUE self, VALUE day)
 {
     gtk_calendar_mark_day(_SELF(self), NUM2INT(day));
     return self;
 }
 
 static VALUE
-cal_unmark_day(self, day)
-    VALUE self, day;
+cal_unmark_day(VALUE self, VALUE day)
 {
     gtk_calendar_unmark_day(_SELF(self), NUM2INT(day));
     return self;
 }
 
 static VALUE
-cal_clear_marks(self)
-    VALUE self;
+cal_clear_marks(VALUE self)
 {
     gtk_calendar_clear_marks(_SELF(self));
     return self;
 }
 
 static VALUE
-cal_get_date(self)
-    VALUE self;
+cal_get_date(VALUE self)
 {
     VALUE ret;
     guint year, month, day;
@@ -82,26 +75,21 @@ cal_get_date(self)
 }
 
 static VALUE
-cal_freeze(self)
-    VALUE self;
+cal_freeze(VALUE self)
 {
     gtk_calendar_freeze(_SELF(self));
     return self;
 }
 
 static VALUE
-cal_thaw(self)
-    VALUE self;
+cal_thaw(VALUE self)
 {
     gtk_calendar_thaw(_SELF(self));
     return self;
 }
 
 static VALUE
-cal_get_display_options(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+cal_get_display_options(int argc, VALUE *argv, VALUE self)
 {
     VALUE flags;
     rb_scan_args(argc, argv, "01", &flags);
@@ -124,8 +112,7 @@ cal_get_display_options(argc, argv, self)
 
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-cal_set_display_options(self, flags)
-    VALUE self, flags;
+cal_set_display_options(VALUE self, VALUE flags)
 {
     gtk_calendar_set_display_options(_SELF(self), 
                                      RVAL2GFLAGS(flags, 

data/ext/gtk2/rbgtkcelleditable.c

@@ -14,8 +14,7 @@
 #define _SELF(s) (GTK_CELL_EDITABLE(RVAL2GOBJ(s)))
 
 static VALUE
-celledit_start_editing(self, event)
-     VALUE self, event;
+celledit_start_editing(VALUE self, VALUE event)
 {
     gtk_cell_editable_start_editing(_SELF(self), 
                                     NIL_P(event) ? NULL : RVAL2GEV(event));
@@ -23,16 +22,14 @@ celledit_start_editing(self, event)
 }
 
 static VALUE
-celledit_editing_done(self)
-     VALUE self;
+celledit_editing_done(VALUE self)
 {
     gtk_cell_editable_editing_done(_SELF(self));
     return self;
 }
 
 static VALUE
-celledit_remove_widget(self)
-     VALUE self;
+celledit_remove_widget(VALUE self)
 {
     gtk_cell_editable_remove_widget(_SELF(self));
     return self;

data/ext/gtk2/rbgtkcelllayout.c

@@ -17,8 +17,7 @@
 #define RVAL2RENDERER(s) (GTK_CELL_RENDERER(RVAL2GOBJ(s)))
 
 static VALUE
-layout_pack_start(self, cell, expand)
-    VALUE self, cell, expand;
+layout_pack_start(VALUE self, VALUE cell, VALUE expand)
 {
     gtk_cell_layout_pack_start(_SELF(self), RVAL2RENDERER(cell),
                                RVAL2CBOOL(expand));
@@ -26,8 +25,7 @@ layout_pack_start(self, cell, expand)
 }
 
 static VALUE
-layout_pack_end(self, cell, expand)
-    VALUE self, cell, expand;
+layout_pack_end(VALUE self, VALUE cell, VALUE expand)
 {
     gtk_cell_layout_pack_end(_SELF(self), RVAL2RENDERER(cell),
                              RVAL2CBOOL(expand));
@@ -35,8 +33,7 @@ layout_pack_end(self, cell, expand)
 }
 
 static VALUE
-layout_reorder(self, cell, position)
-    VALUE self, cell, position;
+layout_reorder(VALUE self, VALUE cell, VALUE position)
 {
     gtk_cell_layout_reorder(_SELF(self), RVAL2RENDERER(cell),
                             NUM2INT(position));
@@ -44,16 +41,14 @@ layout_reorder(self, cell, position)
 }
 
 static VALUE
-layout_clear(self)
-    VALUE self;
+layout_clear(VALUE self)
 {
     gtk_cell_layout_clear(_SELF(self));
     return self;
 }
 
 static VALUE
-layout_add_attribute(self, cell, attribute, column)
-    VALUE self, cell, attribute, column;
+layout_add_attribute(VALUE self, VALUE cell, VALUE attribute, VALUE column)
 {
     const gchar *name;
 
@@ -69,12 +64,7 @@ layout_add_attribute(self, cell, attribute, column)
 }
 
 static void
-layout_data_func(layout, cell, tree_model, iter, func)
-    GtkCellLayout *layout;
-    GtkCellRenderer *cell;
-    GtkTreeModel *tree_model;
-    GtkTreeIter *iter;
-    gpointer func;
+layout_data_func(GtkCellLayout *layout, GtkCellRenderer *cell, GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer func)
 {
     iter->user_data3 = tree_model;
     rb_funcall((VALUE)func, id_call, 4, GOBJ2RVAL(layout), GOBJ2RVAL(cell),
@@ -82,8 +72,7 @@ layout_data_func(layout, cell, tree_model, iter, func)
 }
 
 static VALUE
-layout_set_cell_data_func(self, cell)
-    VALUE self, cell;
+layout_set_cell_data_func(VALUE self, VALUE cell)
 {
     if (rb_block_given_p()) {
         VALUE func = rb_block_proc();
@@ -99,16 +88,14 @@ layout_set_cell_data_func(self, cell)
 }
 
 static VALUE
-layout_clear_attributes(self, cell)
-    VALUE self, cell;
+layout_clear_attributes(VALUE self, VALUE cell)
 {
     gtk_cell_layout_clear_attributes(_SELF(self), RVAL2RENDERER(cell));
     return self;
 }
 
 static VALUE
-layout_set_attributes(self, cell, attrs)
-    VALUE self, cell, attrs;
+layout_set_attributes(VALUE self, VALUE cell, VALUE attrs)
 {
     gint i;
     VALUE ary;