gtk2 0.90.7-x86-mingw32 → 0.90.8-x86-mingw32

data/ext/gtk2/rbgtktreesortable.c

@@ -15,16 +15,14 @@
 #define _SELF(s)	(GTK_TREE_SORTABLE(RVAL2GOBJ(s)))
 
 static VALUE
-treesortable_sort_column_changed(self)
-    VALUE self;
+treesortable_sort_column_changed(VALUE self)
 {
     gtk_tree_sortable_sort_column_changed(_SELF(self));
     return self;
 }
 
 static VALUE
-treesortable_get_sort_column_id(self)
-    VALUE self;
+treesortable_get_sort_column_id(VALUE self)
 {
     gint sort_column_id;
     GtkSortType order;
@@ -43,10 +41,7 @@ treesortable_get_sort_column_id(self)
 }
 
 static VALUE
-treesortable_set_sort_column_id(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+treesortable_set_sort_column_id(int argc, VALUE *argv, VALUE self)
 {
     gint sort_column_id;
     GtkSortType order;
@@ -64,10 +59,7 @@ treesortable_set_sort_column_id(argc, argv, self)
 }
 
 static gint
-sort_func(model, a, b, func)
-    GtkTreeModel *model;
-    GtkTreeIter *a, *b;
-    gpointer func;
+sort_func(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer func)
 {
     a->user_data3 = model;
     b->user_data3 = model;
@@ -76,8 +68,7 @@ sort_func(model, a, b, func)
 }
 
 static VALUE
-treesortable_set_sort_func(self, sort_column_id)
-    VALUE self, sort_column_id;
+treesortable_set_sort_func(VALUE self, VALUE sort_column_id)
 {
     volatile VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -88,8 +79,7 @@ treesortable_set_sort_func(self, sort_column_id)
 }
 
 static VALUE
-treesortable_set_default_sort_func(self)
-    VALUE self;
+treesortable_set_default_sort_func(VALUE self)
 {
     volatile VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -100,8 +90,7 @@ treesortable_set_default_sort_func(self)
 }
 
 static VALUE
-treesortable_has_default_sort_func(self)
-    VALUE self;
+treesortable_has_default_sort_func(VALUE self)
 {
     return RVAL2CBOOL(gtk_tree_sortable_has_default_sort_func(_SELF(self)));
 }

data/ext/gtk2/rbgtktreestore.c

@@ -14,10 +14,7 @@
 #define _SELF(s) (GTK_TREE_STORE(RVAL2GOBJ(s)))
 
 static VALUE
-tstore_initialize(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE  self;
+tstore_initialize(int argc, VALUE *argv, VALUE self)
 {
     gint cnt;
     GtkTreeStore* store;
@@ -38,10 +35,7 @@ tstore_initialize(argc, argv, self)
 }
 
 static VALUE
-tstore_set_column_types(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE  self;
+tstore_set_column_types(int argc, VALUE *argv, VALUE self)
 {
     gint cnt;
     GType* buf;
@@ -58,8 +52,7 @@ tstore_set_column_types(argc, argv, self)
 }
 
 static VALUE
-tstore_set_value(self, iter, column, value)
-    VALUE self, iter, column, value;
+tstore_set_value(VALUE self, VALUE iter, VALUE column, VALUE value)
 {
     GType gtype = gtk_tree_model_get_column_type(GTK_TREE_MODEL(RVAL2GOBJ(self)), NUM2INT(column));
     GValue gval = {0,};
@@ -87,8 +80,7 @@ tstore_set_value(self, iter, column, value)
 */
     
 static VALUE
-tstore_remove(self, iter)
-    VALUE self, iter;
+tstore_remove(VALUE self, VALUE iter)
 {
     G_CHILD_REMOVE(self, iter);
 #if GTK_CHECK_VERSION(2,2,0)
@@ -100,10 +92,7 @@ tstore_remove(self, iter)
 }
 
 static VALUE
-tstore_insert(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE  self;
+tstore_insert(int argc, VALUE *argv, VALUE self)
 {
     VALUE parent, position, values, ret;
     GtkTreeIter iter;
@@ -189,8 +178,7 @@ tstore_insert(argc, argv, self)
 
 
 static VALUE
-tstore_insert_before(self, parent, sibling)
-    VALUE self, parent, sibling;
+tstore_insert_before(VALUE self, VALUE parent, VALUE sibling)
 {
     VALUE ret;
     GtkTreeIter iter;
@@ -205,8 +193,7 @@ tstore_insert_before(self, parent, sibling)
 }
 
 static VALUE
-tstore_insert_after(self, parent, sibling)
-    VALUE self, parent, sibling;
+tstore_insert_after(VALUE self, VALUE parent, VALUE sibling)
 { 
     VALUE ret;
     GtkTreeIter iter;
@@ -243,8 +230,7 @@ void        gtk_tree_store_insert_with_valuesv
 */
 
 static VALUE
-tstore_prepend(self, parent)
-    VALUE self, parent;
+tstore_prepend(VALUE self, VALUE parent)
 {
     VALUE ret;
     GtkTreeIter iter;
@@ -259,8 +245,7 @@ tstore_prepend(self, parent)
 }
 
 static VALUE
-tstore_append(self, parent)
-    VALUE self, parent;
+tstore_append(VALUE self, VALUE parent)
 {
     VALUE ret;
     GtkTreeIter iter;
@@ -275,23 +260,20 @@ tstore_append(self, parent)
 }
 
 static VALUE
-tstore_is_ancestor(self, iter, descendant)
-    VALUE self, iter, descendant;
+tstore_is_ancestor(VALUE self, VALUE iter, VALUE descendant)
 {
     return gtk_tree_store_is_ancestor(_SELF(self), RVAL2GTKTREEITER(iter), 
                                       RVAL2GTKTREEITER(descendant));
 }
 
 static VALUE
-tstore_iter_depth(self, iter)
-    VALUE self, iter;
+tstore_iter_depth(VALUE self, VALUE iter)
 {
     return INT2NUM(gtk_tree_store_iter_depth(_SELF(self), RVAL2GTKTREEITER(iter)));
 }
 
 static VALUE
-tstore_clear(self)
-    VALUE self;
+tstore_clear(VALUE self)
 {
     G_CHILD_REMOVE_ALL(self);
     gtk_tree_store_clear(_SELF(self));
@@ -299,15 +281,13 @@ tstore_clear(self)
 }
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-tstore_iter_is_valid(self, iter)
-    VALUE self, iter;
+tstore_iter_is_valid(VALUE self, VALUE iter)
 {
     return (NIL_P(iter)) ? Qfalse : 
         CBOOL2RVAL(gtk_tree_store_iter_is_valid(_SELF(self), RVAL2GTKTREEITER(iter)));
 }
 static VALUE
-tstore_reorder(self, parent, new_order)
-    VALUE self, parent, new_order;
+tstore_reorder(VALUE self, VALUE parent, VALUE new_order)
 {
     gint i;
     gint len = RARRAY_LEN(new_order);
@@ -322,23 +302,20 @@ tstore_reorder(self, parent, new_order)
     return self;
 }
 static VALUE
-tstore_swap(self, iter1, iter2)
-    VALUE self, iter1, iter2;
+tstore_swap(VALUE self, VALUE iter1, VALUE iter2)
 {
     gtk_tree_store_swap(_SELF(self), RVAL2GTKTREEITER(iter1), RVAL2GTKTREEITER(iter2));
     return self;
 }
 static VALUE
-tstore_move_before(self, iter, position)
-    VALUE self, iter, position;
+tstore_move_before(VALUE self, VALUE iter, VALUE position)
 {
     gtk_tree_store_move_before(_SELF(self), RVAL2GTKTREEITER(iter), 
                                NIL_P(position) ? NULL : RVAL2GTKTREEITER(position));
     return self;
 }
 static VALUE
-tstore_move_after(self, iter, position)
-    VALUE self, iter, position;
+tstore_move_after(VALUE self, VALUE iter, VALUE position)
 {
     gtk_tree_store_move_after(_SELF(self), RVAL2GTKTREEITER(iter), 
                                NIL_P(position) ? NULL : RVAL2GTKTREEITER(position));

data/ext/gtk2/rbgtktreeview.c

@@ -19,10 +19,7 @@ static ID id_model;
 static ID id_selection;
 
 static VALUE
-treeview_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+treeview_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE model;
     GtkWidget *widget;
@@ -40,8 +37,7 @@ treeview_initialize(argc, argv, self)
 }
 
 static VALUE
-treeview_get_selection(self)
-    VALUE self;
+treeview_get_selection(VALUE self)
 {
     VALUE ret = GOBJ2RVAL(gtk_tree_view_get_selection(_SELF(self)));
     G_CHILD_SET(self, id_selection, ret);
@@ -49,16 +45,14 @@ treeview_get_selection(self)
 }
 
 static VALUE
-treeview_columns_autosize(self)
-    VALUE self;
+treeview_columns_autosize(VALUE self)
 {
     gtk_tree_view_columns_autosize(_SELF(self));
     return self;
 }
 
 static VALUE
-treeview_append_column(self, column)
-    VALUE self, column;
+treeview_append_column(VALUE self, VALUE column)
 {
     G_CHILD_ADD(self, column);
     return INT2NUM(gtk_tree_view_append_column(_SELF(self), 
@@ -66,8 +60,7 @@ treeview_append_column(self, column)
 }
 
 static VALUE
-treeview_remove_column(self, column)
-    VALUE self, column;
+treeview_remove_column(VALUE self, VALUE column)
 {
     G_CHILD_REMOVE(self, column);
     return INT2NUM(gtk_tree_view_remove_column(_SELF(self), 
@@ -75,12 +68,7 @@ treeview_remove_column(self, column)
 }  
 
 static void
-cell_data_func(column, cell, model, iter, func)
-    GtkTreeViewColumn* column;
-    GtkCellRenderer* cell;
-    GtkTreeModel* model;
-    GtkTreeIter* iter;
-    gpointer func;
+cell_data_func(GtkTreeViewColumn *column, GtkCellRenderer *cell, GtkTreeModel *model, GtkTreeIter *iter, gpointer func)
 {
     iter->user_data3 = model;
     rb_funcall((VALUE)func, id_call, 4, GOBJ2RVAL(column),
@@ -89,10 +77,7 @@ cell_data_func(column, cell, model, iter, func)
 }
 
 static VALUE
-treeview_insert_column(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE  self;
+treeview_insert_column(int argc, VALUE *argv, VALUE self)
 {
     VALUE args[4];
 
@@ -161,22 +146,19 @@ treeview_insert_column(argc, argv, self)
 }
 
 static VALUE
-treeview_get_column(self, num)
-    VALUE self, num;
+treeview_get_column(VALUE self, VALUE num)
 {
     return GOBJ2RVAL(gtk_tree_view_get_column(_SELF(self), NUM2INT(num)));
 }
 
 static VALUE
-treeview_get_columns(self)
-    VALUE self;
+treeview_get_columns(VALUE self)
 {
     return GLIST2ARYF(gtk_tree_view_get_columns(_SELF(self)));
 }
 
 static VALUE
-treeview_move_column_after(self, column, base_column)
-    VALUE self, column, base_column;
+treeview_move_column_after(VALUE self, VALUE column, VALUE base_column)
 {
     gtk_tree_view_move_column_after(_SELF(self), TREEVIEW_COL(column),
                                     NIL_P(base_column) ? NULL : TREEVIEW_COL(base_column));
@@ -184,12 +166,7 @@ treeview_move_column_after(self, column, base_column)
 }
 
 static gboolean
-column_drop_func(treeview, column, prev_column, next_column, func)
-    GtkTreeView* treeview;
-    GtkTreeViewColumn* column;
-    GtkTreeViewColumn* prev_column;
-    GtkTreeViewColumn* next_column;
-    gpointer func;
+column_drop_func(GtkTreeView *treeview, GtkTreeViewColumn *column, GtkTreeViewColumn *prev_column, GtkTreeViewColumn *next_column, gpointer func)
 {
     return RVAL2CBOOL(rb_funcall((VALUE)func, id_call, 4, GOBJ2RVAL(treeview),
                       GOBJ2RVAL(column), GOBJ2RVAL(prev_column), 
@@ -197,8 +174,7 @@ column_drop_func(treeview, column, prev_column, next_column, func)
 }
 
 static VALUE
-treeview_set_column_drag_function(self)
-    VALUE self;
+treeview_set_column_drag_function(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -209,16 +185,14 @@ treeview_set_column_drag_function(self)
 }
 
 static VALUE
-treeview_scroll_to_point(self, x, y)
-    VALUE self, x, y;
+treeview_scroll_to_point(VALUE self, VALUE x, VALUE y)
 {
     gtk_tree_view_scroll_to_point(_SELF(self), NUM2INT(x), NUM2INT(y));
     return self;
 }
 
 static VALUE
-treeview_scroll_to_cell(self, path, column, use_align, row_align, col_align)
-    VALUE self, path, column, use_align, row_align, col_align;
+treeview_scroll_to_cell(VALUE self, VALUE path, VALUE column, VALUE use_align, VALUE row_align, VALUE col_align)
 {
     gtk_tree_view_scroll_to_cell(_SELF(self),
                                  NIL_P(path) ? NULL : RVAL2GTKTREEPATH(path),
@@ -229,8 +203,7 @@ treeview_scroll_to_cell(self, path, column, use_align, row_align, col_align)
 }
 
 static VALUE
-treeview_set_cursor(self, path, focus_column, start_editing)
-    VALUE self, path, focus_column, start_editing;
+treeview_set_cursor(VALUE self, VALUE path, VALUE focus_column, VALUE start_editing)
 {
     gtk_tree_view_set_cursor(_SELF(self), RVAL2GTKTREEPATH(path),
                              NIL_P(focus_column) ? NULL : TREEVIEW_COL(focus_column), 
@@ -239,8 +212,7 @@ treeview_set_cursor(self, path, focus_column, start_editing)
 }
 
 static VALUE
-treeview_get_cursor(self)
-    VALUE self;
+treeview_get_cursor(VALUE self)
 {
     GtkTreePath* path;
     GtkTreeViewColumn* focus_column;
@@ -251,8 +223,7 @@ treeview_get_cursor(self)
 }
 
 static VALUE
-treeview_row_activated(self, path, column)
-    VALUE self, path, column;
+treeview_row_activated(VALUE self, VALUE path, VALUE column)
 {
     gtk_tree_view_row_activated(_SELF(self), RVAL2GTKTREEPATH(path),
                                 TREEVIEW_COL(column));
@@ -260,24 +231,21 @@ treeview_row_activated(self, path, column)
 }
 
 static VALUE
-treeview_expand_all(self)
-    VALUE self;
+treeview_expand_all(VALUE self)
 {
     gtk_tree_view_expand_all(_SELF(self));
     return self;
 }
 
 static VALUE
-treeview_collapse_all(self)
-    VALUE self;
+treeview_collapse_all(VALUE self)
 {
     gtk_tree_view_collapse_all(_SELF(self));
     return self;
 }
 
 static VALUE
-treeview_expand_row(self, path, open_all)
-    VALUE self, path, open_all;
+treeview_expand_row(VALUE self, VALUE path, VALUE open_all)
 {
     return CBOOL2RVAL(gtk_tree_view_expand_row(_SELF(self), 
                                                RVAL2GTKTREEPATH(path),
@@ -286,8 +254,7 @@ treeview_expand_row(self, path, open_all)
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-treeview_expand_to_path(self, path)
-    VALUE self, path;
+treeview_expand_to_path(VALUE self, VALUE path)
 {
     gtk_tree_view_expand_to_path(_SELF(self), RVAL2GTKTREEPATH(path));
     return self;
@@ -295,26 +262,21 @@ treeview_expand_to_path(self, path)
 #endif
 
 static VALUE
-treeview_collapse_row(self, path)
-    VALUE self, path;
+treeview_collapse_row(VALUE self, VALUE path)
 {
     return CBOOL2RVAL(gtk_tree_view_collapse_row(_SELF(self), 
                                                  RVAL2GTKTREEPATH(path)));
 }
 
 static void
-mapping_func(treeview, path, func)
-    GtkTreeView* treeview;
-    GtkTreePath* path;
-    gpointer func;
+mapping_func(GtkTreeView *treeview, GtkTreePath *path, gpointer func)
 {
     rb_funcall((VALUE)func, id_call, 2, GOBJ2RVAL(treeview),
                GTKTREEPATH2RVAL(path));
 }
 
 static VALUE
-treeview_map_expanded_rows(self)
-    VALUE self;
+treeview_map_expanded_rows(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -325,16 +287,14 @@ treeview_map_expanded_rows(self)
 }
 
 static VALUE
-treeview_row_expanded(self, path)
-    VALUE self, path;
+treeview_row_expanded(VALUE self, VALUE path)
 {
     return CBOOL2RVAL(gtk_tree_view_row_expanded(_SELF(self), 
                                                  RVAL2GTKTREEPATH(path)));
 }
 
 static VALUE
-treeview_get_path_at_pos(self, x, y)
-    VALUE self, x, y;
+treeview_get_path_at_pos(VALUE self, VALUE x, VALUE y)
 {
     GtkTreePath* path;
     GtkTreeViewColumn* column;
@@ -351,8 +311,7 @@ treeview_get_path_at_pos(self, x, y)
 }
 
 static VALUE
-treeview_get_cell_area(self, path, column)
-    VALUE self, path, column;
+treeview_get_cell_area(VALUE self, VALUE path, VALUE column)
 {
     GdkRectangle rect;
     gtk_tree_view_get_cell_area(_SELF(self), 
@@ -363,8 +322,7 @@ treeview_get_cell_area(self, path, column)
 }
 
 static VALUE
-treeview_get_background_area(self, path, column)
-    VALUE self, path, column;
+treeview_get_background_area(VALUE self, VALUE path, VALUE column)
 {
     GdkRectangle rect;
     gtk_tree_view_get_background_area(_SELF(self), 
@@ -375,8 +333,7 @@ treeview_get_background_area(self, path, column)
 }
 
 static VALUE
-treeview_get_visible_rect(self)
-    VALUE self;
+treeview_get_visible_rect(VALUE self)
 {
     GdkRectangle rect;
     gtk_tree_view_get_visible_rect(_SELF(self), &rect);
@@ -385,8 +342,7 @@ treeview_get_visible_rect(self)
 
 #if GTK_CHECK_VERSION(2,8,0)
 static VALUE
-treeview_get_visible_range(self)
-    VALUE self;
+treeview_get_visible_range(VALUE self)
 {
     GtkTreePath* start_path;
     GtkTreePath* end_path;
@@ -399,15 +355,13 @@ treeview_get_visible_range(self)
 #endif
 
 static VALUE
-treeview_get_bin_window(self)
-    VALUE self;
+treeview_get_bin_window(VALUE self)
 {
     return GOBJ2RVAL(gtk_tree_view_get_bin_window(_SELF(self)));
 }
 
 static VALUE
-treeview_widget_to_tree_coords(self, wx, wy)
-    VALUE self, wx, wy;
+treeview_widget_to_tree_coords(VALUE self, VALUE wx, VALUE wy)
 {
     gint tx, ty;
     gtk_tree_view_widget_to_tree_coords(_SELF(self), 
@@ -417,8 +371,7 @@ treeview_widget_to_tree_coords(self, wx, wy)
 }
 
 static VALUE
-treeview_tree_to_widget_coords(self, tx, ty)
-    VALUE self, tx, ty;
+treeview_tree_to_widget_coords(VALUE self, VALUE tx, VALUE ty)
 {
     gint wx, wy;
     gtk_tree_view_tree_to_widget_coords(_SELF(self),
@@ -429,8 +382,7 @@ treeview_tree_to_widget_coords(self, tx, ty)
 
 #if GTK_CHECK_VERSION(2,12,0)
 static VALUE
-treeview_convert_bin_window_to_tree_coords(self, bx, by)
-    VALUE self, bx, by;
+treeview_convert_bin_window_to_tree_coords(VALUE self, VALUE bx, VALUE by)
 {
     gint tx, ty;
     gtk_tree_view_convert_bin_window_to_tree_coords(_SELF(self),
@@ -439,8 +391,7 @@ treeview_convert_bin_window_to_tree_coords(self, bx, by)
     return rb_ary_new3(2, INT2NUM(tx), INT2NUM(ty));
 }
 static VALUE
-treeview_convert_bin_window_to_widget_coords(self, bx, by)
-    VALUE self, bx, by;
+treeview_convert_bin_window_to_widget_coords(VALUE self, VALUE bx, VALUE by)
 {
     gint wx, wy;
     gtk_tree_view_convert_bin_window_to_widget_coords(_SELF(self),
@@ -450,8 +401,7 @@ treeview_convert_bin_window_to_widget_coords(self, bx, by)
 }
 
 static VALUE
-treeview_convert_tree_to_bin_window_coords(self, tx, ty)
-    VALUE self, tx, ty;
+treeview_convert_tree_to_bin_window_coords(VALUE self, VALUE tx, VALUE ty)
 {
     gint bx, by;
     gtk_tree_view_convert_tree_to_bin_window_coords(_SELF(self),
@@ -460,8 +410,7 @@ treeview_convert_tree_to_bin_window_coords(self, tx, ty)
     return rb_ary_new3(2, INT2NUM(bx), INT2NUM(by));
 }
 static VALUE
-treeview_convert_tree_to_widget_coords(self, tx, ty)
-    VALUE self, tx, ty;
+treeview_convert_tree_to_widget_coords(VALUE self, VALUE tx, VALUE ty)
 {
     gint wx, wy;
     gtk_tree_view_convert_tree_to_widget_coords(_SELF(self),
@@ -471,8 +420,7 @@ treeview_convert_tree_to_widget_coords(self, tx, ty)
 }
 
 static VALUE
-treeview_convert_widget_to_bin_window_coords(self, wx, wy)
-    VALUE self, wx, wy;
+treeview_convert_widget_to_bin_window_coords(VALUE self, VALUE wx, VALUE wy)
 {
     gint bx, by;
     gtk_tree_view_convert_widget_to_bin_window_coords(_SELF(self),
@@ -481,8 +429,7 @@ treeview_convert_widget_to_bin_window_coords(self, wx, wy)
     return rb_ary_new3(2, INT2NUM(bx), INT2NUM(by));
 }
 static VALUE
-treeview_convert_widget_to_tree_coords(self, wx, wy)
-    VALUE self, wx, wy;
+treeview_convert_widget_to_tree_coords(VALUE self, VALUE wx, VALUE wy)
 {
     gint tx, ty;
     gtk_tree_view_convert_widget_to_tree_coords(_SELF(self),
@@ -493,8 +440,7 @@ treeview_convert_widget_to_tree_coords(self, wx, wy)
 #endif
 
 static VALUE
-treeview_enable_model_drag_dest(self, targets, actions)
-    VALUE self, targets, actions;
+treeview_enable_model_drag_dest(VALUE self, VALUE targets, VALUE actions)
 {
     const GtkTargetEntry* entries = rbgtk_get_target_entry(targets);
     int num = RARRAY_LEN(targets);
@@ -505,8 +451,7 @@ treeview_enable_model_drag_dest(self, targets, actions)
 }
 
 static VALUE
-treeview_enable_model_drag_source(self, start_button_mask, targets, actions)
-        VALUE self, start_button_mask, targets, actions;
+treeview_enable_model_drag_source(VALUE self, VALUE start_button_mask, VALUE targets, VALUE actions)
 {
     GtkTargetEntry* entries = rbgtk_get_target_entry(targets);
     if (entries){
@@ -521,24 +466,21 @@ treeview_enable_model_drag_source(self, start_button_mask, targets, actions)
 }
 
 static VALUE
-treeview_unset_rows_drag_source(self)
-    VALUE self;
+treeview_unset_rows_drag_source(VALUE self)
 {
     gtk_tree_view_unset_rows_drag_source(_SELF(self));
     return self;
 }
 
 static VALUE
-treeview_unset_rows_drag_dest(self)
-    VALUE self;
+treeview_unset_rows_drag_dest(VALUE self)
 {
     gtk_tree_view_unset_rows_drag_dest(_SELF(self));
     return self;
 }
 
 static VALUE
-treeview_set_drag_dest_row(self, path, pos)
-    VALUE self, path, pos;
+treeview_set_drag_dest_row(VALUE self, VALUE path, VALUE pos)
 {
     gtk_tree_view_set_drag_dest_row(_SELF(self), 
                                     NIL_P(path)?NULL:RVAL2GTKTREEPATH(path),
@@ -547,8 +489,7 @@ treeview_set_drag_dest_row(self, path, pos)
 }
 
 static VALUE
-treeview_get_drag_dest_row(self)
-    VALUE self;
+treeview_get_drag_dest_row(VALUE self)
 {
     GtkTreePath* path = NULL;
     GtkTreeViewDropPosition pos;
@@ -558,8 +499,7 @@ treeview_get_drag_dest_row(self)
 }
 
 static VALUE
-treeview_get_dest_row_at_pos(self, drag_x, drag_y)
-    VALUE self;
+treeview_get_dest_row_at_pos(VALUE self, VALUE drag_x, VALUE drag_y)
 {
     GtkTreePath* path;
     GtkTreeViewDropPosition pos;
@@ -573,8 +513,7 @@ treeview_get_dest_row_at_pos(self, drag_x, drag_y)
 }
 
 static VALUE
-treeview_create_row_drag_icon(self, path)
-    VALUE self, path;
+treeview_create_row_drag_icon(VALUE self, VALUE path)
 {
     return GOBJ2RVAL(gtk_tree_view_create_row_drag_icon(_SELF(self),
                                                         RVAL2GTKTREEPATH(path)));
@@ -587,12 +526,7 @@ treeview_create_row_drag_icon(self, path)
 */
 
 static gboolean
-search_equal_func(model, column, key, iter, func)
-    GtkTreeModel* model;
-    gint column;
-    const gchar* key;
-    GtkTreeIter* iter;
-    gpointer func;
+search_equal_func(GtkTreeModel *model, gint column, const gchar *key, GtkTreeIter *iter, gpointer func)
 {
     iter->user_data3 = model;
     return RVAL2CBOOL(rb_funcall((VALUE)func, id_call, 4, 
@@ -601,8 +535,7 @@ search_equal_func(model, column, key, iter, func)
 }
 
 static VALUE
-treeview_set_search_equal_func(self)
-    VALUE self;
+treeview_set_search_equal_func(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -618,9 +551,7 @@ treeview_set_search_equal_func(self)
  * Optional Signals
  */
 static VALUE
-treeview_signal_func(num, values)
-    guint num;
-    const GValue* values;
+treeview_signal_func(guint num, const GValue *values)
 {
     GtkTreeView* view = g_value_get_object(&values[0]);
     GtkTreeIter* iter = g_value_get_boxed(&values[1]);
@@ -631,8 +562,7 @@ treeview_signal_func(num, values)
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-treeview_set_cursor_on_cell(self, path, focus_column, focus_cell, start_editing)
-    VALUE self, path, focus_column, focus_cell, start_editing;
+treeview_set_cursor_on_cell(VALUE self, VALUE path, VALUE focus_column, VALUE focus_cell, VALUE start_editing)
 {
     gtk_tree_view_set_cursor_on_cell(_SELF(self), RVAL2GTKTREEPATH(path),
                                      NIL_P(focus_column) ? NULL : TREEVIEW_COL(focus_column), 
@@ -665,10 +595,7 @@ GtkTreeViewRowSeparatorFunc gtk_tree_view_get_row_separator_func
 
 #if GTK_CHECK_VERSION(2,6,0)
 static gboolean
-row_separator_func(model, iter, func)
-    GtkTreeModel* model;
-    GtkTreeIter* iter;
-    gpointer* func;
+row_separator_func(GtkTreeModel *model, GtkTreeIter *iter, gpointer func)
 {
     VALUE ret;
     iter->user_data3 = model;
@@ -678,14 +605,13 @@ row_separator_func(model, iter, func)
 }
 
 static VALUE
-treeview_set_row_separator_func(self)
-    VALUE self;
+treeview_set_row_separator_func(VALUE self)
 {
     VALUE func = rb_block_proc();
 
     G_RELATIVE(self, func);
     gtk_tree_view_set_row_separator_func(_SELF(self), 
-                                         (GtkTreeViewRowSeparatorFunc)row_separator_func, 
+                                         row_separator_func, 
                                          (gpointer)func, 
                                          (GtkDestroyNotify)NULL);
     return self;
@@ -694,15 +620,13 @@ treeview_set_row_separator_func(self)
 
 #if GTK_CHECK_VERSION(2,10,0)
 static VALUE
-treeview_get_search_entry(self)
-    VALUE self;
+treeview_get_search_entry(VALUE self)
 {
     return GOBJ2RVAL(gtk_tree_view_get_search_entry(_SELF(self)));
 }
 
 static VALUE
-treeview_set_search_entry(self, entry)
-    VALUE self, entry;
+treeview_set_search_entry(VALUE self, VALUE entry)
 {
     gtk_tree_view_set_search_entry(_SELF(self), RVAL2GOBJ(entry));
     return self;
@@ -729,10 +653,7 @@ invoke_callback(VALUE data)
 }
 
 static void
-search_position_func(tree_view, search_dialog, func)
-    GtkTreeView* tree_view;
-    GtkWidget* search_dialog;
-    gpointer func;
+search_position_func(GtkTreeView *tree_view, GtkWidget *search_dialog, gpointer func)
 {
     struct callback_arg arg;
 
@@ -750,8 +671,7 @@ remove_callback_reference(gpointer data)
 
 
 static VALUE
-treeview_set_search_position_func(self)
-    VALUE self;
+treeview_set_search_position_func(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_CHILD_ADD(mGtk, func);