gtk2 0.90.7 → 0.90.8

data/ext/gtk2/rbgtkobject.c

@@ -26,8 +26,7 @@ GtkObject*  gtk_object_new                  (GtkType type,
 */
 
 static VALUE
-gobj_get_type_name(self)
-    VALUE self;
+gobj_get_type_name(VALUE self)
 {
     return CSTR2RVAL(GTK_OBJECT_TYPE_NAME(RVAL2GOBJ(self)));
 }
@@ -79,32 +78,28 @@ void        gtk_object_remove_no_notify_by_id
 */
 
 static VALUE
-gobj_destroy(self)
-    VALUE self;
+gobj_destroy(VALUE self)
 {
     gtk_object_destroy(GTK_OBJECT(RVAL2GOBJ(self)));
     return Qnil;
 }
 
 static VALUE
-gobj_get_flags(self)
-    VALUE self;
+gobj_get_flags(VALUE self)
 {
     /* _GtkObject.flags is int32 */
     return(INT2FIX(GTK_OBJECT_FLAGS(RVAL2GOBJ(self))));
 }
 
 static VALUE
-gobj_set_flags(self, flags)
-    VALUE self, flags;
+gobj_set_flags(VALUE self, VALUE flags)
 {
     GTK_OBJECT_SET_FLAGS(RVAL2GOBJ(self), NUM2INT(flags));
     return self;
 }
 
 static VALUE
-gobj_unset_flags(self, flags)
-    VALUE self, flags;
+gobj_unset_flags(VALUE self, VALUE flags)
 {
     GTK_OBJECT_UNSET_FLAGS(RVAL2GOBJ(self), NUM2INT(flags));
     return self;
@@ -112,8 +107,7 @@ gobj_unset_flags(self, flags)
 
 /* Move from Bindings */
 static VALUE
-gobj_bindings_activate(self, keyval, modifiers)
-    VALUE self, keyval, modifiers;
+gobj_bindings_activate(VALUE self, VALUE keyval, VALUE modifiers)
 {
      return CBOOL2RVAL(gtk_bindings_activate(GTK_OBJECT(RVAL2GOBJ(self)), 
                                              NUM2UINT(keyval),
@@ -122,8 +116,7 @@ gobj_bindings_activate(self, keyval, modifiers)
 
 /* Move from Bindings */
 static VALUE
-gobj_s_binding_set(self)
-    VALUE self;
+gobj_s_binding_set(VALUE self)
 {
     GType gtype;
     gpointer gclass;

data/ext/gtk2/rbgtkoptionmenu.c

@@ -17,32 +17,28 @@
 #ifndef GTK_DISABLE_DEPRECATED  /* Since 2.4 */
 
 static VALUE
-omenu_initialize(self)
-    VALUE self;
+omenu_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_option_menu_new());
     return Qnil;
 }
 
 static VALUE
-omenu_remove_menu(self)
-    VALUE self;
+omenu_remove_menu(VALUE self)
 {
     gtk_option_menu_remove_menu(GTK_OPTION_MENU(RVAL2GOBJ(self)));
     return self;
 }
 
 static VALUE
-omenu_set_history(self, index)
-    VALUE self, index;
+omenu_set_history(VALUE self, VALUE index)
 {
     gtk_option_menu_set_history(GTK_OPTION_MENU(RVAL2GOBJ(self)), NUM2INT(index));
     return self;
 }
 
 static VALUE
-omenu_get_history(self)
-    VALUE self;
+omenu_get_history(VALUE self)
 {
     return INT2NUM(gtk_option_menu_get_history(GTK_OPTION_MENU(RVAL2GOBJ(self))));
 }

data/ext/gtk2/rbgtkpaned.c

@@ -19,24 +19,21 @@
 
 
 static VALUE
-paned_add1(self, child)
-    VALUE self, child;
+paned_add1(VALUE self, VALUE child)
 {
     gtk_paned_add1(_SELF(self), RVAL2WIDGET(child));
     return self;
 }
 
 static VALUE
-paned_add2(self, child)
-    VALUE self, child;
+paned_add2(VALUE self, VALUE child)
 {
     gtk_paned_add2(_SELF(self), RVAL2WIDGET(child));
     return self;
 }
 
 static VALUE
-paned_pack1(self, child, resize, shrink)
-    VALUE self, child, resize, shrink;
+paned_pack1(VALUE self, VALUE child, VALUE resize, VALUE shrink)
 {
     gtk_paned_pack1(_SELF(self), RVAL2WIDGET(child),
                     RVAL2CBOOL(resize), RVAL2CBOOL(shrink));
@@ -44,8 +41,7 @@ paned_pack1(self, child, resize, shrink)
 }
 
 static VALUE
-paned_pack2(self, child, resize, shrink)
-    VALUE self, child, resize, shrink;
+paned_pack2(VALUE self, VALUE child, VALUE resize, VALUE shrink)
 {
     gtk_paned_pack2(_SELF(self), RVAL2WIDGET(child),
                     RVAL2CBOOL(resize), RVAL2CBOOL(shrink));
@@ -53,45 +49,39 @@ paned_pack2(self, child, resize, shrink)
 }
 
 static VALUE
-paned_child1(self)
-    VALUE self;
+paned_child1(VALUE self)
 {
     GtkWidget *child = _SELF(self)->child1;
     return (child == NULL) ? Qnil : GOBJ2RVAL(child);
 }
 
 static VALUE
-paned_child2(self)
-    VALUE self;
+paned_child2(VALUE self)
 {
     GtkWidget *child = _SELF(self)->child2;
     return (child == NULL) ? Qnil : GOBJ2RVAL(child);
 }
 
 static VALUE
-paned_child1_resize(self)
-    VALUE self;
+paned_child1_resize(VALUE self)
 {
     return CBOOL2RVAL(_SELF(self)->child1_resize);
 }
 
 static VALUE
-paned_child1_shrink(self)
-    VALUE self;
+paned_child1_shrink(VALUE self)
 {
     return CBOOL2RVAL(_SELF(self)->child1_shrink);
 }
 
 static VALUE
-paned_child2_resize(self)
-    VALUE self;
+paned_child2_resize(VALUE self)
 {
     return CBOOL2RVAL(_SELF(self)->child2_resize);
 }
 
 static VALUE
-paned_child2_shrink(self)
-    VALUE self;
+paned_child2_shrink(VALUE self)
 {
     return CBOOL2RVAL(_SELF(self)->child2_shrink);
 }

data/ext/gtk2/rbgtkplug.c

@@ -15,10 +15,7 @@
 #ifdef HAVE_GTK_PLUG_GET_TYPE
 
 static VALUE
-plug_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+plug_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE socket_id;
     GdkNativeWindow id;
@@ -46,8 +43,7 @@ GdkDisplay *display,
 */
 
 static VALUE
-plug_construct(self, socket_id)
-    VALUE self, socket_id;
+plug_construct(VALUE self, VALUE socket_id)
 {
 #ifdef GDK_NATIVE_WINDOW_POINTER
     gtk_plug_construct(GTK_PLUG(RVAL2GOBJ(self)), GUINT_TO_POINTER(NUM2ULONG(socket_id)));
@@ -58,8 +54,7 @@ plug_construct(self, socket_id)
 }
 
 static VALUE
-plug_get_id(self)
-    VALUE self;
+plug_get_id(VALUE self)
 {
     GdkNativeWindow id = gtk_plug_get_id(GTK_PLUG(RVAL2GOBJ(self)));
 #ifdef GDK_NATIVE_WINDOW_POINTER

data/ext/gtk2/rbgtkprintsettings.c

@@ -21,10 +21,7 @@ static VALUE s_string, s_bool, s_double, s_length, s_int;
 
 #if GTK_CHECK_VERSION(2,12,0)
 static VALUE
-ps_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+ps_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg1, arg2;
     GtkPrintSettings* settings = NULL;

data/ext/gtk2/rbgtkprogressbar.c

@@ -15,16 +15,14 @@
 #include "global.h"
 
 static VALUE
-pbar_initialize(self)
-    VALUE self;
+pbar_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_progress_bar_new());
     return Qnil;
 }
 
 static VALUE
-pbar_pulse(self)
-    VALUE self;
+pbar_pulse(VALUE self)
 {
     gtk_progress_bar_pulse(GTK_PROGRESS_BAR(RVAL2GOBJ(self)));
     return self;

data/ext/gtk2/rbgtkradioaction.c

@@ -16,8 +16,7 @@
 #define _SELF(self) (GTK_RADIO_ACTION(RVAL2GOBJ(self)))
 
 static VALUE
-raction_initialize(self, name, label, tooltip, stock_id, value)
-    VALUE self, name, label, tooltip, stock_id, value;
+raction_initialize(VALUE self, VALUE name, VALUE label, VALUE tooltip, VALUE stock_id, VALUE value)
 {
     const gchar *gstock = NULL;
 
@@ -35,16 +34,14 @@ raction_initialize(self, name, label, tooltip, stock_id, value)
 }
 
 static VALUE
-raction_get_group(self)
-    VALUE self;
+raction_get_group(VALUE self)
 {
     /* Owned by GTK+ */
     return GSLIST2ARY(gtk_radio_action_get_group(_SELF(self)));
 }
 
 static VALUE
-raction_set_group(self, group)
-    VALUE self, group;
+raction_set_group(VALUE self, VALUE group)
 {
     long i;
     GSList *glist = NULL;
@@ -64,8 +61,7 @@ raction_set_group(self, group)
 
 #if ! GTK_CHECK_VERSION(2,10,0)
 static VALUE
-raction_get_current_value(self)
-    VALUE self;
+raction_get_current_value(VALUE self)
 {
     return INT2NUM(gtk_radio_action_get_current_value(_SELF(self)));
 }

data/ext/gtk2/rbgtkradiobutton.c

@@ -19,8 +19,7 @@ static VALUE gRButton;
 #define _GROUP(s) (NIL_P(s) ? NULL : GTK_RADIO_BUTTON(RVAL2GOBJ(s)))
 
 static GtkWidget*
-create_button(group, label, use_underline)
-    VALUE group, label, use_underline;
+create_button(VALUE group, VALUE label, VALUE use_underline)
 {
     GtkWidget* widget = NULL;
 
@@ -43,10 +42,7 @@ create_button(group, label, use_underline)
 }
 
 static VALUE
-rbtn_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+rbtn_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE group_or_label, label_or_use_underline, use_underline;
     GtkWidget *widget;
@@ -66,8 +62,7 @@ rbtn_initialize(argc, argv, self)
 }
 
 static VALUE
-rbtn_group(self)
-    VALUE self;
+rbtn_group(VALUE self)
 {
     /* Owened by GTK+ */
     return GSLIST2ARY(gtk_radio_button_get_group(GTK_RADIO_BUTTON(RVAL2GOBJ(self))));

data/ext/gtk2/rbgtkradiomenuitem.c

@@ -16,8 +16,7 @@
 #include "global.h"
 
 static GSList*
-ary2gslist(ary)
-    VALUE ary;
+ary2gslist(VALUE ary)
 {
     long i;
     GSList *glist = NULL;
@@ -32,10 +31,7 @@ ary2gslist(ary)
 }
 
 static VALUE
-rmitem_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+rmitem_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg1, arg2, arg3;
     GtkWidget *widget;
@@ -79,16 +75,14 @@ rmitem_initialize(argc, argv, self)
 }
 
 static VALUE
-rmitem_get_group(self)
-    VALUE self;
+rmitem_get_group(VALUE self)
 {
     /* Owened by GTK+ */
     return GSLIST2ARY(gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(RVAL2GOBJ(self))));
 }
 
 static VALUE
-rmitem_set_group(self, grp_ary)
-    VALUE self, grp_ary;
+rmitem_set_group(VALUE self, VALUE grp_ary)
 {
     GtkRadioMenuItem *rmitem2add, *rmitem_orig;
     GSList *group;

data/ext/gtk2/rbgtkradiotoolbutton.c

@@ -18,10 +18,7 @@
 static VALUE gRToolButton;
 
 static VALUE
-rbtn_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+rbtn_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE group_or_stock_id, stock_id;
     GtkToolItem *widget;
@@ -57,16 +54,14 @@ rbtn_initialize(argc, argv, self)
 }
 
 static VALUE
-rbtn_get_group(self)
-    VALUE self;
+rbtn_get_group(VALUE self)
 {
     /* Owned by GTK+ */
     return GSLIST2ARY(gtk_radio_tool_button_get_group(_SELF(self)));
 }
 
 static VALUE
-rbtn_set_group(self, group)
-    VALUE self, group;
+rbtn_set_group(VALUE self, VALUE group)
 {
     GSList* list = NULL;
     if (TYPE(group) == T_ARRAY){

data/ext/gtk2/rbgtkrange.c

@@ -48,31 +48,27 @@ gdouble            gtk_range_get_fill_level                (GtkRange      *range
 */
 
 static VALUE
-range_get_value(self)
-    VALUE self;
+range_get_value(VALUE self)
 {
     return rb_float_new(gtk_range_get_value(_SELF(self)));
 }
 
 static VALUE
-range_set_increments(self, step, page)
-    VALUE self, step, page;
+range_set_increments(VALUE self, VALUE step, VALUE page)
 {
     gtk_range_set_increments(_SELF(self), NUM2DBL(step), NUM2DBL(page));
     return self;
 }
 
 static VALUE
-range_set_range(self, min, max)
-    VALUE self, min, max;
+range_set_range(VALUE self, VALUE min, VALUE max)
 {
     gtk_range_set_range(_SELF(self), NUM2DBL(min), NUM2DBL(max));
     return self;
 }
 
 static VALUE
-range_set_value(self, value)
-    VALUE self, value;
+range_set_value(VALUE self, VALUE value)
 {
     gtk_range_set_value(_SELF(self), NUM2DBL(value));
     return self;

data/ext/gtk2/rbgtkrc.c

@@ -16,16 +16,14 @@
 
 /*
 static VALUE
-rc_scanner_new(self)
-    VALUE self;
+rc_scanner_new(VALUE self)
 {
     return BOXED2RVAL(gtk_rc_scanner_new(), GTK_TYPE_GSCANNER);
 }
 */
 
 static VALUE
-rc_get_style(self, widget)
-    VALUE self, widget;
+rc_get_style(VALUE self, VALUE widget)
 {
     GtkStyle* style = gtk_rc_get_style(GTK_WIDGET(RVAL2GOBJ(widget)));
     GType gtype = G_OBJECT_TYPE(style);
@@ -37,10 +35,7 @@ rc_get_style(self, widget)
 }
 
 static VALUE
-rc_get_style_by_paths(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+rc_get_style_by_paths(int argc, VALUE *argv, VALUE self)
 {
     VALUE settings, widget_path, class_path, klass;
     GtkStyle* style;
@@ -66,31 +61,27 @@ rc_get_style_by_paths(argc, argv, self)
 }
 
 static VALUE
-rc_parse(self, filename)
-    VALUE self, filename;
+rc_parse(VALUE self, VALUE filename)
 {
     gtk_rc_parse(RVAL2CSTR(filename));
     return filename;
 }
 
 static VALUE
-rc_parse_string(self, rc_string)
-    VALUE self, rc_string;
+rc_parse_string(VALUE self, VALUE rc_string)
 {
     gtk_rc_parse_string(RVAL2CSTR(rc_string));
     return rc_string;
 }
 
 static VALUE
-rc_reparse_all(self)
-    VALUE self;
+rc_reparse_all(VALUE self)
 {
     return CBOOL2RVAL(gtk_rc_reparse_all());
 }
 
 static VALUE
-rc_reparse_all_for_settings(self, settings, force_load)
-    VALUE self, settings, force_load;
+rc_reparse_all_for_settings(VALUE self, VALUE settings, VALUE force_load)
 {
     return CBOOL2RVAL(gtk_rc_reparse_all_for_settings(GTK_SETTINGS(RVAL2GOBJ(settings)), 
                                                       RVAL2CBOOL(force_load)));
@@ -98,8 +89,7 @@ rc_reparse_all_for_settings(self, settings, force_load)
 
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-rc_reset_styles(self, settings)
-    VALUE self, settings;
+rc_reset_styles(VALUE self, VALUE settings)
 {
     gtk_rc_reset_styles(GTK_SETTINGS(RVAL2GOBJ(settings)));
     return settings;
@@ -107,16 +97,14 @@ rc_reset_styles(self, settings)
 #endif
 
 static VALUE
-rc_add_default_file(self, filename)
-    VALUE self, filename;
+rc_add_default_file(VALUE self, VALUE filename)
 {
     gtk_rc_add_default_file(RVAL2CSTR(filename));
     return filename;
 }
 
 static VALUE
-rc_get_default_files(self)
-    VALUE self;
+rc_get_default_files(VALUE self)
 {
     gchar** files = gtk_rc_get_default_files();
     VALUE ary = rb_ary_new();
@@ -128,8 +116,7 @@ rc_get_default_files(self)
 }
 
 static VALUE
-rc_set_default_files(self, filenames)
-    VALUE self, filenames;
+rc_set_default_files(VALUE self, VALUE filenames)
 {
     int i;
     gchar** gfiles = g_new(gchar*, RARRAY_LEN(filenames) + 1);
@@ -153,8 +140,7 @@ guint       gtk_rc_parse_priority           (GScanner *scanner,
 */
 
 static VALUE
-rc_find_module_in_path(self, module_file)
-    VALUE self, module_file;
+rc_find_module_in_path(VALUE self, VALUE module_file)
 {
     return CSTR2RVAL_FREE(gtk_rc_find_module_in_path(RVAL2CSTR(module_file)));
 }
@@ -166,29 +152,25 @@ gchar*      gtk_rc_find_pixmap_in_path      (GtkSettings *settings,
 */
 
 static VALUE
-rc_get_module_dir(self)
-    VALUE self;
+rc_get_module_dir(VALUE self)
 {
     return CSTR2RVAL_FREE(gtk_rc_get_module_dir());
 }
 
 static VALUE
-rc_get_im_module_path(self)
-    VALUE self;
+rc_get_im_module_path(VALUE self)
 {
     return CSTR2RVAL(gtk_rc_get_im_module_path());
 }
 
 static VALUE
-rc_get_im_module_file(self)
-    VALUE self;
+rc_get_im_module_file(VALUE self)
 {
     return CSTR2RVAL(gtk_rc_get_im_module_file());
 }
 
 static VALUE
-rc_get_theme_dir(self)
-    VALUE self;
+rc_get_theme_dir(VALUE self)
 {
     return CSTR2RVAL_FREE(gtk_rc_get_theme_dir());
 }