gtk2 0.90.7 → 0.90.8

data/ext/gtk2/rbgtkcellrenderer.c

@@ -16,8 +16,7 @@
 #define RECT2RVAL(r) (BOXED2RVAL(r, GDK_TYPE_RECTANGLE))
 
 static VALUE
-cellrenderer_get_size(self, widget, cell_area)
-    VALUE self, widget, cell_area;
+cellrenderer_get_size(VALUE self, VALUE widget, VALUE cell_area)
 {
     GdkRectangle ret;
 
@@ -28,9 +27,7 @@ cellrenderer_get_size(self, widget, cell_area)
 }
 
 static VALUE
-cellrenderer_render(self, window, widget, background_area, cell_area, 
-                    expose_area, flags)
-    VALUE self, window, widget, background_area, cell_area, expose_area, flags;
+cellrenderer_render(VALUE self, VALUE window, VALUE widget, VALUE background_area, VALUE cell_area, VALUE expose_area, VALUE flags)
 {
     gtk_cell_renderer_render(_SELF(self), GDK_WINDOW(RVAL2GOBJ(window)),
                              GTK_WIDGET(RVAL2GOBJ(widget)),
@@ -42,9 +39,7 @@ cellrenderer_render(self, window, widget, background_area, cell_area,
 }
 
 static VALUE
-cellrenderer_activate(self, event, widget, path, background_area, 
-                      cell_area, flags)
-    VALUE self, event, widget, path, background_area, cell_area, flags;
+cellrenderer_activate(VALUE self, VALUE event, VALUE widget, VALUE path, VALUE background_area, VALUE cell_area, VALUE flags)
 {
     gboolean ret =
     gtk_cell_renderer_activate(_SELF(self), (GdkEvent*)RVAL2GEV(event),
@@ -56,9 +51,7 @@ cellrenderer_activate(self, event, widget, path, background_area,
 }
 
 static VALUE
-cellrenderer_start_editing(self, event, widget, path, background_area, 
-                           cell_area, flags)
-    VALUE self, event, widget, path, background_area, cell_area, flags;
+cellrenderer_start_editing(VALUE self, VALUE event, VALUE widget, VALUE path, VALUE background_area, VALUE cell_area, VALUE flags)
 {
     GtkCellEditable* edit =
     gtk_cell_renderer_start_editing(_SELF(self), (GdkEvent*)RVAL2GEV(event),
@@ -72,8 +65,7 @@ cellrenderer_start_editing(self, event, widget, path, background_area,
 #if GTK_CHECK_VERSION(2,4,0)
 #ifndef GTK_DISABLE_DEPRECATED
 static VALUE
-cellrenderer_editing_canceled(self)
-    VALUE self;
+cellrenderer_editing_canceled(VALUE self)
 {
     gtk_cell_renderer_editing_canceled(_SELF(self));
     return self;
@@ -83,8 +75,7 @@ cellrenderer_editing_canceled(self)
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-cellrenderer_stop_editing(self, canceled)
-    VALUE self, canceled;
+cellrenderer_stop_editing(VALUE self, VALUE canceled)
 {
     gtk_cell_renderer_stop_editing(_SELF(self), RVAL2CBOOL(canceled));
     return self;
@@ -92,8 +83,7 @@ cellrenderer_stop_editing(self, canceled)
 #endif
 
 static VALUE
-cellrenderer_get_fixed_size(self)
-    VALUE self;
+cellrenderer_get_fixed_size(VALUE self)
 {
     int width, height;
     gtk_cell_renderer_get_fixed_size(_SELF(self), &width, &height);
@@ -101,8 +91,7 @@ cellrenderer_get_fixed_size(self)
 }
 
 static VALUE
-cellrenderer_set_fixed_size(self, width, height)
-    VALUE self, width, height;
+cellrenderer_set_fixed_size(VALUE self, VALUE width, VALUE height)
 {
     gtk_cell_renderer_set_fixed_size(_SELF(self), NUM2INT(width), 
                                      NUM2INT(height));

data/ext/gtk2/rbgtkcellrendereraccel.c

@@ -16,8 +16,7 @@
 #define _SELF(s) (GTK_CELL_RENDERER_ACCEL(RVAL2GOBJ(s)))
 
 static VALUE
-craccel_initialize(self)
-    VALUE self;
+craccel_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_cell_renderer_accel_new());
     return Qnil;

data/ext/gtk2/rbgtkcellrenderercombo.c

@@ -14,8 +14,7 @@
 #if GTK_CHECK_VERSION(2,6,0)
 
 static VALUE
-crcombo_initialize(self)
-    VALUE self;
+crcombo_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_cell_renderer_combo_new());
     return Qnil;

data/ext/gtk2/rbgtkcellrendererpixbuf.c

@@ -15,8 +15,7 @@
 #define _SELF(s) (GTK_CELL_RENDERER_PIXBUF(RVAL2GOBJ(s)))
 
 static VALUE
-crpixbuf_initialize(self)
-    VALUE self;
+crpixbuf_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_cell_renderer_pixbuf_new());
     return Qnil;

data/ext/gtk2/rbgtkcellrendererprogress.c

@@ -14,8 +14,7 @@
 #if GTK_CHECK_VERSION(2,6,0)
 
 static VALUE
-crprogress_initialize(self)
-    VALUE self;
+crprogress_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_cell_renderer_progress_new());
     return Qnil;

data/ext/gtk2/rbgtkcellrendererspin.c

@@ -16,8 +16,7 @@
 #define _SELF(s) (GTK_CELL_RENDERER_SPIN(RVAL2GOBJ(s)))
 
 static VALUE
-crspin_initialize(self)
-    VALUE self;
+crspin_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_cell_renderer_spin_new());
     return Qnil;

data/ext/gtk2/rbgtkcellrendererspinner.c

@@ -0,0 +1,35 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/************************************************
+
+  rbgtkcellrendererspinner.c -
+
+  $Author: masaakiaoyagi $
+  $Date: 2011-02-19 09:24:49 +0900 (土, 19  2月 2011) $
+
+  Copyright (C) 2011 Ruby-GNOME2 Project Team
+************************************************/
+
+#include "global.h"
+
+#if GTK_CHECK_VERSION(2,20,0)
+
+#define _SELF(s) (GTK_CELL_RENDERER_SPINNER(RVAL2GOBJ(s)))
+
+static VALUE
+crspinner_initialize(VALUE self)
+{
+    RBGTK_INITIALIZE(self, gtk_cell_renderer_spinner_new());
+    return Qnil;
+}
+
+#endif
+
+void
+Init_gtk_cellrendererspinner()
+{
+#if GTK_CHECK_VERSION(2,20,0)
+    VALUE renderer = G_DEF_CLASS(GTK_TYPE_CELL_RENDERER_SPINNER, "CellRendererSpinner", mGtk);
+    rb_define_method(renderer, "initialize", crspinner_initialize, 0);
+#endif
+}
+

data/ext/gtk2/rbgtkcellrenderertext.c

@@ -15,16 +15,14 @@
 #define _SELF(s) (GTK_CELL_RENDERER_TEXT(RVAL2GOBJ(s)))
 
 static VALUE
-crtext_initialize(self)
-    VALUE self;
+crtext_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_cell_renderer_text_new());
     return Qnil;
 }
 
 static VALUE
-crtext_set_fixed_height_from_font(self, number_of_rows)
-    VALUE self, number_of_rows;
+crtext_set_fixed_height_from_font(VALUE self, VALUE number_of_rows)
 {
     gtk_cell_renderer_text_set_fixed_height_from_font(_SELF(self), NUM2INT(number_of_rows));
     return self;

data/ext/gtk2/rbgtkcellrenderertoggle.c

@@ -14,8 +14,7 @@
 #define _SELF(s) (GTK_CELL_RENDERER_TOGGLE(RVAL2GOBJ(s)))
 
 static VALUE
-crtoggle_initialize(self)
-    VALUE self;
+crtoggle_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_cell_renderer_toggle_new());
     return Qnil;

data/ext/gtk2/rbgtkcellview.c

@@ -19,10 +19,7 @@ static ID id_model;
 static ID id_text;
 
 static VALUE
-cview_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+cview_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE text;
     VALUE with_markup = Qnil;
@@ -55,8 +52,7 @@ cview_initialize(argc, argv, self)
 }
 
 static VALUE
-cview_set_model(self, model)
-    VALUE self, model;
+cview_set_model(VALUE self, VALUE model)
 {
     G_CHILD_SET(self, id_model, model);
     gtk_cell_view_set_model(_SELF(self), 
@@ -65,8 +61,7 @@ cview_set_model(self, model)
 }
 
 static VALUE
-cview_set_displayed_row(self, path)
-    VALUE self, path;
+cview_set_displayed_row(VALUE self, VALUE path)
 {
     gtk_cell_view_set_displayed_row(_SELF(self),  
                                     NIL_P(path) ? (GtkTreePath*)NULL :
@@ -75,15 +70,13 @@ cview_set_displayed_row(self, path)
 }
 
 static VALUE
-cview_get_displayed_row(self)
-    VALUE self;
+cview_get_displayed_row(VALUE self)
 {
     return GTKTREEPATH2RVAL(gtk_cell_view_get_displayed_row(_SELF(self)));
 }
 
 static VALUE
-cview_get_size_of_row(self, path)
-    VALUE self, path;
+cview_get_size_of_row(VALUE self, VALUE path)
 {
     GtkRequisition req;
     gboolean ret = gtk_cell_view_get_size_of_row(_SELF(self),  
@@ -102,8 +95,7 @@ void        gtk_cell_view_set_background_color
 */
 
 static VALUE
-cview_get_cell_renderers(self)
-    VALUE self;
+cview_get_cell_renderers(VALUE self)
 {
     return GLIST2ARYF(gtk_cell_view_get_cell_renderers(_SELF(self)));
 }

data/ext/gtk2/rbgtkcheckbutton.c

@@ -15,10 +15,7 @@
 #include "global.h"
 
 static VALUE
-cbtn_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+cbtn_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE label, use_underline;
     GtkWidget *widget;

data/ext/gtk2/rbgtkcheckmenuitem.c

@@ -15,10 +15,7 @@
 #include "global.h"
 
 static VALUE
-cmitem_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+cmitem_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE label, use_underline;
     GtkWidget *widget = NULL;
@@ -39,8 +36,7 @@ cmitem_initialize(argc, argv, self)
 }
 
 static VALUE
-cmitem_toggled(self)
-    VALUE self;
+cmitem_toggled(VALUE self)
 {
     gtk_check_menu_item_toggled(GTK_CHECK_MENU_ITEM(RVAL2GOBJ(self)));
     return self;

data/ext/gtk2/rbgtkclipboard.c

@@ -33,25 +33,20 @@ rbgtk_clipboard_get_type()
 }
 
 GtkClipboard*
-rbgtk_get_clipboard(obj)
-    VALUE obj;
+rbgtk_get_clipboard(VALUE obj)
 {
     return GTK_CLIPBOARD(RVAL2GOBJ(obj));
 }
 
 VALUE
-rbgtk_make_clipboard(gobj)
-    GtkClipboard* gobj;
+rbgtk_make_clipboard(GtkClipboard *gobj)
 {
     return GOBJ2RVAL(gobj);
 }
 #endif
 
 static VALUE
-clipboard_get(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+clipboard_get(int argc, VALUE *argv, VALUE self)
 {
     GtkClipboard *clipboard;
 
@@ -73,8 +68,7 @@ clipboard_get(argc, argv, self)
 }
 
 static VALUE
-clipboard_get_display(self)
-    VALUE self;
+clipboard_get_display(VALUE self)
 {
 #if GTK_CHECK_VERSION(2,2,0)
     return GOBJ2RVAL(gtk_clipboard_get_display(_SELF(self)));
@@ -84,18 +78,14 @@ clipboard_get_display(self)
 }
 
 static void
-clipboard_get_func(clipboard, selection_data, info, func)
-    GtkClipboard *clipboard;
-    GtkSelectionData* selection_data;
-    gpointer func;
+clipboard_get_func(GtkClipboard *clipboard, GtkSelectionData *selection_data, guint info, gpointer func)
 {
     rb_funcall((VALUE)func, id_call, 2, CLIPBOARD2RVAL(clipboard),
                BOXED2RVAL(selection_data, GTK_TYPE_SELECTION_DATA));
 }
 
 static VALUE
-clipboard_set(self, targets)
-    VALUE self, targets;
+clipboard_set(VALUE self, VALUE targets)
 {
     const GtkTargetEntry* gtargets = (const GtkTargetEntry*)rbgtk_get_target_entry(targets);
     VALUE func = rb_block_proc();
@@ -117,8 +107,7 @@ gboolean    gtk_clipboard_set_with_owner    (GtkClipboard *clipboard,
                                              GObject *owner);
 
 static VALUE
-clipboard_get_owner(self)
-    VALUE self;
+clipboard_get_owner(VALUE self)
 {
     GObject *gobj;
     gobj = gtk_clipboard_get_owner(_SELF(self));
@@ -127,16 +116,14 @@ clipboard_get_owner(self)
 */
 
 static VALUE
-clipboard_clear(self)
-    VALUE self;
+clipboard_clear(VALUE self)
 {
     gtk_clipboard_clear(_SELF(self));
     return self;
 }
 
 static VALUE
-clipboard_set_text(self, text)
-    VALUE self, text;
+clipboard_set_text(VALUE self, VALUE text)
 {
     StringValue(text);
     gtk_clipboard_set_text(_SELF(self), RVAL2CSTR(text), RSTRING_LEN(text));
@@ -145,8 +132,7 @@ clipboard_set_text(self, text)
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-clipboard_set_image(self, pixbuf)
-    VALUE self, pixbuf;
+clipboard_set_image(VALUE self, VALUE pixbuf)
 {
     gtk_clipboard_set_image(_SELF(self), GDK_PIXBUF(RVAL2GOBJ(pixbuf)));
     return self;
@@ -154,18 +140,14 @@ clipboard_set_image(self, pixbuf)
 #endif
 
 static void
-clipboard_received_func(clipboard, selection_data, func)
-    GtkClipboard *clipboard;
-    GtkSelectionData* selection_data;
-    gpointer func;
+clipboard_received_func(GtkClipboard *clipboard, GtkSelectionData *selection_data, gpointer func)
 {
     rb_funcall((VALUE)func, id_call, 2, CLIPBOARD2RVAL(clipboard),
                BOXED2RVAL(selection_data, GTK_TYPE_SELECTION_DATA));
 }
 
 static VALUE
-clipboard_request_contents(self, target)
-    VALUE self, target;
+clipboard_request_contents(VALUE self, VALUE target)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -188,8 +170,7 @@ clipboard_text_received_func(GtkClipboard *clipboard, const gchar *text,
 }
 
 static VALUE
-clipboard_request_text(self)
-    VALUE self;
+clipboard_request_text(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -201,18 +182,14 @@ clipboard_request_text(self)
 
 #if GTK_CHECK_VERSION(2,6,0)
 static void
-clipboard_image_received_func(clipboard, pixbuf, func)
-    GtkClipboard* clipboard;
-    GdkPixbuf* pixbuf;
-    gpointer func;
+clipboard_image_received_func(GtkClipboard *clipboard, GdkPixbuf *pixbuf, gpointer func)
 {
     rb_funcall((VALUE)func, id_call, 2, CLIPBOARD2RVAL(clipboard),
                GOBJ2RVAL(pixbuf));
 }
 
 static VALUE
-clipboard_request_image(self)
-    VALUE self;
+clipboard_request_image(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -225,11 +202,7 @@ clipboard_request_image(self)
 
 #if GTK_CHECK_VERSION(2,4,0)
 static void
-clipboard_target_received_func(clipboard, atoms, n_atoms, func)
-    GtkClipboard* clipboard;
-    GdkAtom* atoms;
-    gint n_atoms;
-    gpointer func;
+clipboard_target_received_func(GtkClipboard *clipboard, GdkAtom *atoms, gint n_atoms, gpointer func)
 {
     gint i;
     VALUE ary = rb_ary_new();
@@ -241,8 +214,7 @@ clipboard_target_received_func(clipboard, atoms, n_atoms, func)
 }
 
 static VALUE
-clipboard_request_targets(self)
-    VALUE self;
+clipboard_request_targets(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -256,20 +228,14 @@ clipboard_request_targets(self)
 
 #if GTK_CHECK_VERSION(2,10,0)
 static void
-clipboard_rich_text_received_func(clipboard, format, text, length, func)
-    GtkClipboard* clipboard;
-    GdkAtom format;
-    const guint8 *text;
-    gsize length;
-    gpointer func;
+clipboard_rich_text_received_func(GtkClipboard *clipboard, GdkAtom format, const guint8 *text, gsize length, gpointer func)
 {
     rb_funcall((VALUE)func, id_call, 3, CLIPBOARD2RVAL(clipboard), 
                BOXED2RVAL(format, GDK_TYPE_ATOM), rb_str_new((char*)text, length));
 }
 
 static VALUE
-clipboard_request_rich_text(self, buffer)
-    VALUE self, buffer;
+clipboard_request_rich_text(VALUE self, VALUE buffer)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -282,8 +248,7 @@ clipboard_request_rich_text(self, buffer)
 #endif
 
 static VALUE
-clipboard_wait_for_contents(self, target)
-    VALUE self, target;
+clipboard_wait_for_contents(VALUE self, VALUE target)
 {
     return BOXED2RVAL(gtk_clipboard_wait_for_contents(
                           _SELF(self), 
@@ -292,8 +257,7 @@ clipboard_wait_for_contents(self, target)
 }
 
 static VALUE
-clipboard_wait_for_text(self)
-    VALUE self;
+clipboard_wait_for_text(VALUE self)
 {
     gchar *str;
     str = gtk_clipboard_wait_for_text(_SELF(self));
@@ -302,8 +266,7 @@ clipboard_wait_for_text(self)
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-clipboard_wait_for_image(self)
-    VALUE self;
+clipboard_wait_for_image(VALUE self)
 {
     GdkPixbuf* pixbuf = gtk_clipboard_wait_for_image(_SELF(self));
     return GOBJ2RVAL(pixbuf);
@@ -312,8 +275,7 @@ clipboard_wait_for_image(self)
 
 #if GTK_CHECK_VERSION(2,10,0)
 static VALUE
-clipboard_wait_for_rich_text(self, buffer)
-    VALUE self, buffer;
+clipboard_wait_for_rich_text(VALUE self, VALUE buffer)
 {
     GdkAtom format;
     gsize length;
@@ -332,16 +294,14 @@ clipboard_wait_for_rich_text(self, buffer)
 #endif
 
 static VALUE
-clipboard_wait_is_text_available(self)
-    VALUE self;
+clipboard_wait_is_text_available(VALUE self)
 {
     return CBOOL2RVAL(gtk_clipboard_wait_is_text_available(_SELF(self)));
 }
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-clipboard_wait_is_image_available(self)
-    VALUE self;
+clipboard_wait_is_image_available(VALUE self)
 {
     return CBOOL2RVAL(gtk_clipboard_wait_is_image_available(_SELF(self)));
 }
@@ -349,8 +309,7 @@ clipboard_wait_is_image_available(self)
 
 #if GTK_CHECK_VERSION(2,10,0)
 static VALUE
-clipboard_wait_is_rich_text_available(self, buffer)
-    VALUE self, buffer;
+clipboard_wait_is_rich_text_available(VALUE self, VALUE buffer)
 {
     return CBOOL2RVAL(gtk_clipboard_wait_is_rich_text_available(_SELF(self), GTK_TEXT_BUFFER(RVAL2GOBJ(buffer))));
 }
@@ -358,8 +317,7 @@ clipboard_wait_is_rich_text_available(self, buffer)
 
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-clipboard_wait_for_targets(self)
-    VALUE self;
+clipboard_wait_for_targets(VALUE self)
 {
     gint i;
     VALUE ary = Qnil;
@@ -387,15 +345,13 @@ clipboard_wait_for_targets(self)
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-clipboard_wait_is_target_available(self, target)
-    VALUE self, target;
+clipboard_wait_is_target_available(VALUE self, VALUE target)
 {
     return CBOOL2RVAL(gtk_clipboard_wait_is_target_available(_SELF(self), RVAL2ATOM(target)));
 }
 
 static VALUE
-clipboard_set_can_store(self, targets)
-    VALUE self, targets;
+clipboard_set_can_store(VALUE self, VALUE targets)
 {
     gint n_targets = 0;
     GtkTargetEntry* entries = (GtkTargetEntry*)NULL;
@@ -409,8 +365,7 @@ clipboard_set_can_store(self, targets)
 }
 
 static VALUE
-clipboard_store(self)
-    VALUE self;
+clipboard_store(VALUE self)
 {
     gtk_clipboard_store(_SELF(self));
     return self;