gtk2 0.90.7 → 0.90.8

data/ext/gtk2/rbgtkscalebutton.c

@@ -22,10 +22,7 @@ static VALUE
 scalebutton_set_icons(VALUE self, VALUE icons);
 
 static VALUE
-scalebutton_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+scalebutton_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg1, arg2, arg3, arg4, arg5;
     GtkWidget *widget;
@@ -54,16 +51,14 @@ scalebutton_initialize(argc, argv, self)
 }
 
 static VALUE
-scalebutton_set_adjustment(self, adjustment)
-    VALUE self, adjustment;
+scalebutton_set_adjustment(VALUE self, VALUE adjustment)
 {
     gtk_scale_button_set_adjustment(_SELF(self), RVAL2GOBJ(adjustment));
     return self;
 }
 
 static VALUE
-scalebutton_set_icons(self, icons)
-    VALUE self, icons;
+scalebutton_set_icons(VALUE self, VALUE icons)
 {
     int i;
     gchar **icons_c = g_new0(gchar*, RARRAY_LEN(icons) + 1);
@@ -76,23 +71,20 @@ scalebutton_set_icons(self, icons)
 }
 
 static VALUE
-scalebutton_set_value(self, value)
-    VALUE self, value;
+scalebutton_set_value(VALUE self, VALUE value)
 {
     gtk_scale_button_set_value(_SELF(self), NUM2DBL(value));
     return self;
 }
 
 static VALUE
-scalebutton_get_adjustment(self)
-    VALUE self;
+scalebutton_get_adjustment(VALUE self)
 {
     return GOBJ2RVAL(gtk_scale_button_get_adjustment(_SELF(self)));
 }
 
 static VALUE
-scalebutton_get_value(self)
-    VALUE self;
+scalebutton_get_value(VALUE self)
 {
     return rb_float_new(gtk_scale_button_get_value(_SELF(self)));
 }

data/ext/gtk2/rbgtkscrolledwindow.c

@@ -17,10 +17,7 @@
 #define _SELF(self) (GTK_SCROLLED_WINDOW(RVAL2GOBJ(self)))
 
 static VALUE
-scwin_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+scwin_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg1, arg2;
     GtkAdjustment *h_adj = NULL;
@@ -36,8 +33,7 @@ scwin_initialize(argc, argv, self)
 }
 
 static VALUE
