gtk2 0.90.7 → 0.90.8

data/ext/gtk2/rbgtkdrawingarea.c

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

data/ext/gtk2/rbgtkeditable.c

@@ -15,8 +15,7 @@
 #include "global.h"
 
 static VALUE
-edit_sel_region(self, start, end)
-    VALUE self, start, end;
+edit_sel_region(VALUE self, VALUE start, VALUE end)
 {
     gtk_editable_select_region(GTK_EDITABLE(RVAL2GOBJ(self)),
 			       NUM2INT(start), NUM2INT(end));
@@ -24,8 +23,7 @@ edit_sel_region(self, start, end)
 }
 
 static VALUE
-edit_get_sel_bounds(self)
-    VALUE self;
+edit_get_sel_bounds(VALUE self)
 {
     gint start, end;
     gboolean ret;
@@ -35,8 +33,7 @@ edit_get_sel_bounds(self)
 }
 
 static VALUE
-edit_insert_text(self, new_text, pos)
-    VALUE self, new_text, pos;
+edit_insert_text(VALUE self, VALUE new_text, VALUE pos)
 {
     gint p = NUM2INT(pos);
 
@@ -49,8 +46,7 @@ edit_insert_text(self, new_text, pos)
 }
 
 static VALUE
-edit_delete_text(self, start, end)
-    VALUE self, start, end;
+edit_delete_text(VALUE self, VALUE start, VALUE end)
 {
     gtk_editable_delete_text(GTK_EDITABLE(RVAL2GOBJ(self)),
 			     NUM2INT(start), NUM2INT(end));
@@ -58,8 +54,7 @@ edit_delete_text(self, start, end)
 }
 
 static VALUE
