gtk2 0.90.7 → 0.90.8

data/ext/gtk2/rbgtkcolorbutton.c

@@ -14,10 +14,7 @@
 #if GTK_CHECK_VERSION(2,4,0)
 
 static VALUE
-colorbutton_initialize(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+colorbutton_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE color;
     GtkWidget* widget;

data/ext/gtk2/rbgtkcolorsel.c

@@ -19,39 +19,34 @@
 static VALUE gColorSel;
 
 static VALUE
-colorsel_initialize(self)
-    VALUE self;
+colorsel_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_color_selection_new());
     return Qnil;
 }
 
 static VALUE
-colorsel_get_previous_alpha(self)
-    VALUE self;
+colorsel_get_previous_alpha(VALUE self)
 {
     return INT2NUM(gtk_color_selection_get_previous_alpha(_SELF(self)));
 }
 
 static VALUE
-colorsel_set_previous_alpha(self, alpha)
-    VALUE self, alpha;
+colorsel_set_previous_alpha(VALUE self, VALUE alpha)
 {
     gtk_color_selection_set_previous_alpha(_SELF(self), NUM2INT(alpha));
     return self;
 }
 
 static VALUE
-colorsel_set_previous_color(self, color)
-    VALUE self, color;
+colorsel_set_previous_color(VALUE self, VALUE color)
 {
     gtk_color_selection_set_previous_color(_SELF(self), RVAL2GDKCOLOR(color));
     return self;
 }
 
 static VALUE
-colorsel_get_previous_color(self)
-    VALUE self;
+colorsel_get_previous_color(VALUE self)
 {
     GdkColor color;
     gtk_color_selection_get_previous_color(_SELF(self), &color);
@@ -59,15 +54,13 @@ colorsel_get_previous_color(self)
 }
 
 static VALUE
-colorsel_is_adjusting(self)
-    VALUE self;
+colorsel_is_adjusting(VALUE self)
 {
     return CBOOL2RVAL(gtk_color_selection_is_adjusting(_SELF(self)));
 }
 
 static VALUE
-colorsel_s_palette_from_string(self, str)
-    VALUE self, str;
+colorsel_s_palette_from_string(VALUE self, VALUE str)
 {
     GdkColor* gcolors;
     gint i, n_colors;
@@ -86,10 +79,7 @@ colorsel_s_palette_from_string(self, str)
 }
 
 static VALUE
