gtk2 0.90.7 → 0.90.8

data/ext/gtk2/rbgtktoolbutton.c

@@ -14,10 +14,7 @@
 #if GTK_CHECK_VERSION(2,4,0)
 #define _SELF(self) (GTK_TOOL_BUTTON(RVAL2GOBJ(self)))
 static VALUE
-toolbutton_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+toolbutton_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE obj, label;
     GtkToolItem* item;

data/ext/gtk2/rbgtktoolitem.c

@@ -14,46 +14,38 @@
 #if GTK_CHECK_VERSION(2,4,0)
 #define _SELF(self) (GTK_TOOL_ITEM(RVAL2GOBJ(self)))
 static VALUE
-toolitem_initialize(self)
-    VALUE self;
+toolitem_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_tool_item_new());
     return Qnil;
 }
 
 static VALUE
-toolitem_set_homogeneous(self, homogeneous)
-    VALUE self, homogeneous;
+toolitem_set_homogeneous(VALUE self, VALUE homogeneous)
 {
     gtk_tool_item_set_homogeneous(_SELF(self), RVAL2CBOOL(homogeneous));
     return self;
 }
 static VALUE
-toolitem_get_homogeneous(self)
-    VALUE self;
+toolitem_get_homogeneous(VALUE self)
 {
     return CBOOL2RVAL(gtk_tool_item_get_homogeneous(_SELF(self)));
 }
 
 static VALUE
-toolitem_set_expand(self, expand)
-    VALUE self, expand;
+toolitem_set_expand(VALUE self, VALUE expand)
 {
     gtk_tool_item_set_expand(_SELF(self), RVAL2CBOOL(expand));
     return self;
 }
 static VALUE
-toolitem_get_expand(self)
-    VALUE self;
+toolitem_get_expand(VALUE self)
 {
     return CBOOL2RVAL(gtk_tool_item_get_expand(_SELF(self)));
 }
 
 static VALUE
