gtk2 0.90.7 → 0.90.8

data/ext/gtk2/rbgtkmain.c

@@ -29,8 +29,7 @@ typedef struct _callback_info_t
 
 
 static VALUE
-gtk_m_function_body(data)
-    VALUE data;
+gtk_m_function_body(VALUE data)
 {
     callback_info_t *info = (callback_info_t *)data;
     VALUE ret = rb_funcall(info->callback, id_call, 0);
@@ -41,8 +40,7 @@ gtk_m_function_body(data)
 }
 
 static gboolean
-gtk_m_function(data)
-    gpointer data;
+gtk_m_function(gpointer data)
 { 
     return RVAL2CBOOL(G_PROTECT_CALLBACK(gtk_m_function_body, data));
 }
@@ -62,23 +60,20 @@ gtk_m_function2(gpointer proc)
 
 
 static VALUE
-gtk_m_set_locale(self)
-    VALUE self;
+gtk_m_set_locale(VALUE self)
 {
     return CSTR2RVAL(gtk_set_locale());
 }
 
 static VALUE
-gtk_m_disable_setlocale(self)
-    VALUE self;
+gtk_m_disable_setlocale(VALUE self)
 {
     gtk_disable_setlocale();
     return Qnil;
 }
 
 static VALUE
-gtk_m_get_default_language(self)
-    VALUE self;
+gtk_m_get_default_language(VALUE self)
 {
     return BOXED2RVAL(gtk_get_default_language(), PANGO_TYPE_LANGUAGE);
 }
@@ -181,45 +176,39 @@ gtk_exit()
 */
 
 static VALUE
-gtk_m_main(self)
-    VALUE self;
+gtk_m_main(VALUE self)
 {
     gtk_main();
     return Qnil;
 }
 
 static VALUE
-gtk_m_main_level(self)
-    VALUE self;
+gtk_m_main_level(VALUE self)
 {
     return INT2FIX(gtk_main_level());
 }
 
 static VALUE
-gtk_m_main_quit(self)
-    VALUE self;
+gtk_m_main_quit(VALUE self)
 {
     gtk_main_quit();
     return Qnil;
 }
 
 static VALUE
-gtk_m_main_iteration(self)
-    VALUE self;
+gtk_m_main_iteration(VALUE self)
 {
     return CBOOL2RVAL(gtk_main_iteration());
 }
 
 static VALUE
-gtk_m_main_iteration_do(self, blocking)
-    VALUE self, blocking;
+gtk_m_main_iteration_do(VALUE self, VALUE blocking)
 {
     return CBOOL2RVAL(gtk_main_iteration_do(RVAL2CBOOL(blocking)));
 }
 
 static VALUE