-colorsel_s_palette_to_string(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+colorsel_s_palette_to_string(int argc, VALUE *argv, VALUE self)
 {
     GdkColor* gcolors;
     GdkColor* gcolor;
@@ -115,10 +105,7 @@ colorsel_s_palette_to_string(argc, argv, self)
 
 #if GTK_CHECK_VERSION(2,2,0)
 static void
-screen_func(screen, colors, n_colors)
-    GdkScreen* screen;
-    const GdkColor* colors;
-    gint n_colors;
+screen_func(GdkScreen *screen, const GdkColor *colors, gint n_colors)
 {
     int i;
     VALUE func = rb_cvar_get(gColorSel, rb_intern("__palette_proc__"));
@@ -131,8 +118,7 @@ screen_func(screen, colors, n_colors)
 }
 
 static VALUE
-colorsel_s_set_change_palette_hook(self)
-    VALUE self;
+colorsel_s_set_change_palette_hook(VALUE self)
 {
     VALUE func = rb_block_proc();
 

data/ext/gtk2/rbgtkcolorselectiondialog.c

@@ -19,10 +19,7 @@
 #define _SELF(s) (GTK_COLOR_SELECTION_DIALOG(RVAL2GOBJ(s)))
 
 static VALUE
-cdialog_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+cdialog_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE title;
     rb_scan_args(argc, argv, "01", &title);
@@ -31,29 +28,25 @@ cdialog_initialize(argc, argv, self)
 }
 
 static VALUE
-cdialog_get_colorsel(self)
-    VALUE self;
+cdialog_get_colorsel(VALUE self)
 {
     return GOBJ2RVAL(_SELF(self)->colorsel);
 }
 
 static VALUE
-cdialog_get_ok_button(self)
-    VALUE self;
+cdialog_get_ok_button(VALUE self)
 {
     return GOBJ2RVAL(_SELF(self)->ok_button);
 }
 
 static VALUE
-cdialog_get_cancel_button(self)
-    VALUE self;
+cdialog_get_cancel_button(VALUE self)
 {
     return GOBJ2RVAL(_SELF(self)->cancel_button);
 }
 
 static VALUE
-cdialog_get_help_button(self)
-    VALUE self;
+cdialog_get_help_button(VALUE self)
 {
     return GOBJ2RVAL(_SELF(self)->help_button);
 }

data/ext/gtk2/rbgtkcombo.c

@@ -17,8 +17,7 @@
 #ifndef GTK_DISABLE_DEPRECATED /* Since 2.4 */
 
 static VALUE
-combo_set_popdown_strings(self, ary)
-    VALUE self, ary;
+combo_set_popdown_strings(VALUE self, VALUE ary)
 {
     int i;
     GList *glist = NULL;
@@ -33,10 +32,7 @@ combo_set_popdown_strings(self, ary)
 }
 
 static VALUE
-combo_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+combo_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE ary;
     GtkWidget* widget = NULL; 
@@ -54,8 +50,7 @@ combo_initialize(argc, argv, self)
 }
 
 static VALUE
-combo_set_val_in_list(self, val, ok)
-    VALUE self, val, ok;
+combo_set_val_in_list(VALUE self, VALUE val, VALUE ok)
 {
     gtk_combo_set_value_in_list(GTK_COMBO(RVAL2GOBJ(self)),
 				RVAL2CBOOL(val), RVAL2CBOOL(ok));
@@ -63,8 +58,7 @@ combo_set_val_in_list(self, val, ok)
 }
 
 static VALUE
-combo_set_use_arrows(self, val)
-    VALUE self, val;
+combo_set_use_arrows(VALUE self, VALUE val)
 {
     gtk_combo_set_use_arrows(GTK_COMBO(RVAL2GOBJ(self)),
 			     RVAL2CBOOL(val));
@@ -72,8 +66,7 @@ combo_set_use_arrows(self, val)
 }
 
 static VALUE
-combo_set_use_arrows_always(self, val)
-    VALUE self, val;
+combo_set_use_arrows_always(VALUE self, VALUE val)
 {
     gtk_combo_set_use_arrows_always(GTK_COMBO(RVAL2GOBJ(self)),
                                     RVAL2CBOOL(val));
@@ -81,16 +74,14 @@ combo_set_use_arrows_always(self, val)
 }
 
 static VALUE
-combo_disable_activate(self)
-    VALUE self;
+combo_disable_activate(VALUE self)
 {
     gtk_combo_disable_activate(GTK_COMBO(RVAL2GOBJ(self)));
     return self;
 }
 
 static VALUE
-combo_entry(self)
-    VALUE self;
+combo_entry(VALUE self)
 {
     return GOBJ2RVAL(GTK_COMBO(RVAL2GOBJ(self))->entry);
 }

data/ext/gtk2/rbgtkcombobox.c

@@ -17,10 +17,7 @@
 #define RVAL2WIDGET(w) (GTK_WIDGET(RVAL2GOBJ(w)))
 
 static VALUE
-combobox_initialize(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+combobox_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE model_or_false;
     GtkWidget* widget;
@@ -57,8 +54,7 @@ void        gtk_combo_box_set_active        (GtkComboBox *combo_box,
 */
 
 static VALUE
-combobox_get_active_iter(self)
-    VALUE self;
+combobox_get_active_iter(VALUE self)
 {
     GtkTreeIter iter;
     VALUE val = Qnil;
@@ -71,8 +67,7 @@ combobox_get_active_iter(self)
 }
 
 static VALUE
-combobox_set_active_iter(self, iter)
-    VALUE self, iter;
+combobox_set_active_iter(VALUE self, VALUE iter)
 {
     gtk_combo_box_set_active_iter(_SELF(self), RVAL2GTKTREEITER(iter));
     return self;
@@ -86,32 +81,28 @@ void        gtk_combo_box_set_model         (GtkComboBox *combo_box,
 
 
 static VALUE
-combobox_append_text(self, text)
-    VALUE self, text;
+combobox_append_text(VALUE self, VALUE text)
 {
     gtk_combo_box_append_text(_SELF(self), RVAL2CSTR(text));
     return self;
 }
 
 static VALUE
-combobox_insert_text(self, position, text)
-    VALUE self, position, text;
+combobox_insert_text(VALUE self, VALUE position, VALUE text)
 {
     gtk_combo_box_insert_text(_SELF(self), NUM2INT(position), RVAL2CSTR(text));
     return self;
 }
 
 static VALUE
-combobox_prepend_text(self, text)
-    VALUE self, text;
+combobox_prepend_text(VALUE self, VALUE text)
 {
     gtk_combo_box_prepend_text(_SELF(self), RVAL2CSTR(text));
     return self;
 }
 
 static VALUE
-combobox_remove_text(self, position)
-    VALUE self, position;
+combobox_remove_text(VALUE self, VALUE position)
 {
     gtk_combo_box_remove_text(_SELF(self), NUM2INT(position));
     return self;
@@ -119,16 +110,14 @@ combobox_remove_text(self, position)
     
 
 static VALUE
-combobox_popup(self)
-    VALUE self;
+combobox_popup(VALUE self)
 {
     gtk_combo_box_popup(_SELF(self));
     return self;
 }
 
 static VALUE
-combobox_popdown(self)
-    VALUE self;
+combobox_popdown(VALUE self)
 {
     gtk_combo_box_popdown(_SELF(self));
     return self;
@@ -150,15 +139,13 @@ gint        gtk_combo_box_get_row_span_column
  */
 
 static VALUE
-combobox_get_active_text(self)
-    VALUE self;
+combobox_get_active_text(VALUE self)
 {
     return CSTR2RVAL_FREE(gtk_combo_box_get_active_text(_SELF(self)));
 }
 
 static VALUE
-combobox_get_popup_accessible(self)
-    VALUE self;
+combobox_get_popup_accessible(VALUE self)
 {
     return GOBJ2RVAL(gtk_combo_box_get_popup_accessible(_SELF(self)));
 }
@@ -169,10 +156,7 @@ GtkTreeViewRowSeparatorFunc gtk_combo_box_get_row_separator_func
 */
 
 static gboolean
-row_separator_func(model, iter, func)
-    GtkTreeModel* model;
-    GtkTreeIter* iter;
-    gpointer* func;
+row_separator_func(GtkTreeModel *model, GtkTreeIter *iter, gpointer *func)
 {  
     iter->user_data3 = model;
     return RVAL2CBOOL(rb_funcall((VALUE)func, id_call, 2, GOBJ2RVAL(model),
@@ -180,8 +164,7 @@ row_separator_func(model, iter, func)
 }
 
 static VALUE
-combobox_set_row_separator_func(self)
-    VALUE self;
+combobox_set_row_separator_func(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -196,8 +179,7 @@ combobox_set_row_separator_func(self)
    call GLib::Object.set_property.
 */
 static VALUE
-combobox_set_focus_on_click(self, val)
-    VALUE self, val;
+combobox_set_focus_on_click(VALUE self, VALUE val)
 {
     gtk_combo_box_set_focus_on_click(_SELF(self), RVAL2CBOOL(val));
     return self;

data/ext/gtk2/rbgtkcomboboxentry.c

@@ -14,10 +14,7 @@
 #if GTK_CHECK_VERSION(2,4,0)
 
 static VALUE
-comboboxentry_initialize(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+comboboxentry_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE model_or_false, text_column;
     GtkWidget* widget;

data/ext/gtk2/rbgtkcontainer.c

@@ -25,15 +25,13 @@ static VALUE type_to_prop_setter_table;
 static VALUE type_to_prop_getter_table;
 
 static VALUE
-cont_is_resize_container(self)
-    VALUE self;
+cont_is_resize_container(VALUE self)
 {
     return CBOOL2RVAL(GTK_IS_RESIZE_CONTAINER(_SELF(self)));
 }
 
 static VALUE
-cont_remove(self, other)
-    VALUE self, other;
+cont_remove(VALUE self, VALUE other)
 {
     G_CHILD_REMOVE(self, other);
     gtk_container_remove(_SELF(self), GTK_WIDGET(RVAL2GOBJ(other)));
@@ -41,18 +39,14 @@ cont_remove(self, other)
 }
 
 static VALUE
-cont_check_resize(self)
-    VALUE self;
+cont_check_resize(VALUE self)
 {
     gtk_container_check_resize(_SELF(self));
     return self;
 }
 
 static VALUE
-cont_foreach(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+cont_foreach(int argc, VALUE *argv, VALUE self)
 {
     VALUE callback;
 
@@ -65,10 +59,7 @@ cont_foreach(argc, argv, self)
 }
 
 static VALUE
-cont_forall(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+cont_forall(int argc, VALUE *argv, VALUE self)
 {
     VALUE callback;
 
@@ -81,15 +72,13 @@ cont_forall(argc, argv, self)
 }
 
 static VALUE
-cont_get_children(self)
-    VALUE self;
+cont_get_children(VALUE self)
 {
    return GLIST2ARYF(gtk_container_get_children(_SELF(self)));
 }
 
 static VALUE
-cont_set_reallocate_redraws(self, needs_redraws)
-    VALUE self, needs_redraws;
+cont_set_reallocate_redraws(VALUE self, VALUE needs_redraws)
 {
     gtk_container_set_reallocate_redraws(_SELF(self), RVAL2CBOOL(needs_redraws));
     return self;
@@ -97,16 +86,14 @@ cont_set_reallocate_redraws(self, needs_redraws)
 
 
 static VALUE
-cont_set_focus_child(self, child)
-    VALUE self, child;
+cont_set_focus_child(VALUE self, VALUE child)
 {
     gtk_container_set_focus_child(_SELF(self), GTK_WIDGET(RVAL2GOBJ(child)));
     return self;
 }
 
 static VALUE
-cont_set_focus_vadjustment(self, adjustment)
-    VALUE self, adjustment;
+cont_set_focus_vadjustment(VALUE self, VALUE adjustment)
 {
     gtk_container_set_focus_vadjustment(_SELF(self),
                                         NIL_P(adjustment) ? NULL : GTK_ADJUSTMENT(RVAL2GOBJ(adjustment)));
@@ -114,8 +101,7 @@ cont_set_focus_vadjustment(self, adjustment)
 }
 
 static VALUE
-cont_set_focus_hadjustment(self, adjustment)
-    VALUE self, adjustment;
+cont_set_focus_hadjustment(VALUE self, VALUE adjustment)
 {
     gtk_container_set_focus_hadjustment(_SELF(self),
                                         NIL_P(adjustment) ? NULL : GTK_ADJUSTMENT(RVAL2GOBJ(adjustment)));
@@ -123,32 +109,28 @@ cont_set_focus_hadjustment(self, adjustment)
 }
 
 static VALUE
-cont_get_focus_vadjustment(self)
-    VALUE self;
+cont_get_focus_vadjustment(VALUE self)
 {
     GtkAdjustment* adj = gtk_container_get_focus_vadjustment(_SELF(self));
     return adj ? GOBJ2RVAL(adj) : Qnil;
 }
 
 static VALUE
-cont_get_focus_hadjustment(self)
-    VALUE self;
+cont_get_focus_hadjustment(VALUE self)
 {
     GtkAdjustment* adj = gtk_container_get_focus_hadjustment(_SELF(self));
     return adj ? GOBJ2RVAL(adj) : Qnil;
 }
 
 static VALUE
-cont_get_resize_children(self)
-    VALUE self;
+cont_get_resize_children(VALUE self)
 {
     gtk_container_resize_children(_SELF(self));
     return self;
 }
 
 static VALUE
-cont_get_child_type(self)
-    VALUE self;
+cont_get_child_type(VALUE self)
 {
     return GTYPE2CLASS(gtk_container_child_type(_SELF(self)));
 }
@@ -165,10 +147,7 @@ void        gtk_container_child_set         (GtkContainer *container,
 */
 
 void
-rbgtkcontainer_register_child_property_setter(gtype, name, func)
-    GType gtype;
-    const char* name;
-    RValueToGValueFunc func;
+rbgtkcontainer_register_child_property_setter(GType gtype, const char *name, RValueToGValueFunc func)
 {
     GObjectClass* oclass;
     GParamSpec* pspec;
@@ -189,10 +168,7 @@ rbgtkcontainer_register_child_property_setter(gtype, name, func)
 }
 
 void
-rbgtkcontainer_register_child_property_getter(gtype, name, func)
-    GType gtype;
-    const char* name;
-    GValueToRValueFunc func;
+rbgtkcontainer_register_child_property_getter(GType gtype, const char *name, GValueToRValueFunc func)
 {
     GObjectClass* oclass;
     GParamSpec* pspec;
@@ -211,8 +187,7 @@ rbgtkcontainer_register_child_property_getter(gtype, name, func)
 }
 
 static VALUE
-cont_child_get_property(self, child, prop_name)
-    VALUE self, child, prop_name;
+cont_child_get_property(VALUE self, VALUE child, VALUE prop_name)
 {
     GParamSpec* pspec;
     const char* name;
@@ -256,8 +231,7 @@ cont_child_get_property(self, child, prop_name)
 }
 
 static VALUE
-cont_child_set_property(self, child, prop_name, val)
-    VALUE self, child, prop_name, val;
+cont_child_set_property(VALUE self, VALUE child, VALUE prop_name, VALUE val)
 {
     GParamSpec* pspec;
     const char* name;
@@ -306,10 +280,7 @@ cont_child_set_property(self, child, prop_name, val)
 }
 
 static VALUE
-cont_add(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+cont_add(int argc, VALUE *argv, VALUE self)
 {
     VALUE other, properties;
     GtkWidget *child;
@@ -353,8 +324,7 @@ void        gtk_container_child_set_valist  (GtkContainer *container,
 */
 
 static VALUE
-cont_propagate_expose(self, child, event)
-    VALUE self, child, event;
+cont_propagate_expose(VALUE self, VALUE child, VALUE event)
 {
     gtk_container_propagate_expose(_SELF(self), GTK_WIDGET(RVAL2GOBJ(child)),
                                    (GdkEventExpose *)RVAL2GEV(event));
@@ -362,8 +332,7 @@ cont_propagate_expose(self, child, event)
 }
 
 static VALUE
-cont_get_focus_chain(self)
-    VALUE self;
+cont_get_focus_chain(VALUE self)
 {
     gboolean ret;
     GList *glist = NULL;
@@ -372,8 +341,7 @@ cont_get_focus_chain(self)
 }
 
 static VALUE
-cont_set_focus_chain(self, focusable_widgets) 
-    VALUE self, focusable_widgets;
+cont_set_focus_chain(VALUE self, VALUE focusable_widgets)
 {
     int i;
     GList *glist = NULL;
@@ -389,16 +357,14 @@ cont_set_focus_chain(self, focusable_widgets)
 }
 
 static VALUE
-cont_unset_focus_chain(self)
-    VALUE self;
+cont_unset_focus_chain(VALUE self)
 {
     gtk_container_unset_focus_chain(_SELF(self));
     return self;
 }
 
 static VALUE
-cont_s_child_property(self, property_name)
-     VALUE self, property_name;
+cont_s_child_property(VALUE self, VALUE property_name)
 {
     GObjectClass* oclass;
     const char* name;
@@ -425,10 +391,7 @@ cont_s_child_property(self, property_name)
 }
 
 static VALUE
-cont_s_install_child_property(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+cont_s_install_child_property(int argc, VALUE *argv, VALUE self)
 {
     const RGObjClassInfo* cinfo = rbgobj_lookup_class(self);
     GtkContainerClass* gclass;
@@ -452,10 +415,7 @@ cont_s_install_child_property(argc, argv, self)
 }
 
 static VALUE
-cont_s_child_properties(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+cont_s_child_properties(int argc, VALUE *argv, VALUE self)
 {
     GObjectClass* oclass = g_type_class_ref(CLASS2GTYPE(self));
     guint n_properties;
@@ -487,10 +447,7 @@ static GQuark q_ruby_setter;
 static GQuark q_ruby_getter;
 
 static VALUE
-cont_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+cont_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE params_hash;
     GObject* gobj;