gtk2 0.90.7 → 0.90.8

data/ext/gtk2/rbgtkcurve.c

@@ -15,32 +15,28 @@
 #include "global.h"
 
 static VALUE
-curve_initialize(self)
-    VALUE self;
+curve_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_curve_new());
     return Qnil;
 }
 
 static VALUE
-curve_reset(self)
-    VALUE self;
+curve_reset(VALUE self)
 {
     gtk_curve_reset(GTK_CURVE(RVAL2GOBJ(self)));
     return self;
 }
 
 static VALUE
-curve_set_gamma(self, gamma)
-    VALUE self, gamma;
+curve_set_gamma(VALUE self, VALUE gamma)
 {
     gtk_curve_set_gamma(GTK_CURVE(RVAL2GOBJ(self)), NUM2DBL(gamma));
     return self;
 }
 
 static VALUE
-curve_set_range(self, min_x, max_x, min_y, max_y)
-    VALUE self, min_x, max_x, min_y, max_y;
+curve_set_range(VALUE self, VALUE min_x, VALUE max_x, VALUE min_y, VALUE max_y)
 {
     gtk_curve_set_range(GTK_CURVE(RVAL2GOBJ(self)),
 			NUM2DBL(min_x), NUM2DBL(max_x),
@@ -49,8 +45,7 @@ curve_set_range(self, min_x, max_x, min_y, max_y)
 }
 
 static VALUE
-curve_set_vector(self, length, vector)
-    VALUE self, length, vector;
+curve_set_vector(VALUE self, VALUE length, VALUE vector)
 {
     gint len = NUM2INT(length);
     gfloat *c_vec;
@@ -66,8 +61,7 @@ curve_set_vector(self, length, vector)
 }
 
 static VALUE
-curve_get_vector(self, length)
-    VALUE self, length;
+curve_get_vector(VALUE self, VALUE length)
 {
     gint len = NUM2INT(length);
     gfloat *c_vec;

data/ext/gtk2/rbgtkdialog.c

@@ -19,8 +19,7 @@
 static ID id_to_a;
 
 static VALUE
-dialog_add_button(self, button_text, response_id)
-    VALUE self, button_text, response_id;
+dialog_add_button(VALUE self, VALUE button_text, VALUE response_id)
 {
     const gchar *name;
     if (SYMBOL_P(button_text)) {
@@ -33,8 +32,7 @@ dialog_add_button(self, button_text, response_id)
 }
 
 VALUE
-rbgtk_dialog_add_buttons_internal(self, button_ary)
-    VALUE self, button_ary;
+rbgtk_dialog_add_buttons_internal(VALUE self, VALUE button_ary)
 {
     int i;
     GObject* obj = RVAL2GOBJ(self);
@@ -51,10 +49,7 @@ rbgtk_dialog_add_buttons_internal(self, button_ary)
 }    
 
 static VALUE
-dialog_add_buttons(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+dialog_add_buttons(int argc, VALUE *argv, VALUE self)
 {
     VALUE button_ary;
     rb_scan_args(argc, argv, "*", &button_ary);
@@ -63,10 +58,7 @@ dialog_add_buttons(argc, argv, self)
 }    
 
 static VALUE
-dialog_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+dialog_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE title, parent, flags, button_ary;
     rb_scan_args(argc, argv, "03*", &title, &parent, &flags, &button_ary);
@@ -98,8 +90,7 @@ dialog_initialize(argc, argv, self)
 }
 
 static VALUE
-dialog_run(self)
-    VALUE self;
+dialog_run(VALUE self)
 {
     if (rb_block_given_p()){
         VALUE ret = INT2NUM(gtk_dialog_run(_SELF(self)));
@@ -111,16 +102,14 @@ dialog_run(self)
 }
 
 static VALUE
-dialog_response(self, response_id)
-    VALUE self, response_id;
+dialog_response(VALUE self, VALUE response_id)
 {
     gtk_dialog_response(_SELF(self), NUM2INT(response_id));
     return self;
 }
 
 static VALUE
-dialog_add_action_widget(self, child, response_id)
-    VALUE self, child, response_id;
+dialog_add_action_widget(VALUE self, VALUE child, VALUE response_id)
 {
     gtk_dialog_add_action_widget(_SELF(self), GTK_WIDGET(RVAL2GOBJ(child)), 
                                  NUM2INT(response_id));
@@ -128,16 +117,14 @@ dialog_add_action_widget(self, child, response_id)
 }
 
 static VALUE
-dialog_set_default_response(self, response_id)
-    VALUE self, response_id;
+dialog_set_default_response(VALUE self, VALUE response_id)
 {
     gtk_dialog_set_default_response(_SELF(self), NUM2INT(response_id));
     return self;
 }
 
 static VALUE
-dialog_set_response_sensitive(self, response_id, setting)
-    VALUE self, response_id, setting;
+dialog_set_response_sensitive(VALUE self, VALUE response_id, VALUE setting)
 {
     gtk_dialog_set_response_sensitive(_SELF(self), NUM2INT(response_id), RVAL2CBOOL(setting));
     return self;
@@ -145,8 +132,7 @@ dialog_set_response_sensitive(self, response_id, setting)
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-dialog_s_alternative_dialog_button_order(self, screen)
-    VALUE self, screen;
+dialog_s_alternative_dialog_button_order(VALUE self, VALUE screen)
 {
     gboolean ret = gtk_alternative_dialog_button_order(NIL_P(screen) ? NULL : 
                                                        GDK_SCREEN(RVAL2GOBJ(screen)));
@@ -161,8 +147,7 @@ void        gtk_dialog_set_alternative_button_order
 */
 
 static VALUE
-dialog_set_alternative_button_order(self, new_order)
-    VALUE self, new_order;
+dialog_set_alternative_button_order(VALUE self, VALUE new_order)
 {
     gint i;
     gint len = RARRAY_LEN(new_order);
@@ -180,23 +165,20 @@ dialog_set_alternative_button_order(self, new_order)
 #endif
 
 static VALUE
-dialog_vbox(self)
-    VALUE self;
+dialog_vbox(VALUE self)
 {
     return GOBJ2RVAL(_SELF(self)->vbox);
 }
 
 static VALUE
-dialog_action_area(self)
-    VALUE self;
+dialog_action_area(VALUE self)
 {
     return GOBJ2RVAL(_SELF(self)->action_area);
 }
 
 #if GTK_CHECK_VERSION(2,8,0)
 static VALUE
-dialog_get_response_for_widget(self, widget)
-    VALUE self, widget;
+dialog_get_response_for_widget(VALUE self, VALUE widget)
 {
     return INT2NUM(gtk_dialog_get_response_for_widget(_SELF(self), RVAL2GOBJ(widget)));
 }

data/ext/gtk2/rbgtkdrag.c

@@ -16,8 +16,7 @@
 #define RVAL2WIDGET(w) (GTK_WIDGET(RVAL2GOBJ(w)))
 
 GtkTargetEntry*
-rbgtk_get_target_entry(targets)
-	VALUE targets;
+rbgtk_get_target_entry(VALUE targets)
 {
     VALUE ary;
     VALUE e_target, e_flags, e_info;
@@ -46,8 +45,7 @@ rbgtk_get_target_entry(targets)
 }
 
 static VALUE
-gtkdrag_dest_set(self, widget, flags, targets, actions)
-    VALUE self, widget, flags, targets, actions;
+gtkdrag_dest_set(VALUE self, VALUE widget, VALUE flags, VALUE targets, VALUE actions)
 {
     int num;
     GtkTargetEntry* entries = rbgtk_get_target_entry(targets);
@@ -67,8 +65,7 @@ gtkdrag_dest_set(self, widget, flags, targets, actions)
 }
 
 static VALUE
-gtkdrag_dest_set_proxy(self, widget, proxy_window, protocol, use_coordinates)
-    VALUE self, widget, proxy_window, protocol, use_coordinates;
+gtkdrag_dest_set_proxy(VALUE self, VALUE widget, VALUE proxy_window, VALUE protocol, VALUE use_coordinates)
 {
     gtk_drag_dest_set_proxy(RVAL2WIDGET(widget), 
                             GDK_WINDOW(RVAL2GOBJ(proxy_window)),
@@ -78,18 +75,14 @@ gtkdrag_dest_set_proxy(self, widget, proxy_window, protocol, use_coordinates)
 }
 
 static VALUE
-gtkdrag_dest_unset(self, widget)
-    VALUE self,widget;
+gtkdrag_dest_unset(VALUE self, VALUE widget)
 {
     gtk_drag_dest_unset(RVAL2WIDGET(widget));
     return self;
 }
 
 static VALUE
-gtkdrag_dest_find_target(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+gtkdrag_dest_find_target(int argc, VALUE *argv, VALUE self)
 {
     VALUE widget, context, target_list;
     GdkAtom ret;
@@ -103,16 +96,14 @@ gtkdrag_dest_find_target(argc, argv, self)
 }
 
 static VALUE
-gtkdrag_dest_get_target_list(self, widget)
-    VALUE self, widget;
+gtkdrag_dest_get_target_list(VALUE self, VALUE widget)
 {
     GtkTargetList* list = gtk_drag_dest_get_target_list(RVAL2WIDGET(widget));
     return BOXED2RVAL(list, GTK_TYPE_TARGET_LIST);
 }
 
 static VALUE
-gtkdrag_dest_set_target_list(self, widget, target_list)
-    VALUE self, widget, target_list;
+gtkdrag_dest_set_target_list(VALUE self, VALUE widget, VALUE target_list)
 {
     gtk_drag_dest_set_target_list(
         RVAL2WIDGET(widget), 
@@ -124,22 +115,19 @@ gtkdrag_dest_set_target_list(self, widget, target_list)
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-gtkdrag_dest_add_text_targets(self, widget)
-    VALUE self, widget;
+gtkdrag_dest_add_text_targets(VALUE self, VALUE widget)
 {
     gtk_drag_dest_add_text_targets(RVAL2WIDGET(widget));
     return self;
 }
 static VALUE
-gtkdrag_dest_add_image_targets(self, widget)
-    VALUE self, widget;
+gtkdrag_dest_add_image_targets(VALUE self, VALUE widget)
 {
     gtk_drag_dest_add_image_targets(RVAL2WIDGET(widget));
     return self;
 }
 static VALUE
-gtkdrag_dest_add_uri_targets(self, widget)
-    VALUE self, widget;
+gtkdrag_dest_add_uri_targets(VALUE self, VALUE widget)
 {
     gtk_drag_dest_add_uri_targets(RVAL2WIDGET(widget));
     return self;
@@ -148,24 +136,21 @@ gtkdrag_dest_add_uri_targets(self, widget)
 
 #if GTK_CHECK_VERSION(2,10,0)
 static VALUE
-gtkdrag_dest_set_track_motion(self, widget, track_motion)
-    VALUE self, widget, track_motion;
+gtkdrag_dest_set_track_motion(VALUE self, VALUE widget, VALUE track_motion)
 {
     gtk_drag_dest_set_track_motion(RVAL2WIDGET(widget), RVAL2CBOOL(track_motion));
     return self;
 }
 
 static VALUE
-gtkdrag_dest_get_track_motion(self, widget)
-    VALUE self, widget;
+gtkdrag_dest_get_track_motion(VALUE self, VALUE widget)
 {
     return CBOOL2RVAL(gtk_drag_dest_get_track_motion(RVAL2WIDGET(widget)));
 }
 #endif
 
 static VALUE
-gtkdrag_finish(self, context, success, del, time)
-    VALUE self, context, success, del, time;
+gtkdrag_finish(VALUE self, VALUE context, VALUE success, VALUE del, VALUE time)
 {
     gtk_drag_finish(RVAL2DC(context), RVAL2CBOOL(success),
                     RVAL2CBOOL(del), NUM2UINT(time));
@@ -173,8 +158,7 @@ gtkdrag_finish(self, context, success, del, time)
 }
 
 static VALUE
-gtkdrag_get_data(self, widget, context, target, time)
-    VALUE self, widget, context, target, time;
+gtkdrag_get_data(VALUE self, VALUE widget, VALUE context, VALUE target, VALUE time)
 {
     gtk_drag_get_data(RVAL2WIDGET(widget), RVAL2DC(context), RVAL2ATOM(target),
                       NUM2UINT(time));
@@ -182,31 +166,27 @@ gtkdrag_get_data(self, widget, context, target, time)
 }
 
 static VALUE
-gtkdrag_get_source_widget(self, context)
-    VALUE self, context;
+gtkdrag_get_source_widget(VALUE self, VALUE context)
 {
     return GOBJ2RVAL(gtk_drag_get_source_widget(RVAL2DC(context)));
 }
 
 static VALUE
-gtkdrag_highlight(self, widget)
-    VALUE self, widget;
+gtkdrag_highlight(VALUE self, VALUE widget)
 {
     gtk_drag_highlight(RVAL2WIDGET(widget));
     return self;
 }
 
 static VALUE
-gtkdrag_unhighlight(self, widget)
-    VALUE self, widget;
+gtkdrag_unhighlight(VALUE self, VALUE widget)
 {
     gtk_drag_unhighlight(RVAL2WIDGET(widget));
     return self;
 }
 
 static VALUE
-gtkdrag_begin(self, widget, target_list, actions, button, event)
-    VALUE self, widget, target_list, actions, button, event;
+gtkdrag_begin(VALUE self, VALUE widget, VALUE target_list, VALUE actions, VALUE button, VALUE event)
 {
     return GOBJ2RVAL(gtk_drag_begin(RVAL2WIDGET(widget),
                                     RVAL2BOXED(target_list, GTK_TYPE_TARGET_LIST),
@@ -216,10 +196,7 @@ gtkdrag_begin(self, widget, target_list, actions, button, event)
 }
 
 static VALUE
-gtkdrag_set_icon(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+gtkdrag_set_icon(int argc, VALUE *argv, VALUE self)
 {
     VALUE context, obj, pixmap = Qnil, mask = Qnil, hot_x, hot_y;
 
@@ -252,8 +229,7 @@ gtkdrag_set_icon(argc, argv, self)
 
 #if GTK_CHECK_VERSION(2,8,0)
 static VALUE
-gtkdrag_set_icon_name(self, context, name, hot_x, hot_y)
-    VALUE self, context, name, hot_x, hot_y;
+gtkdrag_set_icon_name(VALUE self, VALUE context, VALUE name, VALUE hot_x, VALUE hot_y)
 {
     gtk_drag_set_icon_name(RVAL2DC(context), RVAL2CSTR(name), NUM2INT(hot_x), NUM2INT(hot_y));
     return self;
@@ -261,16 +237,14 @@ gtkdrag_set_icon_name(self, context, name, hot_x, hot_y)
 #endif
 
 static VALUE
-gtkdrag_set_icon_default(self, context)
-    VALUE self, context;
+gtkdrag_set_icon_default(VALUE self, VALUE context)
 {
     gtk_drag_set_icon_default(RVAL2DC(context));
     return self;
 }
 
 static VALUE
-gtkdrag_check_threshold(self, widget, start_x, start_y, current_x, current_y)
-    VALUE self, widget, start_x, start_y, current_x, current_y;
+gtkdrag_check_threshold(VALUE self, VALUE widget, VALUE start_x, VALUE start_y, VALUE current_x, VALUE current_y)
 {
     return CBOOL2RVAL(gtk_drag_check_threshold(RVAL2WIDGET(widget), 
                                                NUM2INT(start_x), NUM2INT(start_y),
@@ -278,8 +252,7 @@ gtkdrag_check_threshold(self, widget, start_x, start_y, current_x, current_y)
 }
 
 static VALUE
-gtkdrag_source_set(self, widget, flags, targets, actions)
-    VALUE self, widget, flags, targets, actions;
+gtkdrag_source_set(VALUE self, VALUE widget, VALUE flags, VALUE targets, VALUE actions)
 {
     gtk_drag_source_set(RVAL2WIDGET(widget), RVAL2GFLAGS(flags, GDK_TYPE_MODIFIER_TYPE),
                         rbgtk_get_target_entry(targets), 
@@ -289,10 +262,7 @@ gtkdrag_source_set(self, widget, flags, targets, actions)
 }
 
 static VALUE
-gtkdrag_source_set_icon(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+gtkdrag_source_set_icon(int argc, VALUE *argv, VALUE self)
 {
     VALUE widget, obj, pixmap = Qnil, mask = Qnil;
 
@@ -315,8 +285,7 @@ gtkdrag_source_set_icon(argc, argv, self)
 
 #if GTK_CHECK_VERSION(2,8,0)
 static VALUE
-gtkdrag_source_set_icon_name(self, widget, icon_name)
-    VALUE self, widget, icon_name;
+gtkdrag_source_set_icon_name(VALUE self, VALUE widget, VALUE icon_name)
 {
     gtk_drag_source_set_icon_name(RVAL2WIDGET(widget), RVAL2CSTR(icon_name));
     return self;
@@ -324,8 +293,7 @@ gtkdrag_source_set_icon_name(self, widget, icon_name)
 #endif
 
 static VALUE
-gtkdrag_source_unset(self, widget)
-    VALUE self, widget;
+gtkdrag_source_unset(VALUE self, VALUE widget)
 {
     gtk_drag_source_unset(RVAL2WIDGET(widget));
     return self;
@@ -333,8 +301,7 @@ gtkdrag_source_unset(self, widget)
 
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-gtkdrag_source_set_target_list(self, widget, targetlist)
-    VALUE self, widget, targetlist;
+gtkdrag_source_set_target_list(VALUE self, VALUE widget, VALUE targetlist)
 {
     GtkTargetList* tlist = NULL;
     if (! NIL_P(targetlist))
@@ -345,8 +312,7 @@ gtkdrag_source_set_target_list(self, widget, targetlist)
 }
 
 static VALUE
-gtkdrag_source_get_target_list(self, widget)
-    VALUE self, widget;
+gtkdrag_source_get_target_list(VALUE self, VALUE widget)
 {
     GtkTargetList* ret = gtk_drag_source_get_target_list(RVAL2WIDGET(widget));
     return NIL_P(ret) ? Qnil : BOXED2RVAL(ret, GTK_TYPE_TARGET_LIST);
@@ -355,22 +321,19 @@ gtkdrag_source_get_target_list(self, widget)
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-gtkdrag_source_add_text_targets(self, widget)
-    VALUE self, widget;
+gtkdrag_source_add_text_targets(VALUE self, VALUE widget)
 {
     gtk_drag_source_add_text_targets(RVAL2WIDGET(widget));
     return self;
 }
 static VALUE
-gtkdrag_source_add_image_targets(self, widget)
-    VALUE self, widget;
+gtkdrag_source_add_image_targets(VALUE self, VALUE widget)
 {
     gtk_drag_source_add_image_targets(RVAL2WIDGET(widget));
     return self;
 }
 static VALUE
-gtkdrag_source_add_uri_targets(self, widget)
-    VALUE self, widget;
+gtkdrag_source_add_uri_targets(VALUE self, VALUE widget)
 {
     gtk_drag_source_add_uri_targets(RVAL2WIDGET(widget));
     return self;