-gtk_m_main_do_event(self, event)
-    VALUE self, event;
+gtk_m_main_do_event(VALUE self, VALUE event)
 {
     gtk_main_do_event(RVAL2GEV(event));
     return event;
@@ -231,31 +220,27 @@ gtk_false()
 */
 
 static VALUE
-gtk_m_grab_add(self, widget)
-    VALUE self, widget;
+gtk_m_grab_add(VALUE self, VALUE widget)
 {
     gtk_grab_add(GTK_WIDGET(RVAL2GOBJ(widget)));
     return Qnil;
 }
 
 static VALUE
-gtk_m_get_current(self)
-    VALUE self;
+gtk_m_get_current(VALUE self)
 {
     return GOBJ2RVAL(gtk_grab_get_current());
 }
 
 static VALUE
-gtk_m_grab_remove(self, widget)
-    VALUE self, widget;
+gtk_m_grab_remove(VALUE self, VALUE widget)
 {
     gtk_grab_remove(GTK_WIDGET(RVAL2GOBJ(widget)));
     return Qnil;
 }
 
 static VALUE
-gtk_m_init_add(self)
-    VALUE self;
+gtk_m_init_add(VALUE self)
 {
     volatile VALUE func = rb_block_proc();
 
@@ -265,8 +250,7 @@ gtk_m_init_add(self)
 }
 
 static VALUE
-gtk_m_quit_add(self, main_level)
-    VALUE self, main_level;
+gtk_m_quit_add(VALUE self, VALUE main_level)
 {
     volatile VALUE func = rb_block_proc();
     VALUE rb_id;
@@ -285,8 +269,7 @@ gtk_m_quit_add(self, main_level)
 }
 
 static VALUE
-gtk_m_quit_remove(self, quit_handler_id)
-    VALUE self, quit_handler_id;
+gtk_m_quit_remove(VALUE self, VALUE quit_handler_id)
 {
     gtk_quit_remove(NUM2UINT(quit_handler_id));
     G_REMOVE_RELATIVE(self, id__quit_callbacks__, quit_handler_id);
@@ -301,8 +284,7 @@ gtk_timeout_add_full()
 */
 
 static VALUE
-timeout_add(self, interval)
-    VALUE self, interval;
+timeout_add(VALUE self, VALUE interval)
 {
     VALUE func, rb_id;
     callback_info_t *info;
@@ -321,8 +303,7 @@ timeout_add(self, interval)
 }
 
 static VALUE
-timeout_remove(self, id)
-    VALUE self, id;
+timeout_remove(VALUE self, VALUE id)
 {
     gtk_timeout_remove(NUM2UINT(id));
     G_REMOVE_RELATIVE(self, id__timeout_callbacks__, id);
@@ -330,8 +311,7 @@ timeout_remove(self, id)
 }
 
 static VALUE
-idle_add(self)
-    VALUE self;
+idle_add(VALUE self)
 {
     VALUE func, rb_id;
     callback_info_t *info;
@@ -351,8 +331,7 @@ idle_add(self)
 }
 
 static VALUE
-idle_add_priority(self, priority)
-    VALUE self;
+idle_add_priority(VALUE self, VALUE priority)
 {
     VALUE func, rb_id;
     callback_info_t *info;
@@ -371,8 +350,7 @@ idle_add_priority(self, priority)
 }
 
 static VALUE
-idle_remove(self, id)
-    VALUE self, id;
+idle_remove(VALUE self, VALUE id)
 {
     gtk_idle_remove(NUM2UINT(id));
     G_REMOVE_RELATIVE(self, id__idle_callbacks__, id);
@@ -389,10 +367,7 @@ gtk_input_remove()
 */
 
 static gint
-gtk_m_key_snoop_func(grab_widget, event, func)
-    GtkWidget* grab_widget;
-    GdkEventKey* event;
-    gpointer func;
+gtk_m_key_snoop_func(GtkWidget *grab_widget, GdkEventKey *event, gpointer func)
 {
     VALUE ret = rb_funcall((VALUE)func, id_call, 2, 
                            GOBJ2RVAL(grab_widget), 
@@ -401,8 +376,7 @@ gtk_m_key_snoop_func(grab_widget, event, func)
 }
 
 static VALUE
-gtk_m_key_snooper_install(self)
-    VALUE self;
+gtk_m_key_snooper_install(VALUE self)
 {
     VALUE func = rb_block_proc();
     VALUE id = INT2FIX(gtk_key_snooper_install(
@@ -413,8 +387,7 @@ gtk_m_key_snooper_install(self)
 }
 
 static VALUE
-gtk_m_key_snooper_remove(self, id)
-    VALUE self, id;
+gtk_m_key_snooper_remove(VALUE self, VALUE id)
 {
     gtk_key_snooper_remove(NUM2UINT(id));
     G_REMOVE_RELATIVE(self, id__snooper_callbacks__, id);
@@ -422,22 +395,19 @@ gtk_m_key_snooper_remove(self, id)
 }
 
 static VALUE
-gtk_m_get_current_event(self)
-    VALUE self;
+gtk_m_get_current_event(VALUE self)
 {
     return GEV2RVAL(gtk_get_current_event());
 }
 
 static VALUE
-gtk_m_get_current_event_time(self)
-    VALUE self;
+gtk_m_get_current_event_time(VALUE self)
 {
     return INT2NUM(gtk_get_current_event_time());
 }
 
 static VALUE
-gtk_m_get_current_event_state(self)
-    VALUE self;
+gtk_m_get_current_event_state(VALUE self)
 {
     GdkModifierType state;
     gboolean ret = gtk_get_current_event_state(&state);
@@ -445,10 +415,7 @@ gtk_m_get_current_event_state(self)
 }
 
 static VALUE
-gtk_m_get_event_widget(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+gtk_m_get_event_widget(int argc, VALUE *argv, VALUE self)
 {
     VALUE event;
     rb_scan_args(argc, argv, "01", &event);
@@ -457,8 +424,7 @@ gtk_m_get_event_widget(argc, argv, self)
 }
 
 static VALUE
-gtk_m_propagate_event(self, widget, event)
-    VALUE self, widget, event;
+gtk_m_propagate_event(VALUE self, VALUE widget, VALUE event)
 {
     gtk_propagate_event(GTK_WIDGET(RVAL2GOBJ(widget)), RVAL2GEV(event));
     return Qnil;
@@ -466,8 +432,7 @@ gtk_m_propagate_event(self, widget, event)
 
 /* From Version Information */
 static VALUE
-gtk_m_check_version(self, major, minor, micro)
-    VALUE self, major, minor, micro;
+gtk_m_check_version(VALUE self, VALUE major, VALUE minor, VALUE micro)
 {
     const gchar *ret;
     ret = gtk_check_version(FIX2INT(major), FIX2INT(minor), FIX2INT(micro));
@@ -475,8 +440,7 @@ gtk_m_check_version(self, major, minor, micro)
 }
 
 static VALUE
-gtk_m_check_version_q(self, major, minor, micro)
-    VALUE self, major, minor, micro;
+gtk_m_check_version_q(VALUE self, VALUE major, VALUE minor, VALUE micro)
 {
     const gchar *ret;
     ret = gtk_check_version(FIX2INT(major), FIX2INT(minor), FIX2INT(micro));

data/ext/gtk2/rbgtkmenu.c

@@ -18,8 +18,7 @@
 #define RVAL2WIDGET(w) (GTK_WIDGET(RVAL2GOBJ(w)))
 
 static VALUE
-menu_initialize(self)
-    VALUE self;
+menu_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_menu_new());
     return Qnil;
@@ -27,8 +26,7 @@ menu_initialize(self)
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-menu_set_screen(self, screen)
-    VALUE self, screen;
+menu_set_screen(VALUE self, VALUE screen)
 {
     gtk_menu_set_screen(_SELF(self), GDK_SCREEN(RVAL2GOBJ(screen)));
     return self;
@@ -36,8 +34,7 @@ menu_set_screen(self, screen)
 #endif
 
 static VALUE
-menu_reorder_child(self, child, position)
-    VALUE self, child, position;
+menu_reorder_child(VALUE self, VALUE child, VALUE position)
 {
     gtk_menu_reorder_child(_SELF(self), GTK_WIDGET(RVAL2GOBJ(child)),
                            NUM2INT(position));
@@ -46,8 +43,7 @@ menu_reorder_child(self, child, position)
 
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-menu_attach(self, child, left_attach, right_attach, top_attach, bottom_attach)
-    VALUE self, child, left_attach, right_attach, top_attach, bottom_attach;
+menu_attach(VALUE self, VALUE child, VALUE left_attach, VALUE right_attach, VALUE top_attach, VALUE bottom_attach)
 {
     gtk_menu_attach(_SELF(self), GTK_WIDGET(RVAL2GOBJ(child)), 
                     NUM2UINT(left_attach), NUM2UINT(right_attach), 
@@ -57,11 +53,7 @@ menu_attach(self, child, left_attach, right_attach, top_attach, bottom_attach)
 #endif
 
 static void
-menu_pos_func(menu, px, py, push_in, data)
-    GtkMenu *menu;
-    gint *px, *py;
-    gboolean *push_in;
-    gpointer data;
+menu_pos_func(GtkMenu *menu, gint *px, gint *py, gboolean *push_in, gpointer data)
 {
     VALUE arr = rb_funcall((VALUE)data, id_call, 4, GOBJ2RVAL(menu), 
                            INT2FIX(*px), INT2FIX(*py), 
@@ -79,8 +71,7 @@ menu_pos_func(menu, px, py, push_in, data)
 
 /* the proc should return [x, y, push_in] */
 static VALUE
-menu_popup(self, pshell, pitem, button, activate_time)
-    VALUE self, pshell, pitem, button, activate_time;
+menu_popup(VALUE self, VALUE pshell, VALUE pitem, VALUE button, VALUE activate_time)
 {
     GtkWidget *gpshell = NULL;
     GtkWidget *gpitem = NULL;
@@ -108,8 +99,7 @@ menu_popup(self, pshell, pitem, button, activate_time)
 }
 
 static VALUE
-menu_set_accel_group(self, accel_group)
-    VALUE self, accel_group;
+menu_set_accel_group(VALUE self, VALUE accel_group)
 {
     gtk_menu_set_accel_group(_SELF(self), 
                              GTK_ACCEL_GROUP(RVAL2GOBJ(accel_group)));
@@ -117,46 +107,40 @@ menu_set_accel_group(self, accel_group)
 }
 
 static VALUE
-menu_get_accel_group(self)
-    VALUE self;
+menu_get_accel_group(VALUE self)
 {
     return GOBJ2RVAL(gtk_menu_get_accel_group(_SELF(self)));
 }
 
 static VALUE
-menu_set_accel_path(self, accel_path)
-    VALUE self, accel_path;
+menu_set_accel_path(VALUE self, VALUE accel_path)
 {
     gtk_menu_set_accel_path(_SELF(self), RVAL2CSTR(accel_path));
     return self;
 }
 
 static VALUE
-menu_get_tearoff_state(self)
-    VALUE self;
+menu_get_tearoff_state(VALUE self)
 {
     return CBOOL2RVAL(gtk_menu_get_tearoff_state(_SELF(self)));
 }
 
 static VALUE
-menu_popdown(self)
-    VALUE self;
+menu_popdown(VALUE self)
 {
     gtk_menu_popdown(_SELF(self));
     return self;
 }
 
 static VALUE
-menu_reposition(self)
-    VALUE self;
+menu_reposition(VALUE self)
 {
     gtk_menu_reposition(_SELF(self));
     return self;
 }
 
 static VALUE
-menu_get_active(self)
-    VALUE self;
+menu_get_active(VALUE self)
 {
     GtkWidget *mitem = gtk_menu_get_active(_SELF(self));
 
@@ -164,16 +148,14 @@ menu_get_active(self)
 }
 
 static VALUE
-menu_set_active(self, active)
-    VALUE self, active;
+menu_set_active(VALUE self, VALUE active)
 {
     gtk_menu_set_active(_SELF(self), NUM2INT(active));
     return self;
 }
 
 static VALUE
-menu_set_tearoff_state(self, torn_off)
-    VALUE self, torn_off;
+menu_set_tearoff_state(VALUE self, VALUE torn_off)
 {
     gtk_menu_set_tearoff_state(_SELF(self), RVAL2CBOOL(torn_off));
     return self;
@@ -181,17 +163,14 @@ menu_set_tearoff_state(self, torn_off)
 
 static VALUE menu_detacher;
 static void
-detach_func(attach_widget, menu)
-    GtkWidget* attach_widget;
-    GtkMenu* menu;
+detach_func(GtkWidget *attach_widget, GtkMenu *menu)
 {
     rb_funcall((VALUE)menu_detacher, id_call, 2, 
                GOBJ2RVAL(attach_widget), GOBJ2RVAL(menu));    
 }
 
 static VALUE
-menu_attach_to_widget(self, attach_widget)
-    VALUE self, attach_widget;
+menu_attach_to_widget(VALUE self, VALUE attach_widget)
 {
     menu_detacher = rb_block_proc();
     G_RELATIVE(self, menu_detacher);
@@ -202,24 +181,21 @@ menu_attach_to_widget(self, attach_widget)
 }
 
 static VALUE
-menu_detach(self)
-    VALUE self;
+menu_detach(VALUE self)
 {
     gtk_menu_detach(_SELF(self));
     return self;
 }
 
 static VALUE
-menu_get_attach_widget(self)
-    VALUE self;
+menu_get_attach_widget(VALUE self)
 {
     return GOBJ2RVAL(gtk_menu_get_attach_widget(_SELF(self)));
 }
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-menu_s_get_for_attach_widget(self, widget)
-    VALUE self, widget;
+menu_s_get_for_attach_widget(VALUE self, VALUE widget)
 {
     /* Owned by GTK+ */
     return GLIST2ARY(gtk_menu_get_for_attach_widget(GTK_WIDGET(RVAL2GOBJ(widget))));
@@ -228,8 +204,7 @@ menu_s_get_for_attach_widget(self, widget)
 
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-menu_set_monitor(self, monitor_num)
-    VALUE self, monitor_num;
+menu_set_monitor(VALUE self, VALUE monitor_num)
 {
     gtk_menu_set_monitor(_SELF(self), NUM2INT(monitor_num));
     return self;