-edit_get_chars(self, start, end)
-    VALUE self, start, end;
+edit_get_chars(VALUE self, VALUE start, VALUE end)
 {
     return CSTR2RVAL_FREE(
     	gtk_editable_get_chars(GTK_EDITABLE(RVAL2GOBJ(self)),   /* check s */
@@ -67,23 +62,20 @@ edit_get_chars(self, start, end)
 }
 
 static VALUE
-edit_delete_selection(self)
-    VALUE self;
+edit_delete_selection(VALUE self)
 {
     gtk_editable_delete_selection(GTK_EDITABLE(RVAL2GOBJ(self)));
     return self;
 }
 
 static VALUE
-edit_get_position(self)
-    VALUE self;
+edit_get_position(VALUE self)
 {
     return INT2NUM(gtk_editable_get_position(GTK_EDITABLE(RVAL2GOBJ(self))));
 }
 
 static VALUE
-edit_set_position(self, position)
-    VALUE self, position;
+edit_set_position(VALUE self, VALUE position)
 {
     gtk_editable_set_position(GTK_EDITABLE(RVAL2GOBJ(self)),
 			      NUM2INT(position));
@@ -91,39 +83,34 @@ edit_set_position(self, position)
 }
 
 static VALUE
-edit_set_editable(self, editable)
-    VALUE self, editable;
+edit_set_editable(VALUE self, VALUE editable)
 {
     gtk_editable_set_editable(GTK_EDITABLE(RVAL2GOBJ(self)), RVAL2CBOOL(editable));
     return self;
 }
 
 static VALUE
-edit_get_editable(self)
-    VALUE self;
+edit_get_editable(VALUE self)
 {
     return CBOOL2RVAL(gtk_editable_get_editable(GTK_EDITABLE(RVAL2GOBJ(self))));
 }
 
 static VALUE
-edit_cut_clipboard(self)
-    VALUE self;
+edit_cut_clipboard(VALUE self)
 {
     gtk_editable_cut_clipboard(GTK_EDITABLE(RVAL2GOBJ(self)));
     return self;
 }
 
 static VALUE
-edit_copy_clipboard(self)
-    VALUE self;
+edit_copy_clipboard(VALUE self)
 {
     gtk_editable_copy_clipboard(GTK_EDITABLE(RVAL2GOBJ(self)));
     return self;
 }
 
 static VALUE
-edit_paste_clipboard(self)
-    VALUE self;
+edit_paste_clipboard(VALUE self)
 {
     gtk_editable_paste_clipboard(GTK_EDITABLE(RVAL2GOBJ(self)));
     return self;

data/ext/gtk2/rbgtkentry.c

@@ -17,23 +17,20 @@
 #define _SELF(self) (GTK_ENTRY(RVAL2GOBJ(self)))
 
 static VALUE
-entry_initialize(self)
-    VALUE self;
+entry_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_entry_new());
     return Qnil;
 }
 
 static VALUE
-entry_get_layout(self)
-    VALUE self;
+entry_get_layout(VALUE self)
 {
     return GOBJ2RVAL(gtk_entry_get_layout(_SELF(self)));
 }
 
 static VALUE
-entry_get_layout_offsets(self)
-    VALUE self;
+entry_get_layout_offsets(VALUE self)
 {
     int x, y;
     gtk_entry_get_layout_offsets(_SELF(self), &x, &y);
@@ -42,31 +39,27 @@ entry_get_layout_offsets(self)
 
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-entry_set_completion(self, completion)
-    VALUE self, completion;
+entry_set_completion(VALUE self, VALUE completion)
 {
     gtk_entry_set_completion(_SELF(self), GTK_ENTRY_COMPLETION(RVAL2GOBJ(completion)));
     return self;
 }
 
 static VALUE
-entry_get_completion(self)
-    VALUE self;
+entry_get_completion(VALUE self)
 {
     return GOBJ2RVAL(gtk_entry_get_completion(_SELF(self)));
 }
 #endif
 
 static VALUE
-entry_layout_index_to_text_index(self, layout_index)
-    VALUE self, layout_index;
+entry_layout_index_to_text_index(VALUE self, VALUE layout_index)
 {
     return INT2NUM(gtk_entry_layout_index_to_text_index(_SELF(self), NUM2INT(layout_index)));
 }
 
 static VALUE
-entry_text_index_to_layout_index(self, text_index)
-    VALUE self, text_index;
+entry_text_index_to_layout_index(VALUE self, VALUE text_index)
 {
     return INT2NUM(gtk_entry_text_index_to_layout_index(_SELF(self), NUM2INT(text_index)));
 }

data/ext/gtk2/rbgtkentrycompletion.c

@@ -15,26 +15,20 @@
 #define _SELF(self) (GTK_ENTRY_COMPLETION(RVAL2GOBJ(self)))
 
 static VALUE
-entryc_initialize(self)
-    VALUE self;
+entryc_initialize(VALUE self)
 {
     G_INITIALIZE(self, gtk_entry_completion_new());
     return Qnil;
 }
 
 static VALUE
-entryc_get_entry(self)
-    VALUE self;
+entryc_get_entry(VALUE self)
 {
     return GOBJ2RVAL(gtk_entry_completion_get_entry(_SELF(self)));
 }
 
 static gboolean
-entryc_match_func(completion, key, iter, func)
-    GtkEntryCompletion* completion;
-    const gchar* key;
-    GtkTreeIter* iter;
-    gpointer func;
+entryc_match_func(GtkEntryCompletion *completion, const gchar *key, GtkTreeIter *iter, gpointer func)
 {
     iter->user_data3 = gtk_entry_completion_get_model(completion);
     return RVAL2CBOOL(rb_funcall((VALUE)func, id_call, 3, GOBJ2RVAL(completion),
@@ -42,8 +36,7 @@ entryc_match_func(completion, key, iter, func)
 }
 
 static VALUE
-entryc_set_match_func(self)
-    VALUE self;
+entryc_set_match_func(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -54,8 +47,7 @@ entryc_set_match_func(self)
 }
 
 static VALUE
-entryc_complete(self)
-    VALUE self;
+entryc_complete(VALUE self)
 {
     gtk_entry_completion_complete(_SELF(self));
     return self;
@@ -63,8 +55,7 @@ entryc_complete(self)
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-entryc_insert_prefix(self)
-    VALUE self;
+entryc_insert_prefix(VALUE self)
 {
     gtk_entry_completion_insert_prefix(_SELF(self));
     return self;
@@ -72,32 +63,28 @@ entryc_insert_prefix(self)
 #endif
 
 static VALUE
-entryc_insert_action_text(self, index, text)
-    VALUE self, index, text;
+entryc_insert_action_text(VALUE self, VALUE index, VALUE text)
 {
     gtk_entry_completion_insert_action_text(_SELF(self), NUM2INT(index), RVAL2CSTR(text));
     return self;
 }
 
 static VALUE
-entryc_insert_action_markup(self, index, markup)
-    VALUE self, index, markup;
+entryc_insert_action_markup(VALUE self, VALUE index, VALUE markup)
 {
     gtk_entry_completion_insert_action_markup(_SELF(self), NUM2INT(index), RVAL2CSTR(markup));
     return self;
 }
 
 static VALUE
-entryc_delete_action(self, index)
-    VALUE self, index;
+entryc_delete_action(VALUE self, VALUE index)
 {
     gtk_entry_completion_delete_action(_SELF(self), NUM2INT(index));
     return self;
 }
 
 static VALUE
-entryc_set_text_column(self, column)
-    VALUE self, column;
+entryc_set_text_column(VALUE self, VALUE column)
 {
     gtk_entry_completion_set_text_column(_SELF(self), NUM2INT(column));
     return self;

data/ext/gtk2/rbgtkeventbox.c

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

data/ext/gtk2/rbgtkexpander.c

@@ -16,10 +16,7 @@
 #define _SELF(self) (GTK_EXPANDER(RVAL2GOBJ(self)))
 
 static VALUE
-expander_initialize(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+expander_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE label, with_mnemonic;
     GtkWidget* widget = NULL;

data/ext/gtk2/rbgtkfilechooser.c

@@ -35,8 +35,7 @@ gslist2ary_free(GSList* list)
 }
 
 static VALUE
-fcho_set_action(self, action)
-    VALUE self, action;
+fcho_set_action(VALUE self, VALUE action)
 {
     gtk_file_chooser_set_action(
         _SELF(self),
@@ -45,8 +44,7 @@ fcho_set_action(self, action)
 }
 
 static VALUE
-fcho_get_action(self)
-    VALUE self;
+fcho_get_action(VALUE self)
 {
     return GENUM2RVAL(gtk_file_chooser_get_action(_SELF(self)), GTK_TYPE_FILE_CHOOSER_ACTION);
 }
@@ -67,8 +65,7 @@ gboolean    gtk_file_chooser_get_show_hidden
 */
 
 static VALUE
-fcho_set_current_name(self, name)
-    VALUE self, name;
+fcho_set_current_name(VALUE self, VALUE name)
 {
     /* doc says the awaited string is UTF-8, so use RVAL2CSTR */
     gtk_file_chooser_set_current_name(_SELF(self), RVAL2CSTR(name));
@@ -76,15 +73,13 @@ fcho_set_current_name(self, name)
 }
 
 static VALUE
-fcho_get_filename(self)
-    VALUE self;
+fcho_get_filename(VALUE self)
 {
     return CSTRFILENAME2RVAL_FREE(gtk_file_chooser_get_filename(_SELF(self)));
 }
 
 static VALUE
-fcho_set_filename(self, name)
-    VALUE self, name;
+fcho_set_filename(VALUE self, VALUE name)
 {
     gboolean ret = gtk_file_chooser_set_filename(_SELF(self), RVAL2CSTRFILENAME(name));
     if (! ret) rb_raise(rb_eRuntimeError, "Can't set filename");
@@ -92,46 +87,40 @@ fcho_set_filename(self, name)
 }
 
 static VALUE
-fcho_select_filename(self, filename)
-    VALUE self, filename;
+fcho_select_filename(VALUE self, VALUE filename)
 {
     return CBOOL2RVAL(gtk_file_chooser_select_filename(_SELF(self), RVAL2CSTRFILENAME(filename)));
 }
 
 static VALUE
-fcho_unselect_filename(self, filename)
-    VALUE self, filename;
+fcho_unselect_filename(VALUE self, VALUE filename)
 {
     gtk_file_chooser_unselect_filename(_SELF(self), RVAL2CSTRFILENAME(filename));
     return self;
 }
 
 static VALUE
-fcho_select_all(self)
-    VALUE self;
+fcho_select_all(VALUE self)
 {
     gtk_file_chooser_select_all(_SELF(self));
     return self;
 }
 
 static VALUE
-fcho_unselect_all(self)
-    VALUE self;
+fcho_unselect_all(VALUE self)
 {
     gtk_file_chooser_unselect_all(_SELF(self));
     return self;
 }
 
 static VALUE
-fcho_get_filenames(self)
-    VALUE self;
+fcho_get_filenames(VALUE self)
 {
     return CSTRFILENAMEARRAY2RVAL_FREE(gtk_file_chooser_get_filenames(_SELF(self)));
 }
 
 static VALUE
-fcho_set_current_folder(self, filename)
-    VALUE self, filename;
+fcho_set_current_folder(VALUE self, VALUE filename)
 {
     gboolean ret = gtk_file_chooser_set_current_folder(_SELF(self), RVAL2CSTR(filename));
     if (! ret) rb_raise(rb_eRuntimeError, "Can't set current folder");
@@ -139,22 +128,19 @@ fcho_set_current_folder(self, filename)
 }
 
 static VALUE
-fcho_get_current_folder(self)
-    VALUE self;
+fcho_get_current_folder(VALUE self)
 {
     return CSTR2RVAL_FREE(gtk_file_chooser_get_current_folder(_SELF(self)));
 }
 
 static VALUE
-fcho_get_uri(self)
-    VALUE self;
+fcho_get_uri(VALUE self)
 {
     return CSTR2RVAL_FREE(gtk_file_chooser_get_uri(_SELF(self)));
 }
 
 static VALUE
-fcho_set_uri(self, uri)
-    VALUE self, uri;
+fcho_set_uri(VALUE self, VALUE uri)
 {
     gboolean ret = gtk_file_chooser_set_uri(_SELF(self), RVAL2CSTR(uri));
     if (! ret) rb_raise(rb_eRuntimeError, "Can't set uri");
@@ -162,30 +148,26 @@ fcho_set_uri(self, uri)
 }
 
 static VALUE
-fcho_select_uri(self, uri)
-    VALUE self, uri;
+fcho_select_uri(VALUE self, VALUE uri)
 {
     return CBOOL2RVAL(gtk_file_chooser_select_uri(_SELF(self), RVAL2CSTR(uri)));
 }
 
 static VALUE
-fcho_unselect_uri(self, uri)
-    VALUE self, uri;
+fcho_unselect_uri(VALUE self, VALUE uri)
 {
     gtk_file_chooser_unselect_uri(_SELF(self), RVAL2CSTR(uri));
     return self;
 }
 
 static VALUE
-fcho_get_uris(self)
-    VALUE self;
+fcho_get_uris(VALUE self)
 {
     return gslist2ary_free(gtk_file_chooser_get_uris(_SELF(self)));
 }
 
 static VALUE
-fcho_set_current_folder_uri(self, uri)
-    VALUE self, uri;
+fcho_set_current_folder_uri(VALUE self, VALUE uri)
 {
     gboolean ret = gtk_file_chooser_set_current_folder_uri(_SELF(self), RVAL2CSTR(uri));
     if (! ret) rb_raise(rb_eRuntimeError, "Can't set current folder uri");
@@ -193,8 +175,7 @@ fcho_set_current_folder_uri(self, uri)
 }
 
 static VALUE
-fcho_get_current_folder_uri(self)
-    VALUE self;
+fcho_get_current_folder_uri(VALUE self)
 {
     return CSTR2RVAL_FREE(gtk_file_chooser_get_current_folder_uri(_SELF(self)));
 }
@@ -209,15 +190,13 @@ fcho_get_current_folder_uri(self)
 */
 
 static VALUE
-fcho_get_preview_filename(self)
-    VALUE self;
+fcho_get_preview_filename(VALUE self)
 {
     return CSTR2RVAL_FREE(gtk_file_chooser_get_preview_filename(_SELF(self)));
 }
 
 static VALUE
-fcho_get_preview_uri(self)
-    VALUE self;
+fcho_get_preview_uri(VALUE self)
 {
     return CSTR2RVAL_FREE(gtk_file_chooser_get_preview_uri(_SELF(self)));
 }
@@ -228,24 +207,21 @@ fcho_get_preview_uri(self)
 */
 
 static VALUE
-fcho_add_filter(self, filter)
-    VALUE self, filter;
+fcho_add_filter(VALUE self, VALUE filter)
 {
     gtk_file_chooser_add_filter(_SELF(self), GTK_FILE_FILTER(RVAL2GOBJ(filter)));
     return self;
 }
 
 static VALUE
-fcho_remove_filter(self, filter)
-    VALUE self, filter;
+fcho_remove_filter(VALUE self, VALUE filter)
 {
     gtk_file_chooser_remove_filter(_SELF(self), GTK_FILE_FILTER(RVAL2GOBJ(filter)));
     return self;
 }
 
 static VALUE
-fcho_list_filters(self)
-    VALUE self;
+fcho_list_filters(VALUE self)
 {
     return GSLIST2ARYF(gtk_file_chooser_list_filters(_SELF(self)));
 }
@@ -257,8 +233,7 @@ fcho_list_filters(self)
 */
 
 static VALUE
-fcho_add_shortcut_folder(self, folder)
-    VALUE self, folder;
+fcho_add_shortcut_folder(VALUE self, VALUE folder)
 {
     GError *error = NULL;
     if (! gtk_file_chooser_add_shortcut_folder(_SELF(self), RVAL2CSTRFILENAME(folder), &error))
@@ -267,8 +242,7 @@ fcho_add_shortcut_folder(self, folder)
 }
 
 static VALUE
-fcho_remove_shortcut_folder(self, folder)
-    VALUE self, folder;
+fcho_remove_shortcut_folder(VALUE self, VALUE folder)
 {
     GError *error = NULL;
     if (! gtk_file_chooser_remove_shortcut_folder(_SELF(self), RVAL2CSTRFILENAME(folder), &error))
@@ -277,16 +251,14 @@ fcho_remove_shortcut_folder(self, folder)
 }
 
 static VALUE
-fcho_list_shortcut_folders(self)
-    VALUE self;
+fcho_list_shortcut_folders(VALUE self)
 {
     return CSTRFILENAMEARRAY2RVAL_FREE(gtk_file_chooser_list_shortcut_folders(_SELF(self)));
 }
 
 
 static VALUE
-fcho_add_shortcut_folder_uri(self, uri)
-    VALUE self, uri;
+fcho_add_shortcut_folder_uri(VALUE self, VALUE uri)
 {
     GError *error = NULL;
     if (! gtk_file_chooser_add_shortcut_folder_uri(_SELF(self), RVAL2CSTR(uri), &error))
@@ -295,8 +267,7 @@ fcho_add_shortcut_folder_uri(self, uri)
 }
 
 static VALUE
-fcho_remove_shortcut_folder_uri(self, uri)
-    VALUE self, uri;
+fcho_remove_shortcut_folder_uri(VALUE self, VALUE uri)
 {
     GError *error = NULL;
     if (! gtk_file_chooser_remove_shortcut_folder_uri(_SELF(self), RVAL2CSTR(uri), &error))
@@ -305,8 +276,7 @@ fcho_remove_shortcut_folder_uri(self, uri)
 }
 
 static VALUE
-fcho_list_shortcut_folder_uris(self)
-    VALUE self;
+fcho_list_shortcut_folder_uris(VALUE self)
 {
     return gslist2ary_free(gtk_file_chooser_list_shortcut_folder_uris(_SELF(self)));
 }