gtk2 0.90.7 → 0.90.8

data/ext/gtk2/rbgtkicontheme.c

@@ -18,38 +18,33 @@
 #define ICON_INFO2RVAL(info) (BOXED2RVAL(info, GTK_TYPE_ICON_INFO))
 
 static VALUE
-it_initialize(self)
-    VALUE self;
+it_initialize(VALUE self)
 {
     G_INITIALIZE(self, gtk_icon_theme_new());
     return Qnil;
 }
 
 static VALUE
-it_get_default(self)
-    VALUE self;
+it_get_default(VALUE self)
 {
     return GOBJ2RVAL(gtk_icon_theme_get_default());
 }
 
 static VALUE
-it_get_for_screen(self, screen)
-    VALUE self, screen;
+it_get_for_screen(VALUE self, VALUE screen)
 {
     return GOBJ2RVAL(gtk_icon_theme_get_for_screen(GDK_SCREEN(RVAL2GOBJ(screen))));
 }
 
 static VALUE
-it_set_screen(self, screen)
-    VALUE self, screen;
+it_set_screen(VALUE self, VALUE screen)
 {
     gtk_icon_theme_set_screen(_SELF(self), GDK_SCREEN(RVAL2GOBJ(screen)));
     return self;
 }
 
 static VALUE
-it_set_search_path(self, paths)
-    VALUE self, paths;
+it_set_search_path(VALUE self, VALUE paths)
 {
     gchar** gpaths;
     gint size, i;
@@ -68,8 +63,7 @@ it_set_search_path(self, paths)
 }
 
 static VALUE
-it_get_search_path(self)
-    VALUE self;
+it_get_search_path(VALUE self)
 {
     gchar** path;
     gint size, i;
@@ -86,24 +80,21 @@ it_get_search_path(self)
 }
 
 static VALUE
-it_append_search_path(self, path)
-    VALUE self, path;
+it_append_search_path(VALUE self, VALUE path)
 {
     gtk_icon_theme_append_search_path(_SELF(self), RVAL2CSTR(path));
     return self;
 }
 
 static VALUE
-it_prepend_search_path(self, path)
-    VALUE self, path;
+it_prepend_search_path(VALUE self, VALUE path)
 {
     gtk_icon_theme_prepend_search_path(_SELF(self), RVAL2CSTR(path));
     return self;
 }
 
 static VALUE
-it_set_custom_theme(self, theme_name)
-    VALUE self, theme_name;
+it_set_custom_theme(VALUE self, VALUE theme_name)
 {
     gtk_icon_theme_set_custom_theme(_SELF(self), 
                                     NIL_P(theme_name) ? NULL : RVAL2CSTR(theme_name));
@@ -111,16 +102,14 @@ it_set_custom_theme(self, theme_name)
 }
 
 static VALUE
-it_has_icon(self, icon_name)
-    VALUE self, icon_name;
+it_has_icon(VALUE self, VALUE icon_name)
 {
     return CBOOL2RVAL(gtk_icon_theme_has_icon(_SELF(self), 
                                               RVAL2CSTR(icon_name)));
 }
 
 static VALUE
-it_lookup_icon(self, icon_name, size, flags)
-    VALUE self, icon_name, size, flags;
+it_lookup_icon(VALUE self, VALUE icon_name, VALUE size, VALUE flags)
 {
     GtkIconInfo* info;
 
@@ -132,8 +121,7 @@ it_lookup_icon(self, icon_name, size, flags)
 }
 
 static VALUE
