gtk2 0.90.7 → 0.90.8

data/ext/gtk2/rbgtkaccelgroupentry.c

@@ -42,8 +42,7 @@ struct _GtkAccelGroupEntry
 };
 */
 static VALUE
-agentry_initialize(self)
-    VALUE self;
+agentry_initialize(VALUE self)
 {
     GtkAccelGroupEntry key;
     G_INITIALIZE(self, &key);
@@ -51,22 +50,19 @@ agentry_initialize(self)
 }
 
 static VALUE
-agentry_get_accel_key(self)
-    VALUE self;
+agentry_get_accel_key(VALUE self)
 {
     return BOXED2RVAL(&_SELF(self)->key, GTK_TYPE_ACCEL_KEY);
 }
 
 static VALUE
-agentry_get_closure(self)
-    VALUE self;
+agentry_get_closure(VALUE self)
 {
     return BOXED2RVAL(_SELF(self)->closure, G_TYPE_CLOSURE);
 }
 
 static VALUE
-agentry_get_accel_path(self)
-    VALUE self;
+agentry_get_accel_path(VALUE self)
 {
     const gchar *quark_str = g_quark_to_string(_SELF(self)->accel_path_quark);
     return quark_str ? CSTR2RVAL(quark_str) : Qnil;

data/ext/gtk2/rbgtkaccelkey.c

@@ -44,8 +44,7 @@ struct _GtkAccelKey
 */
 
 static VALUE
-accel_key_initialize(self)
-    VALUE self;
+accel_key_initialize(VALUE self)
 {
     GtkAccelKey key;
     G_INITIALIZE(self, &key);
@@ -53,45 +52,39 @@ accel_key_initialize(self)
 }
 
 static VALUE
-accel_key_get_key(self)
-    VALUE self;
+accel_key_get_key(VALUE self)
 {
     return UINT2NUM(_SELF(self)->accel_key);
 }
 
 static VALUE
-accel_key_get_mods(self)
-    VALUE self;
+accel_key_get_mods(VALUE self)
 {
     return GFLAGS2RVAL(_SELF(self)->accel_mods, GDK_TYPE_MODIFIER_TYPE);
 }
 
 static VALUE
-accel_key_get_flags(self)
-    VALUE self;
+accel_key_get_flags(VALUE self)
 {
     return INT2FIX(_SELF(self)->accel_flags);
 }
 
 static VALUE
-accel_key_set_key(self, key)
-    VALUE self, key;
+accel_key_set_key(VALUE self, VALUE key)
 {
     _SELF(self)->accel_key = NUM2UINT(key);
     return self;
 }
 
 static VALUE
-accel_key_set_mods(self, mods)
-    VALUE self, mods;
+accel_key_set_mods(VALUE self, VALUE mods)
 {
     _SELF(self)->accel_mods = RVAL2GFLAGS(mods, GDK_TYPE_MODIFIER_TYPE);
     return self;
 }
 
 static VALUE
-accel_key_set_flags(self, flags)
-    VALUE self, flags;
+accel_key_set_flags(VALUE self, VALUE flags)
 {
     _SELF(self)->accel_flags = FIX2INT(flags);
     return self;

data/ext/gtk2/rbgtkaccellabel.c

@@ -13,23 +13,20 @@
 #include "global.h"
 
 static VALUE
-alabel_initialize(self, string)
-    VALUE self, string;
+alabel_initialize(VALUE self, VALUE string)
 {
     RBGTK_INITIALIZE(self, gtk_accel_label_new(RVAL2CSTR(string)));
     return Qnil;
 }
 
 static VALUE
-alabel_get_accel_width(self)
-	 VALUE self;
+alabel_get_accel_width(VALUE self)
 {
     return INT2NUM(gtk_accel_label_get_accel_width(GTK_ACCEL_LABEL(RVAL2GOBJ(self))));
 }
 
 static VALUE
-alabel_refetch(self)
-	 VALUE self;
+alabel_refetch(VALUE self)
 {
     gtk_accel_label_refetch(GTK_ACCEL_LABEL(RVAL2GOBJ(self)));
     return Qfalse; // always returns false

data/ext/gtk2/rbgtkaccelmap.c

@@ -13,16 +13,14 @@
 #define RVAL2MOD(mods) (NIL_P(mods) ? 0 : RVAL2GFLAGS(mods, GDK_TYPE_MODIFIER_TYPE))
 
 static VALUE
-accel_map_add_entry(self, path, key, mods)
-    VALUE self, path, key, mods;
+accel_map_add_entry(VALUE self, VALUE path, VALUE key, VALUE mods)
 {
     gtk_accel_map_add_entry(RVAL2CSTR(path), NUM2UINT(key), RVAL2MOD(mods));
     return self;
 }
 
 static VALUE
-accel_map_lookup_entry(self, path)
-    VALUE self, path;
+accel_map_lookup_entry(VALUE self, VALUE path)
 {
     GtkAccelKey key;
     if(gtk_accel_map_lookup_entry(RVAL2CSTR(path), &key))
@@ -32,44 +30,35 @@ accel_map_lookup_entry(self, path)
 }
 
 static VALUE
-accel_map_change_entry(self, path, key, mods, replace)
-    VALUE self, path, key, mods, replace;
+accel_map_change_entry(VALUE self, VALUE path, VALUE key, VALUE mods, VALUE replace)
 {
     return CBOOL2RVAL(gtk_accel_map_change_entry(RVAL2CSTR(path), NUM2UINT(key),
                                                  RVAL2MOD(mods), RVAL2CBOOL(replace)));
 }
 
 static VALUE
-accel_map_load(self, filename)
-    VALUE self, filename;
+accel_map_load(VALUE self, VALUE filename)
 {
     gtk_accel_map_load(RVAL2CSTR(filename));
     return self;
 }
 
 static VALUE
-accel_map_save(self, filename)
-    VALUE self, filename;
+accel_map_save(VALUE self, VALUE filename)
 {
     gtk_accel_map_save(RVAL2CSTR(filename));
     return self;
 }
 
 static VALUE
-accel_map_add_filter(self, pattern)
-    VALUE self, pattern;
+accel_map_add_filter(VALUE self, VALUE pattern)
 {
     gtk_accel_map_add_filter(RVAL2CSTR(pattern));
     return self;
 }
 
 static void
-accel_map_foreach_func(func, path, key, mods, changed)
-    gpointer func;
-    const gchar *path;
-    guint key;
-    GdkModifierType mods;
-    gboolean changed;
+accel_map_foreach_func(gpointer func, const gchar *path, guint key, GdkModifierType mods, gboolean changed)
 {
     rb_funcall((VALUE)func, id_call, 4,
                CSTR2RVAL(path), UINT2NUM(key), GFLAGS2RVAL(mods, GDK_TYPE_MODIFIER_TYPE),
@@ -77,8 +66,7 @@ accel_map_foreach_func(func, path, key, mods, changed)
 }
 
 static VALUE
-accel_map_foreach(self)
-    VALUE self;
+accel_map_foreach(VALUE self)
 {
     volatile VALUE func = rb_block_proc();
     gtk_accel_map_foreach((gpointer)func,
@@ -87,8 +75,7 @@ accel_map_foreach(self)
 }
 
 static VALUE
-accel_map_foreach_unfilterd(self)
-    VALUE self;
+accel_map_foreach_unfilterd(VALUE self)
 {
     volatile VALUE func = rb_block_proc();
     gtk_accel_map_foreach_unfiltered((gpointer)func,
@@ -107,23 +94,20 @@ void        gtk_accel_map_save_fd           (gint fd);
 
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-accel_map_get(self)
-    VALUE self;
+accel_map_get(VALUE self)
 {
     return GOBJ2RVAL(gtk_accel_map_get());
 }
 
 static VALUE
-accel_map_lock_path(self, accel_path)
-    VALUE self, accel_path;
+accel_map_lock_path(VALUE self, VALUE accel_path)
 {
     gtk_accel_map_lock_path(RVAL2CSTR(accel_path));
     return self;
 }
 
 static VALUE
-accel_map_unlock_path(self, accel_path)
-    VALUE self, accel_path;
+accel_map_unlock_path(VALUE self, VALUE accel_path)
 {
     gtk_accel_map_unlock_path(RVAL2CSTR(accel_path));
     return self;

data/ext/gtk2/rbgtkaccessible.c

@@ -12,8 +12,7 @@
 #include "global.h"
 
 static VALUE
-access_connect_widget_destroyed(self)
-     VALUE self;
+access_connect_widget_destroyed(VALUE self)
 {
     gtk_accessible_connect_widget_destroyed(GTK_ACCESSIBLE(RVAL2GOBJ(self)));
     return self;

data/ext/gtk2/rbgtkaction.c

@@ -17,10 +17,7 @@
 #define RVAL2WIDGET(w) (GTK_WIDGET(RVAL2GOBJ(w)))
 
 static VALUE
-action_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+action_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE name, label, tooltip, stock_id;
     const gchar *stock = NULL;
@@ -40,15 +37,13 @@ action_initialize(argc, argv, self)
 }
 
 static VALUE
-action_is_sensitive(self)
-    VALUE self;
+action_is_sensitive(VALUE self)
 {
     return CBOOL2RVAL(gtk_action_is_sensitive(_SELF(self)));
 }
 
 static VALUE
-action_is_visible(self)
-    VALUE self;
+action_is_visible(VALUE self)
 {
     return CBOOL2RVAL(gtk_action_is_visible(_SELF(self)));
 }
@@ -60,24 +55,21 @@ gboolean    gtk_action_get_visible          (GtkAction *action);
 */
 
 static VALUE
-action_activate(self)
-    VALUE self;
+action_activate(VALUE self)
 {
     gtk_action_activate(_SELF(self));
     return self;
 }
 
 static VALUE
-action_create_icon(self, icon_size)
-    VALUE self, icon_size;
+action_create_icon(VALUE self, VALUE icon_size)
 {
     return GOBJ2RVAL(gtk_action_create_icon(_SELF(self), 
                                             RVAL2GENUM(icon_size, GTK_TYPE_ICON_SIZE)));
 }
 
 static VALUE
-action_create_menu_item(self)
-    VALUE self;
+action_create_menu_item(VALUE self)
 {
     return GOBJ2RVAL(gtk_action_create_menu_item(_SELF(self)));
 }
@@ -91,78 +83,68 @@ action_create_menu(VALUE self)
 #endif
 
 static VALUE
-action_create_tool_item(self)
-    VALUE self;
+action_create_tool_item(VALUE self)
 {
     return GOBJ2RVAL(gtk_action_create_tool_item(_SELF(self)));
 }
 
 static VALUE
-action_connect_proxy(self, proxy)
-    VALUE self, proxy;
+action_connect_proxy(VALUE self, VALUE proxy)
 {
     gtk_action_connect_proxy(_SELF(self), RVAL2WIDGET(proxy));
     return self;
 }
 
 static VALUE
-action_disconnect_proxy(self, proxy)
-    VALUE self, proxy;
+action_disconnect_proxy(VALUE self, VALUE proxy)
 {
     gtk_action_disconnect_proxy(_SELF(self), RVAL2WIDGET(proxy));
     return self;
 }
 
 static VALUE
-action_get_proxies(self)
-    VALUE self;
+action_get_proxies(VALUE self)
 {
     /* Owned by GTK+ */
     return GSLIST2ARY(gtk_action_get_proxies(_SELF(self)));
 }
 
 static VALUE
-action_connect_accelerator(self)
-    VALUE self;
+action_connect_accelerator(VALUE self)
 {
     gtk_action_connect_accelerator(_SELF(self));
     return self;
 }
 
 static VALUE
-action_disconnect_accelerator(self)
-    VALUE self;
+action_disconnect_accelerator(VALUE self)
 {
     gtk_action_disconnect_accelerator(_SELF(self));
     return self;
 }
 
 static VALUE
-action_block_activate_from(self, proxy)
-    VALUE self, proxy;
+action_block_activate_from(VALUE self, VALUE proxy)
 {
     gtk_action_block_activate_from(_SELF(self), RVAL2WIDGET(proxy));
     return self;
 }
 
 static VALUE
-action_unblock_activate_from(self, proxy)
-    VALUE self, proxy;
+action_unblock_activate_from(VALUE self, VALUE proxy)
 {
     gtk_action_unblock_activate_from(_SELF(self), RVAL2WIDGET(proxy));
     return self;
 }
 
 static VALUE
-action_set_accel_path(self, accel_path)
-    VALUE self, accel_path;
+action_set_accel_path(VALUE self, VALUE accel_path)
 {
     gtk_action_set_accel_path(_SELF(self), RVAL2CSTR(accel_path));
     return self;
 }
 static VALUE
-action_set_accel_group(self, accel_group)
-    VALUE self, accel_group;
+action_set_accel_group(VALUE self, VALUE accel_group)
 {
     gtk_action_set_accel_group(_SELF(self), RVAL2GOBJ(accel_group));
     return self;
@@ -174,8 +156,7 @@ action_set_accel_group(self, accel_group)
    Use GLib::Object#set_property("sensitive", val) instead.
  */
 static VALUE
-action_set_sensitive(self, sensitive)
-    VALUE self, sensitive;
+action_set_sensitive(VALUE self, VALUE sensitive)
 {
     gtk_action_set_sensitive(_SELF(self), RVAL2CBOOL(sensitive));
     return self;
@@ -186,16 +167,14 @@ action_set_sensitive(self, sensitive)
    Use GLib::Object#set_property("visible", val) instead.
 */
 static VALUE
-action_set_visible(self, visible)
-    VALUE self, visible;
+action_set_visible(VALUE self, VALUE visible)
 {
     gtk_action_set_visible(_SELF(self), RVAL2CBOOL(visible));
     return self;
 }
 
 static VALUE
-action_get_accel_path(self)
-    VALUE self;
+action_get_accel_path(VALUE self)
 {
     return CSTR2RVAL(gtk_action_get_accel_path(_SELF(self)));
 }
@@ -203,8 +182,7 @@ action_get_accel_path(self)
 
 #if GTK_CHECK_VERSION(2,8,0)
 static VALUE
-action_get_accel_closure(self)
-    VALUE self;
+action_get_accel_closure(VALUE self)
 {
     return BOXED2RVAL(gtk_action_get_accel_closure(_SELF(self)), G_TYPE_CLOSURE);
 }

data/ext/gtk2/rbgtkactiongroup.c

@@ -20,8 +20,7 @@ static ID id_toggle_action_procs;
 #define RVAL2WIDGET(w) (GTK_WIDGET(RVAL2GOBJ(w)))
 
 static VALUE
-actiongroup_initialize(self, name)
-    VALUE self, name;
+actiongroup_initialize(VALUE self, VALUE name)
 {
     G_INITIALIZE(self, gtk_action_group_new(RVAL2CSTR(name)));
     return Qnil;
@@ -38,24 +37,19 @@ void        gtk_action_group_set_visible    (GtkActionGroup *action_group,
 */
 
 static VALUE
-actiongroup_get_action(self, action_name)
-    VALUE self, action_name;
+actiongroup_get_action(VALUE self, VALUE action_name)
 {
     return GOBJ2RVAL(gtk_action_group_get_action(_SELF(self), RVAL2CSTR(action_name)));
 }
 
 static VALUE
-actiongroup_list_actions(self)
-    VALUE self;
+actiongroup_list_actions(VALUE self)
 {
     return GLIST2ARYF(gtk_action_group_list_actions(_SELF(self)));
 }
 
 static VALUE
-actiongroup_add_action(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+actiongroup_add_action(int argc, VALUE *argv, VALUE self)
 {
     VALUE action, accelerator;
 
@@ -70,8 +64,7 @@ actiongroup_add_action(argc, argv, self)
 }
 
 static VALUE
-actiongroup_remove_action(self, action)
-    VALUE self, action;
+actiongroup_remove_action(VALUE self, VALUE action)
 {
     gtk_action_group_remove_action(_SELF(self), GTK_ACTION(RVAL2GOBJ(action)));
     G_CHILD_REMOVE(self, action);
@@ -79,9 +72,7 @@ actiongroup_remove_action(self, action)
 }
 
 static void
-activate_action(action, self)
-    GtkAction* action;
-    VALUE self;
+activate_action(GtkAction *action, VALUE self)
 {
     VALUE action_procs = rb_ivar_get(self, id_action_procs);
     VALUE proc = rb_hash_aref(action_procs, CSTR2RVAL(gtk_action_get_name(action)));
@@ -90,8 +81,7 @@ activate_action(action, self)
 }
 
 static VALUE
-actiongroup_add_actions(self, entries)
-    VALUE self, entries;
+actiongroup_add_actions(VALUE self, VALUE entries)
 {
     int i;
     VALUE action_procs;
@@ -148,9 +138,7 @@ actiongroup_add_actions(self, entries)
 }
 
 static void
-activate_toggle_action(action, self)
-    GtkAction* action;
-    VALUE self;
+activate_toggle_action(GtkAction *action, VALUE self)
 {
     VALUE action_procs = rb_ivar_get(self, id_toggle_action_procs);
     VALUE proc = rb_hash_aref(action_procs, CSTR2RVAL(gtk_action_get_name(action)));
@@ -159,8 +147,7 @@ activate_toggle_action(action, self)
 }
 
 static VALUE
-actiongroup_add_toggle_actions(self, entries)
-    VALUE self, entries;
+actiongroup_add_toggle_actions(VALUE self, VALUE entries)
 {
     int i;
     VALUE toggle_action_procs;
@@ -219,20 +206,14 @@ actiongroup_add_toggle_actions(self, entries)
 }
 
 static void
-activate_radio_action(action, current, func)
-    GtkAction* action;
-    GtkRadioAction* current;
-    VALUE func;
+activate_radio_action(GtkAction *action, GtkRadioAction *current, VALUE func)
 {
     if (! NIL_P(func))
         rb_funcall(func, id_call, 2, GOBJ2RVAL(action), GOBJ2RVAL(current));
 }
 
 static VALUE
-actiongroup_add_radio_actions(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+actiongroup_add_radio_actions(int argc, VALUE *argv, VALUE self)
 {
     VALUE entries, value, proc;
     int i;
@@ -293,17 +274,14 @@ actiongroup_add_radio_actions(argc, argv, self)
 }
 
 static gchar*
-translate_func(path, func)
-    const gchar* path;
-    gpointer func;
+translate_func(const gchar *path, gpointer func)
 {
     VALUE ret = rb_funcall((VALUE)func, id_call, 1, CSTR2RVAL(path));
     return RVAL2CSTR(ret);
 }
 
 static VALUE
-actiongroup_set_translate_func(self)
-    VALUE self;
+actiongroup_set_translate_func(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -314,8 +292,7 @@ actiongroup_set_translate_func(self)
 }
 
 static VALUE
-actiongroup_set_translation_domain(self, domain)
-    VALUE self, domain;
+actiongroup_set_translation_domain(VALUE self, VALUE domain)
 {
     gtk_action_group_set_translation_domain(_SELF(self), 
                                             NIL_P(domain) ? (const gchar*)NULL : RVAL2CSTR(domain));
@@ -324,8 +301,7 @@ actiongroup_set_translation_domain(self, domain)
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-actiongroup_translate_string(self, str)
-    VALUE self, str;
+actiongroup_translate_string(VALUE self, VALUE str)
 {
     return CSTR2RVAL(gtk_action_group_translate_string(_SELF(self), RVAL2CSTR(str)));
 }