-scwin_set_policy(self, hpolicy, vpolicy)
-    VALUE self, hpolicy, vpolicy;
+scwin_set_policy(VALUE self, VALUE hpolicy, VALUE vpolicy)
 {
     gtk_scrolled_window_set_policy(_SELF(self),
                                    RVAL2GENUM(hpolicy, GTK_TYPE_POLICY_TYPE),
@@ -46,8 +42,7 @@ scwin_set_policy(self, hpolicy, vpolicy)
 }
 
 static VALUE
-scwin_get_policy(self)
-    VALUE self;
+scwin_get_policy(VALUE self)
 {
     GtkPolicyType hpolicy, vpolicy;
 
@@ -58,8 +53,7 @@ scwin_get_policy(self)
 }
 
 static VALUE
-scwin_add_with_viewport(self, other)
-    VALUE self, other;
+scwin_add_with_viewport(VALUE self, VALUE other)
 {
     gtk_scrolled_window_add_with_viewport(_SELF(self),
                                           GTK_WIDGET(RVAL2GOBJ(other)));
@@ -69,15 +63,13 @@ scwin_add_with_viewport(self, other)
 
 #if GTK_CHECK_VERSION(2,8,0)
 static VALUE
-scwin_get_hscrollbar(self)
-    VALUE self;
+scwin_get_hscrollbar(VALUE self)
 {
     return GOBJ2RVAL(gtk_scrolled_window_get_hscrollbar(_SELF(self)));
 }
 
 static VALUE
-scwin_get_vscrollbar(self)
-    VALUE self;
+scwin_get_vscrollbar(VALUE self)
 {
     return GOBJ2RVAL(gtk_scrolled_window_get_vscrollbar(_SELF(self)));
 }
@@ -85,8 +77,7 @@ scwin_get_vscrollbar(self)
 
 #if GTK_CHECK_VERSION(2,10,0)
 static VALUE
-scwin_set_placement(self, corner_type)
-    VALUE self, corner_type;
+scwin_set_placement(VALUE self, VALUE corner_type)
 {
     gtk_scrolled_window_set_placement(_SELF(self), 
                                       RVAL2GENUM(corner_type, GTK_TYPE_CORNER_TYPE));
@@ -94,16 +85,14 @@ scwin_set_placement(self, corner_type)
 }
 
 static VALUE
-scwin_unset_placement(self)
-    VALUE self;
+scwin_unset_placement(VALUE self)
 {
     gtk_scrolled_window_unset_placement(_SELF(self));
     return self;
 }
 
 static VALUE
-scwin_get_placement(self)
-    VALUE self;
+scwin_get_placement(VALUE self)
 {
     return GENUM2RVAL(gtk_scrolled_window_get_placement(_SELF(self)), 
                       GTK_TYPE_CORNER_TYPE);

data/ext/gtk2/rbgtkselection.c

@@ -19,10 +19,7 @@
 #define RVAL2WIDGET(w) (GTK_WIDGET(RVAL2GOBJ(w)))
 
 static VALUE
-gtkdrag_selection_owner_set(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+gtkdrag_selection_owner_set(int argc, VALUE *argv, VALUE self)
 {
     gboolean ret;
 
@@ -46,8 +43,7 @@ gtkdrag_selection_owner_set(argc, argv, self)
 }
 
 static VALUE
-gtkdrag_selection_add_target(self, widget, selection, target, info)
-    VALUE self, widget, selection, target, info;
+gtkdrag_selection_add_target(VALUE self, VALUE widget, VALUE selection, VALUE target, VALUE info)
 {
     gtk_selection_add_target(RVAL2WIDGET(widget), RVAL2ATOM(selection),
                              RVAL2ATOM(target), NUM2INT(info));
@@ -55,8 +51,7 @@ gtkdrag_selection_add_target(self, widget, selection, target, info)
 }
 
 static VALUE
-gtkdrag_selection_add_targets(self, widget, selection, targets)
-    VALUE self, widget, selection, targets;
+gtkdrag_selection_add_targets(VALUE self, VALUE widget, VALUE selection, VALUE targets)
 {
     gtk_selection_add_targets(RVAL2WIDGET(widget), 
                               RVAL2ATOM(selection),
@@ -65,16 +60,14 @@ gtkdrag_selection_add_targets(self, widget, selection, targets)
 }
 
 static VALUE
-gtkdrag_selection_clear_targets(self, widget, selection)
-    VALUE self, widget, selection;
+gtkdrag_selection_clear_targets(VALUE self, VALUE widget, VALUE selection)
 {
     gtk_selection_clear_targets(RVAL2WIDGET(widget), RVAL2ATOM(selection));
     return self;
 }
 
 static VALUE
-gtkdrag_selection_convert(self, widget, selection, target, time)
-    VALUE self, widget, selection, target, time;
+gtkdrag_selection_convert(VALUE self, VALUE widget, VALUE selection, VALUE target, VALUE time)
 {
     gboolean ret = gtk_selection_convert(RVAL2WIDGET(widget), 
                                          RVAL2ATOM(selection), RVAL2ATOM(target),
@@ -83,8 +76,7 @@ gtkdrag_selection_convert(self, widget, selection, target, time)
 }
 
 static VALUE
-gtkdrag_selection_remove_all(self, widget)
-    VALUE self, widget;
+gtkdrag_selection_remove_all(VALUE self, VALUE widget)
 {
     gtk_selection_remove_all(RVAL2WIDGET(widget));
     return self;
@@ -92,8 +84,7 @@ gtkdrag_selection_remove_all(self, widget)
 
 #if GTK_CHECK_VERSION(2,10,0)
 static VALUE
-targets_include_image(self, targets, writable)
-     VALUE self, targets, writable;
+targets_include_image(VALUE self, VALUE targets, VALUE writable)
 {
   gint i;
   gint len = RARRAY_LEN(targets);
@@ -107,8 +98,7 @@ targets_include_image(self, targets, writable)
 }
 
 static VALUE
-targets_include_text(self, targets)
-     VALUE self, targets;
+targets_include_text(VALUE self, VALUE targets)
 {
   gint i;
   gint len = RARRAY_LEN(targets);
@@ -120,8 +110,7 @@ targets_include_text(self, targets)
 }
 
 static VALUE
-targets_include_uri(self, targets)
-     VALUE self, targets;
+targets_include_uri(VALUE self, VALUE targets)
 {
   gint i;
   gint len = RARRAY_LEN(targets);
@@ -135,8 +124,7 @@ targets_include_uri(self, targets)
 }
 
 static VALUE
-targets_include_rich_text(self, targets, buffer)
-     VALUE self, targets, buffer;
+targets_include_rich_text(VALUE self, VALUE targets, VALUE buffer)
 {
   gint i;
   gint len = RARRAY_LEN(targets);

data/ext/gtk2/rbgtkselectiondata.c

@@ -59,9 +59,7 @@ rbgtk_atom2selectiondata(VALUE type, VALUE size, VALUE src, GdkAtom *gtype,
 }
 
 void
-rbgtk_atom2selectiondata_free(type, dat)
-    GdkAtom type;
-    void* dat;
+rbgtk_atom2selectiondata_free(GdkAtom type, void *dat)
 {
     if (type == GDK_SELECTION_TYPE_INTEGER ||
         type == GDK_SELECTION_TYPE_ATOM) {
@@ -73,37 +71,32 @@ rbgtk_atom2selectiondata_free(type, dat)
 /************************************************************************/
 
 static VALUE
-gtkselectiondata_selection(self)
-    VALUE self;
+gtkselectiondata_selection(VALUE self)
 {
     GdkAtom selection = _SELF(self)->selection;
     return BOXED2RVAL(&selection, GDK_TYPE_ATOM);
 }
 
 static VALUE
-gtkselectiondata_target(self)
-    VALUE self;
+gtkselectiondata_target(VALUE self)
 {
     return BOXED2RVAL(_SELF(self)->target, GDK_TYPE_ATOM);
 }
 
 static VALUE
-gtkselectiondata_type(self)
-    VALUE self;
+gtkselectiondata_type(VALUE self)
 {
     return BOXED2RVAL(_SELF(self)->type, GDK_TYPE_ATOM);
 }
 
 static VALUE
-gtkselectiondata_format(self)
-    VALUE self;
+gtkselectiondata_format(VALUE self)
 {
     return INT2NUM(_SELF(self)->format);
 }
 
 static VALUE
-gtkselectiondata_data(self)
-    VALUE self;
+gtkselectiondata_data(VALUE self)
 {
     return RBG_STRING_SET_UTF8_ENCODING(rb_str_new((const char*)_SELF(self)->data,
                                                    _SELF(self)->length));
@@ -111,8 +104,7 @@ gtkselectiondata_data(self)
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-gtkselectiondata_display(self)
-    VALUE self;
+gtkselectiondata_display(VALUE self)
 {
     return BOXED2RVAL(_SELF(self)->display, GDK_TYPE_DISPLAY);
 }
@@ -120,10 +112,7 @@ gtkselectiondata_display(self)
 
 /* Instance Methods */
 static VALUE
-gtkselectiondata_set(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+gtkselectiondata_set(int argc, VALUE *argv, VALUE self)
 {
     void* dat;
     VALUE type, src;
@@ -146,8 +135,7 @@ gtkselectiondata_set(argc, argv, self)
 }
     
 static VALUE
-gtkselectiondata_set_text(self, str)
-    VALUE self, str;
+gtkselectiondata_set_text(VALUE self, VALUE str)
 {
     gboolean ret;
     StringValue(str);
@@ -162,8 +150,7 @@ gtkselectiondata_set_text(self, str)
 }
 
 static VALUE
-gtkselectiondata_get_text(self)
-    VALUE self;
+gtkselectiondata_get_text(VALUE self)
 {
     VALUE ret = Qnil;
     guchar* text = gtk_selection_data_get_text(_SELF(self));
@@ -176,8 +163,7 @@ gtkselectiondata_get_text(self)
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-gtkselectiondata_set_pixbuf(self, pixbuf)
-    VALUE self, pixbuf;
+gtkselectiondata_set_pixbuf(VALUE self, VALUE pixbuf)
 {
     gboolean ret = gtk_selection_data_set_pixbuf(_SELF(self), 
                                                  GDK_PIXBUF(RVAL2GOBJ(pixbuf)));
@@ -188,15 +174,13 @@ gtkselectiondata_set_pixbuf(self, pixbuf)
 }
 
 static VALUE
-gtkselectiondata_get_pixbuf(self)
-    VALUE self;
+gtkselectiondata_get_pixbuf(VALUE self)
 {
     return GOBJ2RVAL(gtk_selection_data_get_pixbuf(_SELF(self)));
 }
 
 static VALUE
-gtkselectiondata_set_uris(self, uris)
-    VALUE self, uris;
+gtkselectiondata_set_uris(VALUE self, VALUE uris)
 {
     gboolean ret;
     gchar** guris;
@@ -223,8 +207,7 @@ gtkselectiondata_set_uris(self, uris)
 }
 
 static VALUE
-gtkselectiondata_get_uris(self)
-    VALUE self;
+gtkselectiondata_get_uris(VALUE self)
 {
     VALUE ary = rb_ary_new();
     gchar** uris = gtk_selection_data_get_uris(_SELF(self));
@@ -242,8 +225,7 @@ gtkselectiondata_get_uris(self)
 #endif
 
 static VALUE
-gtkselectiondata_get_targets(self)
-    VALUE self;
+gtkselectiondata_get_targets(VALUE self)
 {
     GdkAtom* targets;
     gint n_atoms;
@@ -262,30 +244,26 @@ gtkselectiondata_get_targets(self)
 }
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-gtkselectiondata_targets_include_image(self, writable)
-    VALUE self, writable;
+gtkselectiondata_targets_include_image(VALUE self, VALUE writable)
 {
     return CBOOL2RVAL(gtk_selection_data_targets_include_image(_SELF(self), RVAL2CBOOL(writable)));
 }
 #endif
 
 static VALUE
-gtkselectiondata_targets_include_text(self)
-    VALUE self;
+gtkselectiondata_targets_include_text(VALUE self)
 {
     return CBOOL2RVAL(gtk_selection_data_targets_include_text(_SELF(self)));
 }
 
 #if GTK_CHECK_VERSION(2,10,0)
 static VALUE
-gtkselectiondata_targets_include_uri(self)
-    VALUE self;
+gtkselectiondata_targets_include_uri(VALUE self)
 {
     return CBOOL2RVAL(gtk_selection_data_targets_include_uri(_SELF(self)));
 }
 static VALUE
-gtkselectiondata_targets_include_rich_text(self, buffer)
-    VALUE self, buffer;
+gtkselectiondata_targets_include_rich_text(VALUE self, VALUE buffer)
 {
     return CBOOL2RVAL(gtk_selection_data_targets_include_rich_text(_SELF(self),
                                                                    GTK_TEXT_BUFFER(RVAL2GOBJ(buffer))));

data/ext/gtk2/rbgtkseparatormenuitem.c

@@ -12,8 +12,7 @@
 #include "global.h"
 
 static VALUE
-smitem_initialize(self)
-    VALUE self;
+smitem_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_separator_menu_item_new());
     return Qnil;

data/ext/gtk2/rbgtkseparatortoolitem.c

@@ -14,8 +14,7 @@
 #if GTK_CHECK_VERSION(2,4,0)
 
 static VALUE
-separatortoolitem_initialize(self)
-    VALUE self;
+separatortoolitem_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_separator_tool_item_new());
     return Qnil;

data/ext/gtk2/rbgtksettings.c

@@ -15,16 +15,14 @@
 static VALUE prop_func_table;
 
 static VALUE
-settings_s_get_default(self)
-    VALUE self;
+settings_s_get_default(VALUE self)
 {
     return GOBJ2RVAL(gtk_settings_get_default());
 }
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-settings_s_get_for_screen(self, screen)
-    VALUE self, screen;
+settings_s_get_for_screen(VALUE self, VALUE screen)
 {
     return GOBJ2RVAL(gtk_settings_get_for_screen(GDK_SCREEN(RVAL2GOBJ(screen))));
 }
@@ -38,10 +36,7 @@ settings_s_get_for_screen(self, screen)
  * end
  */
 static gboolean
-rc_property_parser(pspec, rc_string, property_value)
-    const GParamSpec *pspec;
-    const GString *rc_string;
-    GValue *property_value;
+rc_property_parser(const GParamSpec *pspec, const GString *rc_string, GValue *property_value)
 {
     VALUE spec = GOBJ2RVAL((gpointer)pspec);
     VALUE func = rb_hash_aref(prop_func_table, spec);
@@ -57,8 +52,7 @@ rc_property_parser(pspec, rc_string, property_value)
 }
 
 static VALUE
-settings_s_install_property(self, spec)
-    VALUE self, spec;
+settings_s_install_property(VALUE self, VALUE spec)
 {
     GParamSpec* pspec = G_PARAM_SPEC(RVAL2GOBJ(spec));
     if (rb_block_given_p()){
@@ -72,8 +66,7 @@ settings_s_install_property(self, spec)
 }
 
 static VALUE
-settings_rc_property_parse_color(self, spec, str)
-    VALUE self, spec, str;
+settings_rc_property_parse_color(VALUE self, VALUE spec, VALUE str)
 {
     gboolean ret; 
     GValue prop = {0,};
@@ -90,8 +83,7 @@ settings_rc_property_parse_color(self, spec, str)
 }
 
 static VALUE
-settings_rc_property_parse_enum(self, spec, str)
-    VALUE self, spec, str;
+settings_rc_property_parse_enum(VALUE self, VALUE spec, VALUE str)
 {
     gboolean ret; 
     GValue prop = {0,};
@@ -109,8 +101,7 @@ settings_rc_property_parse_enum(self, spec, str)
 }
 
 static VALUE
-settings_rc_property_parse_flags(self, spec, str)
-    VALUE self, spec, str;
+settings_rc_property_parse_flags(VALUE self, VALUE spec, VALUE str)
 {
     gboolean ret; 
     GValue prop = {0,};
@@ -128,8 +119,7 @@ settings_rc_property_parse_flags(self, spec, str)
 }
 
 static VALUE
-settings_rc_property_parse_requisition(self, spec, str)
-    VALUE self, spec, str;
+settings_rc_property_parse_requisition(VALUE self, VALUE spec, VALUE str)
 {
     gboolean ret; 
     GValue prop = {0,};
@@ -148,8 +138,7 @@ settings_rc_property_parse_requisition(self, spec, str)
 }
 
 static VALUE
-settings_rc_property_parse_border(self, spec, str)
-    VALUE self, spec, str;
+settings_rc_property_parse_border(VALUE self, VALUE spec, VALUE str)
 {
     gboolean ret; 
     GValue prop = {0,};
@@ -168,8 +157,7 @@ settings_rc_property_parse_border(self, spec, str)
 }
 
 static VALUE
-settings_set_property_value(self, name, value, origin)
-    VALUE self, name, value, origin;
+settings_set_property_value(VALUE self, VALUE name, VALUE value, VALUE origin)
 {
     GtkSettingsValue svalue = { NULL, { 0, }, };
     g_value_init(&svalue.value, RVAL2GTYPE(value));