-toolitem_set_tooltip(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+toolitem_set_tooltip(int argc, VALUE *argv, VALUE self)
 {
     VALUE tooltip, tip_text, tip_private;
 
@@ -66,64 +58,55 @@ toolitem_set_tooltip(argc, argv, self)
 }
 
 static VALUE
-toolitem_set_use_drag_window(self, use_drag_window)
-    VALUE self, use_drag_window;
+toolitem_set_use_drag_window(VALUE self, VALUE use_drag_window)
 {
     gtk_tool_item_set_use_drag_window(_SELF(self), RVAL2CBOOL(use_drag_window));
     return self;
 }
 static VALUE
-toolitem_get_use_drag_window(self)
-    VALUE self;
+toolitem_get_use_drag_window(VALUE self)
 {
     return CBOOL2RVAL(gtk_tool_item_get_use_drag_window(_SELF(self)));
 }
 
 static VALUE
-toolitem_get_icon_size(self)
-    VALUE self;
+toolitem_get_icon_size(VALUE self)
 {
     return GENUM2RVAL(gtk_tool_item_get_icon_size(_SELF(self)), GTK_TYPE_ICON_SIZE);
 }
 
 static VALUE
-toolitem_get_orientation(self)
-    VALUE self;
+toolitem_get_orientation(VALUE self)
 {
     return GENUM2RVAL(gtk_tool_item_get_orientation(_SELF(self)), GTK_TYPE_ORIENTATION);
 }
 
 static VALUE
-toolitem_get_toolbar_style(self)
-    VALUE self;
+toolitem_get_toolbar_style(VALUE self)
 {
     return GENUM2RVAL(gtk_tool_item_get_toolbar_style(_SELF(self)), GTK_TYPE_TOOLBAR_STYLE);
 }
 
 static VALUE
-toolitem_get_relief_style(self)
-    VALUE self;
+toolitem_get_relief_style(VALUE self)
 {
     return GENUM2RVAL(gtk_tool_item_get_relief_style(_SELF(self)), GTK_TYPE_RELIEF_STYLE);
 }
 
 static VALUE
-toolitem_retrieve_proxy_menu_item(self)
-    VALUE self;
+toolitem_retrieve_proxy_menu_item(VALUE self)
 {
     return GOBJ2RVAL(gtk_tool_item_retrieve_proxy_menu_item(_SELF(self)));
 }
 
 static VALUE
-toolitem_get_proxy_menu_item(self, menu_item_id)
-    VALUE self, menu_item_id;
+toolitem_get_proxy_menu_item(VALUE self, VALUE menu_item_id)
 {
     return GOBJ2RVAL(gtk_tool_item_get_proxy_menu_item(_SELF(self), RVAL2CSTR(menu_item_id)));
 }
 
 static VALUE
-toolitem_set_proxy_menu_item(self, menu_item_id, menu_item)
-    VALUE self, menu_item_id, menu_item;
+toolitem_set_proxy_menu_item(VALUE self, VALUE menu_item_id, VALUE menu_item)
 {
     gtk_tool_item_set_proxy_menu_item(_SELF(self), RVAL2CSTR(menu_item_id),
                                       GTK_WIDGET(RVAL2GOBJ(menu_item)));
@@ -147,8 +130,7 @@ gboolean    gtk_tool_item_get_is_important  (GtkToolItem *tool_item);
 */
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-toolitem_rebuild_menu(self)
-    VALUE self;
+toolitem_rebuild_menu(VALUE self)
 {
     gtk_tool_item_rebuild_menu(_SELF(self));
     return self;

data/ext/gtk2/rbgtktooltip.c

@@ -20,40 +20,35 @@
 #define _SELF(self) (RVAL2GOBJ(self))
 
 static VALUE
-tooltip_set_markup(self, markup)
-    VALUE self, markup;
+tooltip_set_markup(VALUE self, VALUE markup)
 {
     gtk_tooltip_set_markup(_SELF(self), RVAL2CSTR(markup));
     return self;
 }
 
 static VALUE
-tooltip_set_text(self, text)
-    VALUE self, text;
+tooltip_set_text(VALUE self, VALUE text)
 {
     gtk_tooltip_set_text(_SELF(self), RVAL2CSTR(text));
     return self;
 }
 
 static VALUE
-tooltip_set_icon(self, icon)
-    VALUE self, icon;
+tooltip_set_icon(VALUE self, VALUE icon)
 {
     gtk_tooltip_set_icon(_SELF(self), GDK_PIXBUF(RVAL2GOBJ(icon)));
     return self;
 }
 
 static VALUE
-tooltip_set_icon_from_stock(self, stock_id, size)
-    VALUE self, stock_id, size;
+tooltip_set_icon_from_stock(VALUE self, VALUE stock_id, VALUE size)
 {
     gtk_tooltip_set_icon_from_stock(_SELF(self), rb_id2name(SYM2ID(stock_id)), RVAL2GENUM(size, GTK_TYPE_ICON_SIZE));
     return self;
 }
 
 static VALUE
-tooltip_set_custom(self, custom_widget)
-    VALUE self, custom_widget;
+tooltip_set_custom(VALUE self, VALUE custom_widget)
 {
     gtk_tooltip_set_custom(_SELF(self), GTK_WIDGET(RVAL2GOBJ(custom_widget)));
     return self;

data/ext/gtk2/rbgtktooltips.c

@@ -20,32 +20,28 @@
 #define _SELF(self) (GTK_TOOLTIPS(RVAL2GOBJ(self)))
 
 static VALUE
-ttips_initialize(self)
-    VALUE self;
+ttips_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_tooltips_new());
     return Qnil;
 }
 
 static VALUE
-ttips_enable(self)
-    VALUE self;
+ttips_enable(VALUE self)
 {
     gtk_tooltips_enable(_SELF(self));
     return self;
 }
 
 static VALUE
-ttips_disable(self)
-    VALUE self;
+ttips_disable(VALUE self)
 {
     gtk_tooltips_disable(_SELF(self));
     return self;
 }
 
 static VALUE
-ttips_set_tip(self, win, text, priv)
-    VALUE self, win, text, priv;
+ttips_set_tip(VALUE self, VALUE win, VALUE text, VALUE priv)
 {
     gtk_tooltips_set_tip(_SELF(self),
 			 GTK_WIDGET(RVAL2GOBJ(win)),
@@ -56,8 +52,7 @@ ttips_set_tip(self, win, text, priv)
 }
 
 static VALUE
-ttips_s_data_get(self, widget)
-    VALUE self, widget;
+ttips_s_data_get(VALUE self, VALUE widget)
 {
     GtkTooltipsData* data = gtk_tooltips_data_get(GTK_WIDGET(RVAL2GOBJ(widget)));
 
@@ -66,8 +61,7 @@ ttips_s_data_get(self, widget)
 }
 
 static VALUE
-ttips_force_window(self)
-    VALUE self;
+ttips_force_window(VALUE self)
 {
     gtk_tooltips_force_window(_SELF(self));
     return self;
@@ -75,8 +69,7 @@ ttips_force_window(self)
 
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-ttips_s_get_info_from_tip_window(self, window)
-    VALUE self, window;
+ttips_s_get_info_from_tip_window(VALUE self, VALUE window)
 {
     GtkTooltips* tooltips;
     GtkWidget* current_widget;

data/ext/gtk2/rbgtktreeiter.c

@@ -15,17 +15,14 @@
 #define _SELF(i) ((GtkTreeIter*)RVAL2BOXED(i, GTK_TYPE_TREE_ITER))
 
 void
-rbgtk_register_treeiter_set_value_func(gtype, func)
-    GType gtype;
-    rbgtkiter_set_value_func func;
+rbgtk_register_treeiter_set_value_func(GType gtype, rbgtkiter_set_value_func func)
 {
     rb_hash_aset(treeiter_set_value_table, INT2NUM(gtype), 
                  Data_Wrap_Struct(rb_cData, NULL, NULL, func));
 }
 
 static VALUE
-treeiter_first(self)
-    VALUE self;
+treeiter_first(VALUE self)
 {
     GtkTreeIter* iter = _SELF(self);
     GtkTreeModel* model = (GtkTreeModel*)iter->user_data3;
@@ -35,8 +32,7 @@ treeiter_first(self)
 }
 
 static VALUE
-treeiter_next(self)
-    VALUE self;
+treeiter_next(VALUE self)
 {
     GtkTreeIter* iter = _SELF(self);
     GtkTreeModel* model = (GtkTreeModel*)iter->user_data3;
@@ -50,8 +46,7 @@ treeiter_next(self)
 }
 
 static VALUE
-treeiter_get_value(self, column)
-    VALUE self, column;
+treeiter_get_value(VALUE self, VALUE column)
 {
     GValue value = {0, };
     GtkTreeIter* iter = _SELF(self);
@@ -67,8 +62,7 @@ treeiter_get_value(self, column)
 }
 
 static VALUE
-treeiter_children(self)
-    VALUE self;
+treeiter_children(VALUE self)
 {
     GtkTreeIter child;
     GtkTreeIter* iter = _SELF(self);
@@ -79,8 +73,7 @@ treeiter_children(self)
 }
 
 static VALUE
-treeiter_get_path(self)
-    VALUE self;
+treeiter_get_path(VALUE self)
 {
     VALUE retval = Qnil;
     GtkTreeIter* iter = _SELF(self);
@@ -92,8 +85,7 @@ treeiter_get_path(self)
 }
 
 static VALUE
-treeiter_has_child(self)
-    VALUE self;
+treeiter_has_child(VALUE self)
 {
     GtkTreeIter* iter = _SELF(self);
     GtkTreeModel* model = (GtkTreeModel*)iter->user_data3;
@@ -101,8 +93,7 @@ treeiter_has_child(self)
 }
 
 static VALUE
-treeiter_n_children(self)
-    VALUE self;
+treeiter_n_children(VALUE self)
 {
     GtkTreeIter* iter = _SELF(self);
     GtkTreeModel* model = (GtkTreeModel*)iter->user_data3;
@@ -110,8 +101,7 @@ treeiter_n_children(self)
 }
 
 static VALUE
-treeiter_nth_child(self, n)
-    VALUE self, n;
+treeiter_nth_child(VALUE self, VALUE n)
 {
     GtkTreeIter child;
     GtkTreeIter* iter = _SELF(self);
@@ -122,8 +112,7 @@ treeiter_nth_child(self, n)
 }
 
 static VALUE
-treeiter_parent(self)
-    VALUE self;
+treeiter_parent(VALUE self)
 {
     GtkTreeIter parent;
     GtkTreeIter* iter = _SELF(self);
@@ -134,8 +123,7 @@ treeiter_parent(self)
 }
 
 static VALUE
-treeiter_set_value(self, column, value)
-    VALUE self, column, value;
+treeiter_set_value(VALUE self, VALUE column, VALUE value)
 {
     GtkTreeIter* iter = _SELF(self);
     GtkTreeModel* model = (GtkTreeModel*)iter->user_data3;
@@ -159,16 +147,14 @@ treeiter_set_value(self, column, value)
 }
 
 static VALUE
-treeiter_set_value_eql(self, column, value)
-    VALUE self, column, value;
+treeiter_set_value_eql(VALUE self, VALUE column, VALUE value)
 {
     treeiter_set_value(self, column, value);
     return value;
 }
 
 static VALUE
-treeiter_eql(self, other)
-    VALUE self, other;
+treeiter_eql(VALUE self, VALUE other)
 {
     gint i, num1, num2;
     GtkTreeIter* iter1 = _SELF(self);
@@ -221,8 +207,7 @@ treeiter_eql(self, other)
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-treeiter_to_string(self)
-    VALUE self;
+treeiter_to_string(VALUE self)
 {
     GtkTreeIter* iter = _SELF(self);
     GtkTreeModel* model = (GtkTreeModel*)iter->user_data3;

data/ext/gtk2/rbgtktreemodel.c

@@ -14,30 +14,26 @@
 #define _SELF(s) (GTK_TREE_MODEL(RVAL2GOBJ(s)))
 
 static VALUE
-treemodel_get_flags(self)
-    VALUE self;
+treemodel_get_flags(VALUE self)
 {
     return GFLAGS2RVAL(gtk_tree_model_get_flags(_SELF(self)), GTK_TYPE_TREE_MODEL_FLAGS);
 }
 
 static VALUE
-treemodel_get_n_columns(self)
-    VALUE self;
+treemodel_get_n_columns(VALUE self)
 {
     return INT2NUM(gtk_tree_model_get_n_columns(_SELF(self)));
 }
 
 static VALUE
-treemodel_get_column_type(self, index)
-    VALUE self;
+treemodel_get_column_type(VALUE self, VALUE index)
 {
     return GTYPE2CLASS(gtk_tree_model_get_column_type(_SELF(self), 
                                                       NUM2INT(index)));
 }
 
 static VALUE
-treemodel_get_iter_first(self)
-    VALUE self;
+treemodel_get_iter_first(VALUE self)
 {
     VALUE val = Qnil;
     GtkTreeIter iter;
@@ -54,8 +50,7 @@ treemodel_get_iter_first(self)
 }
 
 static VALUE
-treemodel_get_iter(self, path)
-    VALUE self, path;
+treemodel_get_iter(VALUE self, VALUE path)
 {
     VALUE val = Qnil;
     GtkTreeIter iter;
@@ -80,8 +75,7 @@ treemodel_get_iter(self, path)
 }
 
 static VALUE
-treemodel_get_value(self, iter, column)
-    VALUE self, iter, column;
+treemodel_get_value(VALUE self, VALUE iter, VALUE column)
 {
     GValue value = {0, };
     VALUE ret = Qnil;
@@ -107,11 +101,7 @@ void        gtk_tree_model_get_valist (GtkTreeModel *tree_model,
 */
 
 static gboolean
-treemodel_foreach_func(model, path, iter, func)
-    GtkTreeModel* model;
-    GtkTreePath* path;
-    GtkTreeIter* iter;
-    gpointer func;
+treemodel_foreach_func(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer func)
 {
     iter->user_data3 = model;
     rb_yield(rb_ary_new3(3, GOBJ2RVAL(model), GTKTREEPATH2RVAL(path), GTKTREEITER2RVAL(iter)));
@@ -119,8 +109,7 @@ treemodel_foreach_func(model, path, iter, func)
 }
 
 static VALUE
-treemodel_foreach(self)
-    VALUE self;
+treemodel_foreach(VALUE self)
 {
     gtk_tree_model_foreach(_SELF(self), 
                            (GtkTreeModelForeachFunc)treemodel_foreach_func, 
@@ -129,40 +118,35 @@ treemodel_foreach(self)
 }
 
 static VALUE
-treemodel_row_changed(self, path, iter)
-    VALUE self, path, iter;
+treemodel_row_changed(VALUE self, VALUE path, VALUE iter)
 {
     gtk_tree_model_row_changed(_SELF(self), RVAL2GTKTREEPATH(path), RVAL2GTKTREEITER(iter));
     return self;
 }
 
 static VALUE
-treemodel_row_inserted(self, path, iter)
-    VALUE self, path, iter;
+treemodel_row_inserted(VALUE self, VALUE path, VALUE iter)
 {
     gtk_tree_model_row_inserted(_SELF(self), RVAL2GTKTREEPATH(path), RVAL2GTKTREEITER(iter));
     return self;
 }
 
 static VALUE
-treemodel_row_has_child_toggled(self, path, iter)
-    VALUE self, path, iter;
+treemodel_row_has_child_toggled(VALUE self, VALUE path, VALUE iter)
 {
     gtk_tree_model_row_has_child_toggled(_SELF(self), RVAL2GTKTREEPATH(path), RVAL2GTKTREEITER(iter));
     return self;
 }
 
 static VALUE
-treemodel_row_deleted(self, path)
-    VALUE self, path;
+treemodel_row_deleted(VALUE self, VALUE path)
 {
     gtk_tree_model_row_deleted(_SELF(self), RVAL2GTKTREEPATH(path));
     return self;
 }
 
 static VALUE
-treemodel_rows_reordered(self, path, iter, new_orders)
-    VALUE self, path, iter, new_orders;
+treemodel_rows_reordered(VALUE self, VALUE path, VALUE iter, VALUE new_orders)
 {
     gint i, len;
     gint* orders;
@@ -181,16 +165,13 @@ treemodel_rows_reordered(self, path, iter, new_orders)
 }
 
 static VALUE
-treemodel_iter_is_valid(self, iter)
-    VALUE self, iter;
+treemodel_iter_is_valid(VALUE self, VALUE iter)
 {
     return Qtrue;
 }
 
 static VALUE
-signal_func(num, values)
-    guint num;
-    const GValue* values;
+signal_func(guint num, const GValue *values)
 {
     GtkTreeModel* model = g_value_get_object(&values[0]);
     GtkTreePath* path = g_value_get_boxed(&values[1]);
@@ -201,9 +182,7 @@ signal_func(num, values)
 }
 
 static VALUE
-signal_rows_reordered_func(num, values)
-    guint num;
-    const GValue* values;
+signal_rows_reordered_func(guint num, const GValue *values)
 {
     GtkTreeModel* model = g_value_get_object(&values[0]);
     GtkTreePath* path = g_value_get_boxed(&values[1]);