-it_load_icon(self, icon_name, size, flags)
-    VALUE self, icon_name, size, flags;
+it_load_icon(VALUE self, VALUE icon_name, VALUE size, VALUE flags)
 {
     GError *error = NULL;
     GdkPixbuf *pixbuf;
@@ -163,8 +151,7 @@ it_list_icons(int argc, VALUE *argv, VALUE self)
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-it_get_icon_sizes(self, icon_name)
-    VALUE self, icon_name;
+it_get_icon_sizes(VALUE self, VALUE icon_name)
 {
     VALUE ary = rb_ary_new();
 
@@ -180,22 +167,19 @@ it_get_icon_sizes(self, icon_name)
 #endif
 
 static VALUE
-it_get_example_icon_name(self)
-    VALUE self;
+it_get_example_icon_name(VALUE self)
 {
     return CSTR2RVAL_FREE(gtk_icon_theme_get_example_icon_name(_SELF(self)));
 }
 
 static VALUE
-it_rescan_if_needed(self)
-    VALUE self;
+it_rescan_if_needed(VALUE self)
 {
     return CBOOL2RVAL(gtk_icon_theme_rescan_if_needed(_SELF(self)));
 }
 
 static VALUE
-it_s_add_builtin_icon(self, icon_name, size, pixbuf)
-    VALUE self, icon_name, size, pixbuf;
+it_s_add_builtin_icon(VALUE self, VALUE icon_name, VALUE size, VALUE pixbuf)
 {
     gtk_icon_theme_add_builtin_icon(RVAL2CSTR(icon_name), NUM2INT(size),
                                     GDK_PIXBUF(RVAL2GOBJ(pixbuf)));

data/ext/gtk2/rbgtkiconview.c

@@ -19,10 +19,7 @@ static ID id_model;
 static ID id_select_path;
 
 static VALUE
-iview_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+iview_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE model;
     rb_scan_args(argc, argv, "01", &model);
@@ -58,17 +55,13 @@ iview_get_path_at_pos(VALUE self, VALUE x, VALUE y)
 }
 
 static void
-iview_foreach_func(iview, path, func)
-    GtkIconView* iview;
-    GtkTreePath* path;
-    gpointer* func;
+iview_foreach_func(GtkIconView *iview, GtkTreePath *path, gpointer *func)
 {
     rb_funcall((VALUE)func, id_call, 2, GOBJ2RVAL(iview), GTKTREEPATH2RVAL(path));
 }
 
 static VALUE
-iview_selected_foreach(self)
-    VALUE self;
+iview_selected_foreach(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -114,8 +107,7 @@ gboolean    gtk_icon_view_get_reorderable   (GtkIconView *icon_view);
 */
 
 static VALUE
-iview_select_path(self, path)
-    VALUE self, path;
+iview_select_path(VALUE self, VALUE path)
 {
     G_CHILD_SET(self, id_select_path, path);
     gtk_icon_view_select_path(_SELF(self), RVAL2GTKTREEPATH(path));
@@ -123,8 +115,7 @@ iview_select_path(self, path)
 }
 
 static VALUE
-iview_unselect_path(self, path)
-       VALUE self, path;
+iview_unselect_path(VALUE self, VALUE path)
 {
     G_CHILD_UNSET(self, id_select_path);
     gtk_icon_view_unselect_path(_SELF(self), RVAL2GTKTREEPATH(path));
@@ -132,15 +123,13 @@ iview_unselect_path(self, path)
 }
  
 static VALUE
-iview_path_is_selected(self, path)
-       VALUE self, path;
+iview_path_is_selected(VALUE self, VALUE path)
 {
     return CBOOL2RVAL(gtk_icon_view_path_is_selected(_SELF(self), RVAL2GTKTREEPATH(path)));
 }
 
 static VALUE
-iview_get_selected_items(self)
-    VALUE self;
+iview_get_selected_items(VALUE self)
 {
     GList* list = gtk_icon_view_get_selected_items(_SELF(self));
     VALUE ret = GLIST2ARY2(list, GTK_TYPE_TREE_PATH);
@@ -150,24 +139,21 @@ iview_get_selected_items(self)
 }
 
 static VALUE
-iview_select_all(self)
-    VALUE self;
+iview_select_all(VALUE self)
 {
     gtk_icon_view_select_all(_SELF(self));
     return self;
 }
 
 static VALUE
-iview_unselect_all(self)
-    VALUE self;
+iview_unselect_all(VALUE self)
 {
     gtk_icon_view_unselect_all(_SELF(self));
     return self;
 }
  
 static VALUE
-iview_item_activated(self, path)
-       VALUE self, path;
+iview_item_activated(VALUE self, VALUE path)
 {
     gtk_icon_view_item_activated(_SELF(self), RVAL2GTKTREEPATH(path));
     return self;
@@ -176,15 +162,13 @@ iview_item_activated(self, path)
 
 #if GTK_CHECK_VERSION(2,8,0)
 static VALUE
-iview_create_drag_icon(self, path)
-       VALUE self, path;
+iview_create_drag_icon(VALUE self, VALUE path)
 {
     return GOBJ2RVAL(gtk_icon_view_create_drag_icon(_SELF(self), RVAL2GTKTREEPATH(path)));
 }
 
 static VALUE
-iview_enable_model_drag_dest(self, targets, actions)
-    VALUE self, targets, actions;
+iview_enable_model_drag_dest(VALUE self, VALUE targets, VALUE actions)
 {
     gtk_icon_view_enable_model_drag_dest(_SELF(self),
                                          rbgtk_get_target_entry(targets),
@@ -194,8 +178,7 @@ iview_enable_model_drag_dest(self, targets, actions)
 }
 
 static VALUE
-iview_enable_model_drag_source(self, flags, targets, actions)
-    VALUE self, flags, targets, actions;
+iview_enable_model_drag_source(VALUE self, VALUE flags, VALUE targets, VALUE actions)
 {
     gtk_icon_view_enable_model_drag_source(_SELF(self),
                                            RVAL2GFLAGS(flags, GDK_TYPE_MODIFIER_TYPE),
@@ -206,8 +189,7 @@ iview_enable_model_drag_source(self, flags, targets, actions)
 }
 
 static VALUE
-iview_cursor(self)
-    VALUE self;
+iview_cursor(VALUE self)
 {
     GtkTreePath* path;
     GtkCellRenderer* cell;
@@ -216,8 +198,7 @@ iview_cursor(self)
 }
 
 static VALUE
-iview_get_dest_item_at_pos(self, drag_x, drag_y)
-    VALUE self, drag_x, drag_y;
+iview_get_dest_item_at_pos(VALUE self, VALUE drag_x, VALUE drag_y)
 {
     GtkTreePath* path;
     GtkIconViewDropPosition pos;
@@ -227,8 +208,7 @@ iview_get_dest_item_at_pos(self, drag_x, drag_y)
 }
 
 static VALUE
-iview_drag_dest_item(self)
-    VALUE self;
+iview_drag_dest_item(VALUE self)
 {
     GtkTreePath* path;
     GtkIconViewDropPosition pos;
@@ -238,8 +218,7 @@ iview_drag_dest_item(self)
 }
 
 static VALUE
-iview_get_item_at_pos(self, x, y)
-    VALUE self, x, y;
+iview_get_item_at_pos(VALUE self, VALUE x, VALUE y)
 {
     GtkTreePath* path;
     GtkCellRenderer* cell;
@@ -248,8 +227,7 @@ iview_get_item_at_pos(self, x, y)
 }
 
 static VALUE
-iview_visible_range(self)
-    VALUE self;
+iview_visible_range(VALUE self)
 {
     GtkTreePath* start_path;
     GtkTreePath* end_path;
@@ -261,8 +239,7 @@ iview_visible_range(self)
 }
 
 static VALUE
-iview_scroll_to_path(self, path, use_align, row_align, col_align)
-    VALUE self, path, use_align, row_align, col_align;
+iview_scroll_to_path(VALUE self, VALUE path, VALUE use_align, VALUE row_align, VALUE col_align)
 {
     gtk_icon_view_scroll_to_path(_SELF(self),
                                  RVAL2GTKTREEPATH(path),
@@ -273,8 +250,7 @@ iview_scroll_to_path(self, path, use_align, row_align, col_align)
 }
 
 static VALUE
-iview_set_cursor(self, path, cell, start_editing)
-    VALUE self, path, cell, start_editing;
+iview_set_cursor(VALUE self, VALUE path, VALUE cell, VALUE start_editing)
 {
     gtk_icon_view_set_cursor(_SELF(self), RVAL2GTKTREEPATH(path),
                              NIL_P(cell) ? NULL : RVAL2GOBJ(cell), RVAL2CBOOL(start_editing));
@@ -282,8 +258,7 @@ iview_set_cursor(self, path, cell, start_editing)
 }
 
 static VALUE
-iview_set_drag_dest_item(self, path, pos)
-    VALUE self, path, pos;
+iview_set_drag_dest_item(VALUE self, VALUE path, VALUE pos)
 {
     gtk_icon_view_set_drag_dest_item(_SELF(self),
                                      NIL_P(path) ? NULL : RVAL2GTKTREEPATH(path),
@@ -292,16 +267,14 @@ iview_set_drag_dest_item(self, path, pos)
 }
 
 static VALUE
-iview_unset_model_drag_dest(self)
-    VALUE self;
+iview_unset_model_drag_dest(VALUE self)
 {
     gtk_icon_view_unset_model_drag_dest(_SELF(self));
     return self;
 }
 
 static VALUE
-iview_unset_model_drag_source(self)
-    VALUE self;
+iview_unset_model_drag_source(VALUE self)
 {
     gtk_icon_view_unset_model_drag_source(_SELF(self));
     return self;

data/ext/gtk2/rbgtkimage.c

@@ -24,10 +24,7 @@ GtkImageType gtk_image_get_storage_type     (GtkImage *image);
 */
 
 static VALUE
-image_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+image_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg1, arg2;
     GType gtype;
@@ -68,10 +65,7 @@ image_initialize(argc, argv, self)
 }
 
 static VALUE
-image_set(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+image_set(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg1, arg2;
     GType gtype;
@@ -125,8 +119,7 @@ gint        gtk_image_get_pixel_size        (GtkImage *image);
 
 #if GTK_CHECK_VERSION(2,8,0)
 static VALUE
-image_clear(self)
-    VALUE self;
+image_clear(VALUE self)
 {
     gtk_image_clear(_SELF(self));
     return self;

data/ext/gtk2/rbgtkimagemenuitem.c

@@ -12,10 +12,7 @@
 #include "global.h"
 
 static VALUE
-imitem_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+imitem_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE label, use_underline_or_accel_group;
     GtkWidget *widget = NULL;

data/ext/gtk2/rbgtkimcontext.c

@@ -13,16 +13,14 @@
 #define _SELF(self) (GTK_IM_CONTEXT(RVAL2GOBJ(self)))
 
 static VALUE 
-imcontext_set_client_window(self, gdkwindow)
-    VALUE self, gdkwindow;
+imcontext_set_client_window(VALUE self, VALUE gdkwindow)
 {
     gtk_im_context_set_client_window(_SELF(self), GDK_WINDOW(RVAL2GOBJ(gdkwindow)));
     return self;
 }
 
 static VALUE
-imcontext_get_preedit_string(self)
-    VALUE self;
+imcontext_get_preedit_string(VALUE self)
 {
     gchar* str;
     PangoAttrList* attrs;
@@ -34,39 +32,34 @@ imcontext_get_preedit_string(self)
 }
 
 static VALUE
-imcontext_filter_keypress(self, event)
-    VALUE self, event;
+imcontext_filter_keypress(VALUE self, VALUE event)
 {
     return CBOOL2RVAL(gtk_im_context_filter_keypress(_SELF(self), (GdkEventKey*)RVAL2GEV(event)));
 }
 
 static VALUE
-imcontext_focus_in(self)
-    VALUE self;
+imcontext_focus_in(VALUE self)
 {
     gtk_im_context_focus_in(_SELF(self));
     return self;
 }
 
 static VALUE
-imcontext_focus_out(self)
-    VALUE self;
+imcontext_focus_out(VALUE self)
 {
     gtk_im_context_focus_out(_SELF(self));
     return self;
 }
 
 static VALUE
-imcontext_reset(self)
-    VALUE self;
+imcontext_reset(VALUE self)
 {
     gtk_im_context_reset(_SELF(self));
     return self;
 }
 
 static VALUE
-imcontext_set_cursor_location(self, area)
-    VALUE self, area;
+imcontext_set_cursor_location(VALUE self, VALUE area)
 {
     gtk_im_context_set_cursor_location(
         _SELF(self), 
@@ -75,16 +68,14 @@ imcontext_set_cursor_location(self, area)
 }
 
 static VALUE
-imcontext_set_use_preedit(self, use_preedit)
-    VALUE self, use_preedit;
+imcontext_set_use_preedit(VALUE self, VALUE use_preedit)
 {
     gtk_im_context_set_use_preedit(_SELF(self), RVAL2CBOOL(use_preedit));
     return self;
 }
 
 static VALUE
-imcontext_set_surrounding(self, text, cursor_index)
-    VALUE self, text, cursor_index;
+imcontext_set_surrounding(VALUE self, VALUE text, VALUE cursor_index)
 {
     StringValue(text);
     gtk_im_context_set_surrounding(_SELF(self),
@@ -94,8 +85,7 @@ imcontext_set_surrounding(self, text, cursor_index)
 }
 
 static VALUE
-imcontext_get_surrounding(self)
-    VALUE self;
+imcontext_get_surrounding(VALUE self)
 {
     gchar* text;
     gint cursor_index;
@@ -105,8 +95,7 @@ imcontext_get_surrounding(self)
 }
 
 static VALUE
-imcontext_delete_surrounding(self, offset, n_chars)
-    VALUE self;
+imcontext_delete_surrounding(VALUE self, VALUE offset, VALUE n_chars)
 {
     return CBOOL2RVAL(gtk_im_context_delete_surrounding(_SELF(self), NUM2INT(offset),
                                                         NUM2INT(n_chars)));