gtk2 0.90.7 → 0.90.8

data/ext/gtk2/rbgtkimcontextsimple.c

@@ -13,16 +13,14 @@
 #define _SELF(self) (GTK_IM_CONTEXT_SIMPLE(RVAL2GOBJ(self)))
 
 static VALUE 
-imcsimple_initialize(self)
-    VALUE self;
+imcsimple_initialize(VALUE self)
 {
     G_INITIALIZE(self, gtk_im_context_simple_new());
     return Qnil;
 }
 
 static VALUE
-imcsimple_add_table(self, data, max_seq_len, n_seqs)
-    VALUE self, data, max_seq_len, n_seqs;
+imcsimple_add_table(VALUE self, VALUE data, VALUE max_seq_len, VALUE n_seqs)
 {
     int i;
     guint16* gdata = ALLOCA_N(guint16, RARRAY_LEN(data));

data/ext/gtk2/rbgtkimmulticontext.c

@@ -13,16 +13,14 @@
 #define _SELF(self) (GTK_IM_MULTICONTEXT(RVAL2GOBJ(self)))
 
 static VALUE 
-immulti_initialize(self)
-    VALUE self;
+immulti_initialize(VALUE self)
 {
     G_INITIALIZE(self, gtk_im_multicontext_new());
     return Qnil;
 }
 
 static VALUE
-immulti_append_menuitems(self, menushell)
-    VALUE self, menushell;
+immulti_append_menuitems(VALUE self, VALUE menushell)
 {
     gtk_im_multicontext_append_menuitems(_SELF(self), RVAL2GOBJ(menushell));
     return self;

data/ext/gtk2/rbgtkinputdialog.c

@@ -15,8 +15,7 @@
 #include "global.h"
 
 static VALUE
-idiag_initialize(self)
-    VALUE self;
+idiag_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_input_dialog_new());
     return Qnil;

data/ext/gtk2/rbgtkinvisible.c

@@ -13,10 +13,7 @@
 #define _SELF(s) GTK_INVISIBLE(RVAL2GOBJ(s))
 
 static VALUE
-invisible_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+invisible_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE screen;
 
@@ -37,16 +34,14 @@ invisible_initialize(argc, argv, self)
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-invisible_set_screen(self, screen)
-    VALUE self, screen;
+invisible_set_screen(VALUE self, VALUE screen)
 {
     gtk_invisible_set_screen(_SELF(self), GDK_SCREEN(RVAL2GOBJ(screen)));
     return self;
 }
 
 static VALUE
-invisible_get_screen(self)
-    VALUE self;
+invisible_get_screen(VALUE self)
 {
     return GOBJ2RVAL(gtk_invisible_get_screen(_SELF(self)));
 }

data/ext/gtk2/rbgtkitem.c

@@ -18,24 +18,21 @@
  * Item
  */
 static VALUE
-item_select(self)
-    VALUE self;
+item_select(VALUE self)
 {
     gtk_item_select(GTK_ITEM(RVAL2GOBJ(self)));
     return self;
 }
 
 static VALUE
-item_deselect(self)
-    VALUE self;
+item_deselect(VALUE self)
 {
     gtk_item_deselect(GTK_ITEM(RVAL2GOBJ(self)));
     return self;
 }
 
 static VALUE
-item_toggle(self)
-    VALUE self;
+item_toggle(VALUE self)
 {
     gtk_item_toggle(GTK_ITEM(RVAL2GOBJ(self)));
     return self;

data/ext/gtk2/rbgtkitemfactory.c

@@ -23,9 +23,7 @@ static VALUE action_table;
 static guint action_id = 0;
 
 static VALUE
-ifact_initialize(self, type, path, accel)
-    VALUE self;
-    VALUE type, path, accel;
+ifact_initialize(VALUE self, VALUE type, VALUE path, VALUE accel)
 {
     VALUE obj = rb_eval_string("eval('self', binding)");
     G_RELATIVE(obj, self);
@@ -36,10 +34,7 @@ ifact_initialize(self, type, path, accel)
 }
 
 static VALUE
-ifact_construct(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+ifact_construct(int argc, VALUE *argv, VALUE self)
 {
     VALUE type, path, accel;
     GtkItemFactory* ifact = _SELF(self);
@@ -52,8 +47,7 @@ ifact_construct(argc, argv, self)
 }
  
 static VALUE
-ifact_s_from_widget(self, widget)
-    VALUE self, widget;
+ifact_s_from_widget(VALUE self, VALUE widget)
 {
     VALUE obj = GOBJ2RVAL(gtk_item_factory_from_widget(RVAL2WIDGET(widget)));
     G_RELATIVE(obj, self);
@@ -61,15 +55,13 @@ ifact_s_from_widget(self, widget)
 }
 
 static VALUE
-ifact_s_path_from_widget(self, widget)
-    VALUE self, widget;
+ifact_s_path_from_widget(VALUE self, VALUE widget)
 {
     return CSTR2RVAL(gtk_item_factory_path_from_widget(RVAL2WIDGET(widget)));
 }
 
 static VALUE
-ifact_get_item(self, path)
-    VALUE self, path;
+ifact_get_item(VALUE self, VALUE path)
 {
     VALUE obj = Qnil;
     GtkWidget* widget = gtk_item_factory_get_item(_SELF(self), RVAL2CSTR(path));
@@ -81,8 +73,7 @@ ifact_get_item(self, path)
 }
 
 static VALUE
-ifact_get_widget(self, path)
-    VALUE self, path;
+ifact_get_widget(VALUE self, VALUE path)
 {
     VALUE obj = Qnil;
     GtkWidget* widget = gtk_item_factory_get_widget(_SELF(self), RVAL2CSTR(path));
@@ -103,8 +94,7 @@ GtkWidget*  gtk_item_factory_get_item_by_action
 */
 
 static int
-menuitem_type_check(item_type)
-    char *item_type;
+menuitem_type_check(char *item_type)
 {
     if (item_type == NULL || strcmp(item_type, "<Branch>") == 0 
         || (strcmp(item_type, "<LastBranch>") == 0)
@@ -115,10 +105,7 @@ menuitem_type_check(item_type)
 }
 
 static void
-items_exec_callback_wrap(callback_data, action_id, widget)
-    VALUE callback_data;
-    guint action_id;
-    GtkWidget* widget;
+items_exec_callback_wrap(VALUE callback_data, guint action_id, GtkWidget *widget)
 {
     VALUE iter, data;
     VALUE action = rb_hash_aref(action_table, UINT2NUM(action_id));
@@ -131,9 +118,7 @@ items_exec_callback_wrap(callback_data, action_id, widget)
 }
 
 static void
-create_factory_entry(entry, self, path, item_type, accel, extdata, func, data)
-    GtkItemFactoryEntry* entry;
-    VALUE self, path, item_type, accel, extdata, func, data;
+create_factory_entry(GtkItemFactoryEntry *entry, VALUE self, VALUE path, VALUE item_type, VALUE accel, VALUE extdata, VALUE func, VALUE data)
 {
     VALUE action;
 
@@ -173,10 +158,7 @@ create_factory_entry(entry, self, path, item_type, accel, extdata, func, data)
 }  
 
 static VALUE
-ifact_create_item(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+ifact_create_item(int argc, VALUE *argv, VALUE self)
 {
     VALUE path, type, accel, extdata, data, func;
     GtkItemFactoryEntry *entry;
@@ -194,8 +176,7 @@ ifact_create_item(argc, argv, self)
 }
 
 static VALUE
-ifact_create_items(self, ary)
-    VALUE self, ary;
+ifact_create_items(VALUE self, VALUE ary)
 {
     VALUE entry, path, accel, type, func, data, extdata;
     GtkItemFactoryEntry *entries;
@@ -226,8 +207,7 @@ ifact_create_items(self, ary)
 
 
 static VALUE
-ifact_delete_item(self, path)
-    VALUE self, path;
+ifact_delete_item(VALUE self, VALUE path)
 {
     gtk_item_factory_delete_item(_SELF(self), RVAL2CSTR(path));
     return self;
@@ -243,8 +223,7 @@ void        gtk_item_factory_delete_entries (GtkItemFactory *ifactory,
 */
 
 static VALUE
-ifact_popup(self, x, y, mouse_button, time)
-    VALUE self, x, y, mouse_button, time;
+ifact_popup(VALUE self, VALUE x, VALUE y, VALUE mouse_button, VALUE time)
 {
     gtk_item_factory_popup(_SELF(self), NUM2UINT(x), NUM2UINT(y), NUM2UINT(mouse_button),
                            NUM2UINT(time));

data/ext/gtk2/rbgtklabel.c

@@ -17,10 +17,7 @@
 #define _SELF(s) (GTK_LABEL(RVAL2GOBJ(s)))
 
 static VALUE
-label_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+label_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE label, with_mnemonic;
     GtkWidget* widget = NULL;
@@ -37,18 +34,14 @@ label_initialize(argc, argv, self)
 }
 
 static VALUE
-label_set_text_only(self, text)
-    VALUE self, text;
+label_set_text_only(VALUE self, VALUE text)
 {
     gtk_label_set_text(_SELF(self), RVAL2CSTR(text));
     return text;
 }
 
 static VALUE
-label_set_text(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+label_set_text(int argc, VALUE *argv, VALUE self)
 {
     VALUE label, with_mnemonic;
 
@@ -62,18 +55,14 @@ label_set_text(argc, argv, self)
 }
 
 static VALUE
-label_set_markup_only(self, text)
-    VALUE self, text;
+label_set_markup_only(VALUE self, VALUE text)
 {
     gtk_label_set_markup(_SELF(self), RVAL2CSTR(text));
     return text;
 }
 
 static VALUE
-label_set_markup(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+label_set_markup(int argc, VALUE *argv, VALUE self)
 {
     VALUE str, with_mnemonic;
     rb_scan_args(argc, argv, "02", &str, &with_mnemonic);
@@ -87,8 +76,7 @@ label_set_markup(argc, argv, self)
 }
 
 static VALUE
-label_get_layout_offsets(self)
-    VALUE self;
+label_get_layout_offsets(VALUE self)
 { 
     gint x, y;
     gtk_label_get_layout_offsets(_SELF(self), &x, &y);
@@ -96,30 +84,26 @@ label_get_layout_offsets(self)
 }
 
 static VALUE
-label_get_text(self)
-    VALUE self;
+label_get_text(VALUE self)
 {
     return CSTR2RVAL(gtk_label_get_text(_SELF(self)));
 }
 
 static VALUE
-label_select_region(self, start_offset, end_offset)
-    VALUE self, start_offset, end_offset;
+label_select_region(VALUE self, VALUE start_offset, VALUE end_offset)
 {
     gtk_label_select_region(_SELF(self), NUM2INT(start_offset), NUM2INT(end_offset));
     return self;
 }
 
 static VALUE
-label_get_layout(self)
-    VALUE self;
+label_get_layout(VALUE self)
 {
     return GOBJ2RVAL(gtk_label_get_layout(_SELF(self)));
 }
 
 static VALUE
-label_get_selection_bounds(self)
-    VALUE self;
+label_get_selection_bounds(VALUE self)
 {
     gint start, end;
     gboolean ret = gtk_label_get_selection_bounds(_SELF(self), &start, &end);

data/ext/gtk2/rbgtklayout.c

@@ -18,10 +18,7 @@
 #define RVAL2ADJ(a) (GTK_ADJUSTMENT(RVAL2GOBJ(a)))
 
 static VALUE
-layout_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+layout_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE hadjustment, vadjustment;
     GtkWidget* layout;
@@ -36,8 +33,7 @@ layout_initialize(argc, argv, self)
 }
 
 static VALUE
-layout_put(self, widget, x, y)
-    VALUE self, widget, x, y;
+layout_put(VALUE self, VALUE widget, VALUE x, VALUE y)
 {
     gtk_layout_put(_SELF(self), GTK_WIDGET(RVAL2GOBJ(widget)),
 		   NUM2INT(x), NUM2INT(y));
@@ -45,8 +41,7 @@ layout_put(self, widget, x, y)
 }
 
 static VALUE
-layout_move(self, widget, x,  y)
-    VALUE self, widget, x, y;
+layout_move(VALUE self, VALUE widget, VALUE x, VALUE y)
 {
     gtk_layout_move(_SELF(self), GTK_WIDGET(RVAL2GOBJ(widget)),
 		    NUM2INT(x), NUM2INT(y));
@@ -54,16 +49,14 @@ layout_move(self, widget, x,  y)
 }
 
 static VALUE
-layout_set_size(self, width, height)
-    VALUE self, width, height;
+layout_set_size(VALUE self, VALUE width, VALUE height)
 {
     gtk_layout_set_size(_SELF(self), NUM2UINT(width), NUM2UINT(height));
     return self;
 }
 
 static VALUE
-layout_get_size(self)
-    VALUE self;
+layout_get_size(VALUE self)
 {
     guint width, height;
     gtk_layout_get_size(_SELF(self), &width, &height);
@@ -71,8 +64,7 @@ layout_get_size(self)
 }
 
 static VALUE
-layout_get_bin_window(self)
-    VALUE self;
+layout_get_bin_window(VALUE self)
 {
     return GOBJ2RVAL(_SELF(self)->bin_window);
 }

data/ext/gtk2/rbgtklinkbutton.c

@@ -16,10 +16,7 @@
 #define _SELF(self) (GTK_LINK_BUTTON(RVAL2GOBJ(self)))
 
 static VALUE
-lb_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+lb_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE uri, label;
     GtkWidget *widget = NULL;
@@ -35,17 +32,13 @@ lb_initialize(argc, argv, self)
 }
 
 static void
-link_func(button, link, func)
-    GtkLinkButton* button;
-    const gchar* link;
-    gpointer func;
+link_func(GtkLinkButton *button, const gchar *link, gpointer func)
 {
     rb_funcall((VALUE)func, id_call, 2, GOBJ2RVAL(button), CSTR2RVAL(link));
 }
 
 static VALUE
-lb_set_uri_hook(self)
-    VALUE self;
+lb_set_uri_hook(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);

data/ext/gtk2/rbgtkliststore.c

@@ -16,10 +16,7 @@
 static ID id_to_a, id_size;
 
 static VALUE
-lstore_initialize(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE  self;
+lstore_initialize(int argc, VALUE *argv, VALUE self)
 {
     gint cnt;
     GtkListStore* store;
@@ -40,10 +37,7 @@ lstore_initialize(argc, argv, self)
 }
 
 static VALUE
-lstore_set_column_types(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE  self;
+lstore_set_column_types(int argc, VALUE *argv, VALUE self)
 {
     gint cnt;
     GType* buf;
@@ -60,8 +54,7 @@ lstore_set_column_types(argc, argv, self)
 }
 
 static VALUE
-lstore_set_value(self, iter, column, value)
-    VALUE self, iter, column, value;
+lstore_set_value(VALUE self, VALUE iter, VALUE column, VALUE value)
 {
     GType gtype = gtk_tree_model_get_column_type(GTK_TREE_MODEL(RVAL2GOBJ(self)), NUM2INT(column));
     GValue gval = {0,};
@@ -188,8 +181,7 @@ lstore_set_valuesv(VALUE self, VALUE iter, VALUE values)
 */
     
 static VALUE
-lstore_remove(self, iter)
-    VALUE self, iter;
+lstore_remove(VALUE self, VALUE iter)
 {
     G_CHILD_REMOVE(self, iter);
 #if GTK_CHECK_VERSION(2,2,0)
@@ -204,10 +196,7 @@ lstore_remove(self, iter)
   Gtk::ListStore#insert(pos, val1 => 0, val2 => 2, ... )
  */
 static VALUE
-lstore_insert(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE  self;
+lstore_insert(int argc, VALUE *argv, VALUE self)
 {
     VALUE position, values, ret;
     GtkTreeIter iter;
@@ -260,8 +249,7 @@ lstore_insert(argc, argv, self)
 }
 
 static VALUE
-lstore_insert_before(self, sibling)
-    VALUE self, sibling;
+lstore_insert_before(VALUE self, VALUE sibling)
 {
     VALUE ret;
     GtkTreeIter iter;
@@ -275,8 +263,7 @@ lstore_insert_before(self, sibling)
 }
 
 static VALUE
-lstore_insert_after(self, sibling)
-    VALUE self, sibling;
+lstore_insert_after(VALUE self, VALUE sibling)
 { 
     VALUE ret;
     GtkTreeIter iter;
@@ -290,8 +277,7 @@ lstore_insert_after(self, sibling)
 }
 
 static VALUE
-lstore_prepend(self)
-    VALUE self;
+lstore_prepend(VALUE self)
 {
     VALUE ret;
     GtkTreeIter iter;
@@ -305,8 +291,7 @@ lstore_prepend(self)
 }
 
 static VALUE
-lstore_append(self)
-    VALUE self;
+lstore_append(VALUE self)
 {
     VALUE ret;
     GtkTreeIter iter;
@@ -320,8 +305,7 @@ lstore_append(self)
 }
 
 static VALUE
-lstore_clear(self)
-    VALUE self;
+lstore_clear(VALUE self)
 {
     G_CHILD_REMOVE_ALL(self);
     gtk_list_store_clear(_SELF(self));
@@ -330,16 +314,14 @@ lstore_clear(self)
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-lstore_iter_is_valid(self, iter)
-    VALUE self, iter;
+lstore_iter_is_valid(VALUE self, VALUE iter)
 {
     return (NIL_P(iter)) ? Qfalse :
         CBOOL2RVAL(gtk_list_store_iter_is_valid(_SELF(self), RVAL2GTKTREEITER(iter)));
 }
 
 static VALUE
-lstore_reorder(self, new_order)
-    VALUE self, new_order;
+lstore_reorder(VALUE self, VALUE new_order)
 {
     gint i;
     gint len = RARRAY_LEN(new_order);
@@ -354,23 +336,20 @@ lstore_reorder(self, new_order)
     return self;
 }
 static VALUE
-lstore_swap(self, iter1, iter2)
-    VALUE self, iter1, iter2;
+lstore_swap(VALUE self, VALUE iter1, VALUE iter2)
 {
     gtk_list_store_swap(_SELF(self), RVAL2GTKTREEITER(iter1), RVAL2GTKTREEITER(iter2));
     return self;
 }
 static VALUE
-lstore_move_before(self, iter, position)
-    VALUE self, iter, position;
+lstore_move_before(VALUE self, VALUE iter, VALUE position)
 {
     gtk_list_store_move_before(_SELF(self), RVAL2GTKTREEITER(iter), 
                                NIL_P(position) ? NULL : RVAL2GTKTREEITER(position));
     return self;
 }
 static VALUE
-lstore_move_after(self, iter, position)
-    VALUE self, iter, position;
+lstore_move_after(VALUE self, VALUE iter, VALUE position)
 {
     gtk_list_store_move_after(_SELF(self), RVAL2GTKTREEITER(iter), 
                                NIL_P(position) ? NULL : RVAL2GTKTREEITER(position));