gtk2 0.90.7 → 0.90.8

data/ext/gtk2/rbgtktreemodelfilter.c

@@ -18,10 +18,7 @@ static ID id_child_model;
 static ID id_root;
 
 static VALUE
-treemodelfilter_initialize(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+treemodelfilter_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE child_model, root;
     GtkTreeModel* widget;
@@ -43,10 +40,7 @@ treemodelfilter_initialize(argc, argv, self)
 }
 
 static gboolean
-visible_func(model, iter, func)
-    GtkTreeModel* model;
-    GtkTreeIter* iter;
-    gpointer func;
+visible_func(GtkTreeModel *model, GtkTreeIter *iter, gpointer func)
 {
     VALUE ret;
 
@@ -56,8 +50,7 @@ visible_func(model, iter, func)
 }
 
 static VALUE
-treemodelfilter_set_visible_func(self)
-    VALUE self;
+treemodelfilter_set_visible_func(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -68,12 +61,7 @@ treemodelfilter_set_visible_func(self)
 }
 
 static void
-modify_func(model, iter, value, column, func)
-    GtkTreeModel* model;
-    GtkTreeIter* iter;
-    GValue* value;
-    gint column;
-    gpointer func;
+modify_func(GtkTreeModel *model, GtkTreeIter *iter, GValue *value, gint column, gpointer func)
 {
     VALUE ret;
     iter->user_data3 = model;
@@ -91,10 +79,7 @@ modify_func(model, iter, value, column, func)
  * end
  */
 static VALUE
-treemodelfilter_set_modify_func(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE  self;
+treemodelfilter_set_modify_func(int argc, VALUE *argv, VALUE self)
 {
     VALUE func = rb_block_proc();
     gint i;
@@ -117,23 +102,20 @@ treemodelfilter_set_modify_func(argc, argv, self)
 }
 
 static VALUE
-treemodelfilter_set_visible_column(self, column)
-    VALUE self, column;
+treemodelfilter_set_visible_column(VALUE self, VALUE column)
 {
     gtk_tree_model_filter_set_visible_column(_SELF(self), NUM2INT(column));
     return self;
 }
 
 static VALUE
-treemodelfilter_get_model(self)
-    VALUE self;
+treemodelfilter_get_model(VALUE self)
 {
     return GOBJ2RVAL(gtk_tree_model_filter_get_model(_SELF(self)));
 }
 
 static VALUE
-treemodelfilter_convert_child_iter_to_iter(self, child_iter)
-    VALUE self, child_iter;
+treemodelfilter_convert_child_iter_to_iter(VALUE self, VALUE child_iter)
 {
     GtkTreeIter filter_iter;
     GtkTreeModelFilter* modelfilter = _SELF(self);
@@ -144,8 +126,7 @@ treemodelfilter_convert_child_iter_to_iter(self, child_iter)
 }
 
 static VALUE
-treemodelfilter_convert_iter_to_child_iter(self, filtered_iter)
-    VALUE self, filtered_iter;
+treemodelfilter_convert_iter_to_child_iter(VALUE self, VALUE filtered_iter)
 {
     GtkTreeIter child_iter;
     GtkTreeModelFilter* modelfilter = _SELF(self);
@@ -156,16 +137,14 @@ treemodelfilter_convert_iter_to_child_iter(self, filtered_iter)
 } 
 
 static VALUE
-treemodelfilter_convert_child_path_to_path(self, child_path)
-    VALUE self, child_path;
+treemodelfilter_convert_child_path_to_path(VALUE self, VALUE child_path)
 {
     return GTKTREEPATH2RVAL(gtk_tree_model_filter_convert_child_path_to_path(
                              _SELF(self),
                              RVAL2GTKTREEPATH(child_path)));
 }
 static VALUE
-treemodelfilter_convert_path_to_child_path(self, filter_path)
-    VALUE self, filter_path;
+treemodelfilter_convert_path_to_child_path(VALUE self, VALUE filter_path)
 {
     return GTKTREEPATH2RVAL(gtk_tree_model_filter_convert_path_to_child_path(
                              _SELF(self),
@@ -173,16 +152,14 @@ treemodelfilter_convert_path_to_child_path(self, filter_path)
 }
 
 static VALUE
-treemodelfilter_refilter(self)
-    VALUE self;
+treemodelfilter_refilter(VALUE self)
 {
     gtk_tree_model_filter_refilter(_SELF(self));
     return self;
 }
 
 static VALUE
-treemodelfilter_clear_cache(self)
-    VALUE self;
+treemodelfilter_clear_cache(VALUE self)
 {
     gtk_tree_model_filter_clear_cache(_SELF(self));
     return self;

data/ext/gtk2/rbgtktreemodelsort.c

@@ -16,8 +16,7 @@
 static ID id_model;
 
 static VALUE
-tmodelsort_initialize(self, model)
-    VALUE self, model;
+tmodelsort_initialize(VALUE self, VALUE model)
 {
     G_CHILD_SET(self, id_model, model);
     G_INITIALIZE(self, 
@@ -26,8 +25,7 @@ tmodelsort_initialize(self, model)
 }
 
 static VALUE
-tmodelsort_convert_child_path_to_path(self, child_path)
-    VALUE self, child_path;
+tmodelsort_convert_child_path_to_path(VALUE self, VALUE child_path)
 {
     return GTKTREEPATH2RVAL(gtk_tree_model_sort_convert_child_path_to_path(
                              _SELF(self),
@@ -35,8 +33,7 @@ tmodelsort_convert_child_path_to_path(self, child_path)
 }
 
 static VALUE
-tmodelsort_convert_child_iter_to_iter(self, child_iter)
-    VALUE self, child_iter;
+tmodelsort_convert_child_iter_to_iter(VALUE self, VALUE child_iter)
 {
     GtkTreeIter sort_iter;
     GtkTreeModelSort* modelsort = _SELF(self);
@@ -47,8 +44,7 @@ tmodelsort_convert_child_iter_to_iter(self, child_iter)
 }
 
 static VALUE
-tmodelsort_convert_path_to_child_path(self, sorted_path)
-    VALUE self, sorted_path;
+tmodelsort_convert_path_to_child_path(VALUE self, VALUE sorted_path)
 {
     return GTKTREEPATH2RVAL(gtk_tree_model_sort_convert_path_to_child_path(
                              _SELF(self),
@@ -56,8 +52,7 @@ tmodelsort_convert_path_to_child_path(self, sorted_path)
 }
 
 static VALUE
-tmodelsort_convert_iter_to_child_iter(self, sorted_iter)
-    VALUE self, sorted_iter;
+tmodelsort_convert_iter_to_child_iter(VALUE self, VALUE sorted_iter)
 {
     GtkTreeIter child_iter;
     GtkTreeModelSort* modelsort = _SELF(self);
@@ -68,16 +63,14 @@ tmodelsort_convert_iter_to_child_iter(self, sorted_iter)
 } 
 
 static VALUE
-tmodelsort_reset_default_sort_func(self)
-    VALUE self;
+tmodelsort_reset_default_sort_func(VALUE self)
 {
     gtk_tree_model_sort_reset_default_sort_func(_SELF(self));
     return self;
 }
 
 static VALUE
-tmodelsort_clear_cache(self)
-    VALUE self;
+tmodelsort_clear_cache(VALUE self)
 {
     gtk_tree_model_sort_clear_cache(_SELF(self));
     return self;
@@ -85,8 +78,7 @@ tmodelsort_clear_cache(self)
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-tmodelsort_iter_is_valid(self, iter)
-    VALUE self, iter;
+tmodelsort_iter_is_valid(VALUE self, VALUE iter)
 {
     return CBOOL2RVAL(gtk_tree_model_sort_iter_is_valid(_SELF(self), RVAL2GTKTREEITER(iter)));
 }

data/ext/gtk2/rbgtktreepath.c

@@ -17,10 +17,7 @@
 static ID id_equal;
 
 static VALUE
-treepath_initialize(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+treepath_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE path;
     GtkTreePath* widget;
@@ -47,8 +44,7 @@ treepath_initialize(argc, argv, self)
 }
 
 static VALUE
-treepath_to_string(self)
-    VALUE self;
+treepath_to_string(VALUE self)
 {
     gchar* s = gtk_tree_path_to_string(_SELF(self));
     VALUE result = CSTR2RVAL(s);
@@ -64,31 +60,27 @@ Deprecated
 */
 
 static VALUE
-treepath_append_index(self, index)
-    VALUE self, index;
+treepath_append_index(VALUE self, VALUE index)
 {
     gtk_tree_path_append_index(_SELF(self), NUM2INT(index));
     return self;
 }
 
 static VALUE
-treepath_prepend_index(self, index)
-    VALUE self, index;
+treepath_prepend_index(VALUE self, VALUE index)
 {
     gtk_tree_path_prepend_index(_SELF(self), NUM2INT(index));
     return self;
 }
 
 static VALUE
-treepath_get_depth(self)
-    VALUE self;
+treepath_get_depth(VALUE self)
 {
     return INT2NUM(gtk_tree_path_get_depth(_SELF(self)));
 }
 
 static VALUE
-treepath_get_indices(self)
-    VALUE self;
+treepath_get_indices(VALUE self)
 {
     VALUE ary;
     gint i, length;
@@ -110,8 +102,7 @@ treepath_get_indices(self)
 }
 
 static VALUE
-treepath_compare(self, other)
-    VALUE self, other;
+treepath_compare(VALUE self, VALUE other)
 {
     return INT2NUM(gtk_tree_path_compare(_SELF(self), _SELF(other)));
 }
@@ -127,45 +118,39 @@ treepath_equal(VALUE self, VALUE other)
 }
 
 static VALUE
-treepath_next(self)
-    VALUE self;
+treepath_next(VALUE self)
 {
     gtk_tree_path_next(_SELF(self));
     return self;
 }
 
 static VALUE
-treepath_prev(self)
-    VALUE self;
+treepath_prev(VALUE self)
 {
     return CBOOL2RVAL(gtk_tree_path_prev(_SELF(self)));
 }
 
 static VALUE
-treepath_up(self)
-    VALUE self;
+treepath_up(VALUE self)
 {
     return CBOOL2RVAL(gtk_tree_path_up(_SELF(self)));
 }
 
 static VALUE
-treepath_down(self)
-    VALUE self;
+treepath_down(VALUE self)
 {
     gtk_tree_path_down(_SELF(self));
     return Qtrue;
 }
 
 static VALUE
-treepath_is_ancestor(self, descendant)
-    VALUE self, descendant;
+treepath_is_ancestor(VALUE self, VALUE descendant)
 {
     return CBOOL2RVAL(gtk_tree_path_is_ancestor(_SELF(self), _SELF(descendant)));
 }
 
 static VALUE
-treepath_is_descendant(self, ancestor)
-    VALUE self, ancestor;
+treepath_is_descendant(VALUE self, VALUE ancestor)
 {
     return CBOOL2RVAL(gtk_tree_path_is_descendant(_SELF(self), _SELF(ancestor)));
 }

data/ext/gtk2/rbgtktreerowreference.c

@@ -15,8 +15,7 @@
 
 #ifndef GTK_TYPE_TREE_ROW_REFERENCE
 static GtkTreeRowReference*
-treerowref_copy(ref)
-    const GtkTreeRowReference* ref;
+treerowref_copy(const GtkTreeRowReference *ref)
 {
     return (GtkTreeRowReference*)ref;
 }
@@ -33,8 +32,7 @@ rbgtk_tree_row_reference_get_type()
 }
 
 GtkTreeRowReference *
-rbgtk_get_tree_row_reference(obj)
-    VALUE obj;
+rbgtk_get_tree_row_reference(VALUE obj)
 {
     return (GtkTreeRowReference*)RVAL2BOXED(obj, GTK_TYPE_TREE_ROW_REFERENCE);
 }
@@ -51,10 +49,7 @@ static ID id_model;
 static ID id_path;
 
 static VALUE
-treerowref_initialize(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+treerowref_initialize(int argc, VALUE *argv, VALUE self)
 {
   VALUE proxy, model, path;
   GtkTreeRowReference* ref;
@@ -82,8 +77,7 @@ treerowref_initialize(argc, argv, self)
 
 
 static VALUE
-treerowref_get_path(self)
-    VALUE self;
+treerowref_get_path(VALUE self)
 {
     VALUE ret = GTKTREEPATH2RVAL(gtk_tree_row_reference_get_path(_SELF(self)));
     G_CHILD_SET(self, id_path, ret);
@@ -92,8 +86,7 @@ treerowref_get_path(self)
 
 #if GTK_CHECK_VERSION(2,8,0)
 static VALUE
-treerowref_get_model(self)
-    VALUE self;
+treerowref_get_model(VALUE self)
 {
     VALUE ret = GOBJ2RVAL(gtk_tree_row_reference_get_model(_SELF(self)));
     G_CHILD_SET(self, id_model, ret);
@@ -102,31 +95,27 @@ treerowref_get_model(self)
 #endif
 
 static VALUE
-treerowref_valid(self)
-    VALUE self;
+treerowref_valid(VALUE self)
 {
     return CBOOL2RVAL(gtk_tree_row_reference_valid(_SELF(self)));
 }
 
 static VALUE
-treerowref_s_inserted(self, proxy, path)
-    VALUE self, proxy, path;
+treerowref_s_inserted(VALUE self, VALUE proxy, VALUE path)
 {
     gtk_tree_row_reference_inserted(RVAL2GOBJ(proxy), RVAL2GTKTREEPATH(path));
     return self;
 }
 
 static VALUE
-treerowref_s_deleted(self, proxy, path)
-    VALUE self, proxy, path;
+treerowref_s_deleted(VALUE self, VALUE proxy, VALUE path)
 {
     gtk_tree_row_reference_deleted(RVAL2GOBJ(proxy), RVAL2GTKTREEPATH(path));
     return self;
 }
 
 static VALUE
-treerowref_s_reordered(self, proxy, path, iter, new_orders)
-    VALUE self, proxy, path, iter, new_orders;
+treerowref_s_reordered(VALUE self, VALUE proxy, VALUE path, VALUE iter, VALUE new_orders)
 {
     gint i, len;
     gint* orders;

data/ext/gtk2/rbgtktreeselection.c

@@ -15,27 +15,20 @@
 #define RVAL2TREEMODEL(s) (GTK_TREE_MODEL(RVAL2GOBJ(s)))
 
 static VALUE
-treeselection_set_mode(self, type)
-    VALUE self, type;
+treeselection_set_mode(VALUE self, VALUE type)
 {
     gtk_tree_selection_set_mode(_SELF(self), RVAL2GENUM(type, GTK_TYPE_SELECTION_MODE));
     return self;
 }
 
 static VALUE
-treeselection_get_mode(self)
-    VALUE self;
+treeselection_get_mode(VALUE self)
 {
     return GENUM2RVAL(gtk_tree_selection_get_mode(_SELF(self)), GTK_TYPE_SELECTION_MODE);
 }
 
 static gboolean
-selection_func(selection, model, path, path_currently_selected, func)
-    GtkTreeSelection* selection;
-    GtkTreeModel* model;
-    GtkTreePath* path;
-    gboolean path_currently_selected;
-    gpointer func;
+selection_func(GtkTreeSelection *selection, GtkTreeModel *model, GtkTreePath *path, gboolean path_currently_selected, gpointer func)
 {
     return RVAL2CBOOL(rb_funcall((VALUE)func, id_call, 4, 
                             GOBJ2RVAL(selection),
@@ -45,8 +38,7 @@ selection_func(selection, model, path, path_currently_selected, func)
 }
 
 static VALUE
-treeselection_set_select_function(self)
-    VALUE self;
+treeselection_set_select_function(VALUE self)
 {
     volatile VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -62,15 +54,13 @@ gpointer    gtk_tree_selection_get_user_data
 */
 
 static VALUE
-treeselection_get_tree_view(self)
-    VALUE self;
+treeselection_get_tree_view(VALUE self)
 {
     return GOBJ2RVAL(gtk_tree_selection_get_tree_view(_SELF(self)));
 }
 
 static VALUE
-treeselection_get_selected(self)
-    VALUE self;
+treeselection_get_selected(VALUE self)
 {
     GtkTreeIter iter;
     GtkTreeModel* model;
@@ -80,11 +70,7 @@ treeselection_get_selected(self)
 }
 
 static void
-foreach_func(model, path, iter, data)
-    GtkTreeModel* model;
-    GtkTreePath* path;
-    GtkTreeIter* iter;
-    gpointer data;
+foreach_func(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
 {
     iter->user_data3 = model;
     rb_funcall((VALUE)data, id_call, 3, GOBJ2RVAL(model), 
@@ -92,8 +78,7 @@ foreach_func(model, path, iter, data)
 }
 
 static VALUE
-treeselection_selected_foreach(self)
-    VALUE self;
+treeselection_selected_foreach(VALUE self)
 {
     volatile VALUE func = rb_block_proc();
     gtk_tree_selection_selected_foreach(_SELF(self), 
@@ -103,70 +88,61 @@ treeselection_selected_foreach(self)
 }
 
 static VALUE
-treeselection_select_path(self, path)
-    VALUE self, path;
+treeselection_select_path(VALUE self, VALUE path)
 {
     gtk_tree_selection_select_path(_SELF(self), RVAL2GTKTREEPATH(path));
     return self;
 }
 
 static VALUE
-treeselection_unselect_path(self, path)
-    VALUE self, path;
+treeselection_unselect_path(VALUE self, VALUE path)
 {
     gtk_tree_selection_unselect_path(_SELF(self), RVAL2GTKTREEPATH(path));
     return self;
 }
 
 static VALUE
-treeselection_path_is_selected(self, path)
-    VALUE self, path;
+treeselection_path_is_selected(VALUE self, VALUE path)
 {
     return CBOOL2RVAL(gtk_tree_selection_path_is_selected(_SELF(self), RVAL2GTKTREEPATH(path)));
 }
 
 static VALUE
-treeselection_select_iter(self, iter)
-    VALUE self, iter;
+treeselection_select_iter(VALUE self, VALUE iter)
 {
     gtk_tree_selection_select_iter(_SELF(self), RVAL2GTKTREEITER(iter));
     return self;
 }
 
 static VALUE
-treeselection_unselect_iter(self, iter)
-    VALUE self, iter;
+treeselection_unselect_iter(VALUE self, VALUE iter)
 {
     gtk_tree_selection_unselect_iter(_SELF(self), RVAL2GTKTREEITER(iter));
     return self;
 }
 
 static VALUE
-treeselection_iter_is_selected(self, iter)
-    VALUE self, iter;
+treeselection_iter_is_selected(VALUE self, VALUE iter)
 {
     return CBOOL2RVAL(gtk_tree_selection_iter_is_selected(_SELF(self), RVAL2GTKTREEITER(iter)));
 }
 
 static VALUE
-treeselection_select_all(self)
-    VALUE self;
+treeselection_select_all(VALUE self)
 {
     gtk_tree_selection_select_all(_SELF(self));
     return self;
 }
 
 static VALUE
-treeselection_unselect_all(self)
-    VALUE self;
+treeselection_unselect_all(VALUE self)
 {
     gtk_tree_selection_unselect_all(_SELF(self));
     return self;
 }
 
 static VALUE
-treeselection_select_range(self, start_path, end_path)
-    VALUE self, start_path, end_path;
+treeselection_select_range(VALUE self, VALUE start_path, VALUE end_path)
 {
     gtk_tree_selection_select_range(_SELF(self), RVAL2GTKTREEPATH(start_path), 
                                     RVAL2GTKTREEPATH(end_path));
@@ -175,8 +151,7 @@ treeselection_select_range(self, start_path, end_path)
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-treeselection_get_selected_rows(self)
-    VALUE self;
+treeselection_get_selected_rows(VALUE self)
 {
     GtkTreeModel* model;
     GList* list = gtk_tree_selection_get_selected_rows(_SELF(self), &model);
@@ -187,15 +162,13 @@ treeselection_get_selected_rows(self)
 }
 
 static VALUE
-treeselection_count_selected_rows(self)
-    VALUE self;
+treeselection_count_selected_rows(VALUE self)
 {
     return INT2NUM(gtk_tree_selection_count_selected_rows(_SELF(self)));
 }
 
 static VALUE
-treeselection_unselect_range(self, start_path, end_path)
-    VALUE self, start_path, end_path;
+treeselection_unselect_range(VALUE self, VALUE start_path, VALUE end_path)
 {
     gtk_tree_selection_unselect_range(_SELF(self), RVAL2GTKTREEPATH(start_path), 
                                       RVAL2GTKTREEPATH(end_path));