gtk2 0.90.7 → 0.90.8

data/ext/gtk2/rbgtktextview.c

@@ -19,10 +19,7 @@
 static ID id_buffer;
 
 static VALUE
-textview_initialize(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+textview_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE buffer;
     GtkWidget* widget;
@@ -40,8 +37,7 @@ textview_initialize(argc, argv, self)
 }
 
 static VALUE
-textview_set_buffer(self, buf)
-    VALUE self, buf;
+textview_set_buffer(VALUE self, VALUE buf)
 {
     G_CHILD_SET(self, id_buffer, buf);
     gtk_text_view_set_buffer(_SELF(self), 
@@ -50,8 +46,7 @@ textview_set_buffer(self, buf)
 }
 
 static VALUE
-textview_get_buffer(self)
-    VALUE self;
+textview_get_buffer(VALUE self)
 {
     VALUE buf = GOBJ2RVAL(gtk_text_view_get_buffer(_SELF(self)));
     G_CHILD_SET(self, id_buffer, buf);
@@ -60,8 +55,7 @@ textview_get_buffer(self)
 }
 
 static VALUE
-textview_scroll_to_mark(self, mark, within_margin, use_align, xalign, yalign)
-    VALUE self, mark, within_margin, use_align, xalign, yalign;
+textview_scroll_to_mark(VALUE self, VALUE mark, VALUE within_margin, VALUE use_align, VALUE xalign, VALUE yalign)
 {
     gtk_text_view_scroll_to_mark(_SELF(self), RVAL2MARK(mark), 
                                  NUM2DBL(within_margin), RVAL2CBOOL(use_align), 
@@ -70,8 +64,7 @@ textview_scroll_to_mark(self, mark, within_margin, use_align, xalign, yalign)
 }
 
 static VALUE
-textview_scroll_to_iter(self, iter, within_margin, use_align, xalign, yalign)
-    VALUE self, iter, within_margin, use_align, xalign, yalign;
+textview_scroll_to_iter(VALUE self, VALUE iter, VALUE within_margin, VALUE use_align, VALUE xalign, VALUE yalign)
 {
     return CBOOL2RVAL(gtk_text_view_scroll_to_iter(_SELF(self), RVAL2ITR(iter), 
                                                    NUM2DBL(within_margin), RVAL2CBOOL(use_align), 
@@ -79,30 +72,26 @@ textview_scroll_to_iter(self, iter, within_margin, use_align, xalign, yalign)
 }
 
 static VALUE
-textview_scroll_mark_onscreen(self, mark)
-    VALUE self, mark;
+textview_scroll_mark_onscreen(VALUE self, VALUE mark)
 {
     gtk_text_view_scroll_mark_onscreen(_SELF(self), RVAL2MARK(mark));
     return self;
 }
 
 static VALUE
-textview_move_mark_onscreen(self, mark)
-    VALUE self, mark;
+textview_move_mark_onscreen(VALUE self, VALUE mark)
 {
     return CBOOL2RVAL(gtk_text_view_move_mark_onscreen(_SELF(self), RVAL2MARK(mark)));
 }
 
 static VALUE
-textview_place_cursor_onscreen(self)
-    VALUE self;
+textview_place_cursor_onscreen(VALUE self)
 {
     return CBOOL2RVAL(gtk_text_view_place_cursor_onscreen(_SELF(self)));
 }
 
 static VALUE
-textview_get_visible_rect(self)
-    VALUE self;
+textview_get_visible_rect(VALUE self)
 {
     GdkRectangle rect;
     gtk_text_view_get_visible_rect(_SELF(self), &rect);
@@ -110,8 +99,7 @@ textview_get_visible_rect(self)
 }
 
 static VALUE
-textview_get_iter_location(self, iter)
-    VALUE self, iter;
+textview_get_iter_location(VALUE self, VALUE iter)
 {
     GdkRectangle rect;
     gtk_text_view_get_iter_location(_SELF(self), RVAL2ITR(iter), &rect);
@@ -119,8 +107,7 @@ textview_get_iter_location(self, iter)
 }
 
 static VALUE
-textview_get_line_at_y(self, y)
-    VALUE self, y;
+textview_get_line_at_y(VALUE self, VALUE y)
 {
     GtkTextIter target_iter;
     gint line_top;
@@ -129,8 +116,7 @@ textview_get_line_at_y(self, y)
 }
 
 static VALUE
-textview_get_line_yrange(self, iter)
-    VALUE self, iter;
+textview_get_line_yrange(VALUE self, VALUE iter)
 {
     int y, height;
     gtk_text_view_get_line_yrange(_SELF(self), RVAL2ITR(iter), &y, &height);
@@ -139,8 +125,7 @@ textview_get_line_yrange(self, iter)
 }
 
 static VALUE
-textview_get_iter_at_location(self, x, y)
-    VALUE self, x, y;
+textview_get_iter_at_location(VALUE self, VALUE x, VALUE y)
 {
     GtkTextIter iter;
     gtk_text_view_get_iter_at_location(_SELF(self), &iter, NUM2INT(x), NUM2INT(y));
@@ -149,8 +134,7 @@ textview_get_iter_at_location(self, x, y)
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-textview_get_iter_at_position(self, x, y)
-    VALUE self, x, y;
+textview_get_iter_at_position(VALUE self, VALUE x, VALUE y)
 {
     GtkTextIter iter;
     gint trailing;
@@ -160,8 +144,7 @@ textview_get_iter_at_position(self, x, y)
 #endif
 
 static VALUE
-textview_buffer_to_window_coords(self, wintype, buffer_x, buffer_y)
-    VALUE self, wintype, buffer_x, buffer_y;
+textview_buffer_to_window_coords(VALUE self, VALUE wintype, VALUE buffer_x, VALUE buffer_y)
 {
     int window_x, window_y;
     gtk_text_view_buffer_to_window_coords(_SELF(self), 
@@ -172,8 +155,7 @@ textview_buffer_to_window_coords(self, wintype, buffer_x, buffer_y)
 }
 
 static VALUE
-textview_window_to_buffer_coords(self, wintype, window_x, window_y)
-    VALUE self, wintype, window_x, window_y;
+textview_window_to_buffer_coords(VALUE self, VALUE wintype, VALUE window_x, VALUE window_y)
 {
     int buffer_x, buffer_y;
     gtk_text_view_window_to_buffer_coords(_SELF(self),
@@ -184,8 +166,7 @@ textview_window_to_buffer_coords(self, wintype, window_x, window_y)
 }
 
 static VALUE
-textview_get_window(self, wintype)
-    VALUE self, wintype;
+textview_get_window(VALUE self, VALUE wintype)
 {
     GdkWindow* win = NULL;
     win = gtk_text_view_get_window(_SELF(self), 
@@ -194,16 +175,14 @@ textview_get_window(self, wintype)
 }
 
 static VALUE
-textview_get_window_type(self, gdkwin)
-    VALUE self, gdkwin;
+textview_get_window_type(VALUE self, VALUE gdkwin)
 {
     return GENUM2RVAL(gtk_text_view_get_window_type(_SELF(self), RVAL2GOBJ(gdkwin)), 
                       GTK_TYPE_TEXT_WINDOW_TYPE);
 }
 
 static VALUE
-textview_set_border_window_size(self, wintype, size)
-    VALUE self, wintype, size;
+textview_set_border_window_size(VALUE self, VALUE wintype, VALUE size)
 {
     gtk_text_view_set_border_window_size(_SELF(self), 
                                          RVAL2GENUM(wintype, GTK_TYPE_TEXT_WINDOW_TYPE), 
@@ -212,8 +191,7 @@ textview_set_border_window_size(self, wintype, size)
 }
 
 static VALUE
-textview_get_border_window_size(self, wintype)
-    VALUE self, wintype;
+textview_get_border_window_size(VALUE self, VALUE wintype)
 {
     return INT2NUM(gtk_text_view_get_border_window_size(
                        _SELF(self), 
@@ -221,50 +199,43 @@ textview_get_border_window_size(self, wintype)
 }
 
 static VALUE
-textview_forward_display_line(self, iter)
-    VALUE self, iter;
+textview_forward_display_line(VALUE self, VALUE iter)
 {
     return CBOOL2RVAL(gtk_text_view_forward_display_line(_SELF(self), RVAL2ITR(iter)));
 }
 
 static VALUE
-textview_backward_display_line(self, iter)
-    VALUE self, iter;
+textview_backward_display_line(VALUE self, VALUE iter)
 {
     return CBOOL2RVAL(gtk_text_view_backward_display_line(_SELF(self), RVAL2ITR(iter)));
 }
 
 static VALUE
-textview_forward_display_line_end(self, iter)
-    VALUE self, iter;
+textview_forward_display_line_end(VALUE self, VALUE iter)
 {
     return CBOOL2RVAL(gtk_text_view_forward_display_line_end(_SELF(self), RVAL2ITR(iter)));
 }
 
 static VALUE
-textview_backward_display_line_start(self, iter)
-    VALUE self, iter;
+textview_backward_display_line_start(VALUE self, VALUE iter)
 {
     return CBOOL2RVAL(gtk_text_view_backward_display_line_start(_SELF(self), RVAL2ITR(iter)));
 }
 
 static VALUE
-textview_starts_display_line(self, iter)
-    VALUE self, iter;
+textview_starts_display_line(VALUE self, VALUE iter)
 {
     return CBOOL2RVAL(gtk_text_view_starts_display_line(_SELF(self), RVAL2ITR(iter)));
 }
 
 static VALUE
-textview_move_visually(self, iter, count)
-    VALUE self, iter, count;
+textview_move_visually(VALUE self, VALUE iter, VALUE count)
 {
     return CBOOL2RVAL(gtk_text_view_move_visually(_SELF(self), RVAL2ITR(iter), NUM2INT(count)));
 }
 
 static VALUE
-textview_add_child_at_anchor(self, child, anchor)
-    VALUE self, child, anchor;
+textview_add_child_at_anchor(VALUE self, VALUE child, VALUE anchor)
 {
     G_CHILD_ADD(self, child);
     gtk_text_view_add_child_at_anchor(_SELF(self), GTK_WIDGET(RVAL2GOBJ(child)), 
@@ -273,8 +244,7 @@ textview_add_child_at_anchor(self, child, anchor)
 }
 
 static VALUE
-textview_add_child_in_window(self, child, which_window, xpos, ypos)
-    VALUE self, child, which_window, xpos, ypos;
+textview_add_child_in_window(VALUE self, VALUE child, VALUE which_window, VALUE xpos, VALUE ypos)
 {
     G_CHILD_ADD(self, child);
     gtk_text_view_add_child_in_window(_SELF(self), GTK_WIDGET(RVAL2GOBJ(child)),
@@ -284,8 +254,7 @@ textview_add_child_in_window(self, child, which_window, xpos, ypos)
 }
 
 static VALUE
-textview_move_child(self, child, xpos, ypos)
-    VALUE self, child, xpos, ypos;
+textview_move_child(VALUE self, VALUE child, VALUE xpos, VALUE ypos)
 {
     G_CHILD_ADD(self, child);
     gtk_text_view_move_child(_SELF(self), GTK_WIDGET(RVAL2GOBJ(child)),
@@ -294,8 +263,7 @@ textview_move_child(self, child, xpos, ypos)
 }
 
 static VALUE
-textview_get_default_attributes(self)
-    VALUE self;
+textview_get_default_attributes(VALUE self)
 {
     return BOXED2RVAL(gtk_text_view_get_default_attributes(_SELF(self)), 
                       GTK_TYPE_TEXT_ATTRIBUTES);

data/ext/gtk2/rbgtktoggleaction.c

@@ -16,8 +16,7 @@
 #define _SELF(self) (GTK_TOGGLE_ACTION(RVAL2GOBJ(self)))
 
 static VALUE
-taction_initialize(self, name, label, tooltip, stock_id)
-    VALUE self, name, label, tooltip, stock_id;
+taction_initialize(VALUE self, VALUE name, VALUE label, VALUE tooltip, VALUE stock_id)
 {
     const gchar *gstockid = NULL;
 
@@ -35,24 +34,21 @@ taction_initialize(self, name, label, tooltip, stock_id)
 }
 
 static VALUE
-taction_toggled(self)
-    VALUE self;
+taction_toggled(VALUE self)
 {
     gtk_toggle_action_toggled(_SELF(self));
     return self;
 }
 
 static VALUE
-taction_set_active(self, is_active)
-    VALUE self, is_active;
+taction_set_active(VALUE self, VALUE is_active)
 {
     gtk_toggle_action_set_active(_SELF(self), RVAL2CBOOL(is_active));
     return self;
 }
 
 static VALUE
-taction_get_active(self)
-    VALUE self;
+taction_get_active(VALUE self)
 {
     return CBOOL2RVAL(gtk_toggle_action_get_active(_SELF(self)));
 }

data/ext/gtk2/rbgtktogglebutton.c

@@ -15,10 +15,7 @@
 #include "global.h"
 
 static VALUE
-tbtn_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+tbtn_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE label, use_underline;
     GtkWidget *widget;
@@ -46,8 +43,7 @@ tbtn_initialize(argc, argv, self)
 }
 
 static VALUE
-tbtn_set_mode(self, mode)
-    VALUE self, mode;
+tbtn_set_mode(VALUE self, VALUE mode)
 {
     gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(RVAL2GOBJ(self)),
 			       RVAL2CBOOL(mode));
@@ -55,15 +51,13 @@ tbtn_set_mode(self, mode)
 }
 
 static VALUE
-tbtn_get_mode(self)
-    VALUE self;
+tbtn_get_mode(VALUE self)
 {
     return CBOOL2RVAL(gtk_toggle_button_get_mode(GTK_TOGGLE_BUTTON(RVAL2GOBJ(self))));
 }
 
 static VALUE
-tbtn_toggled(self)
-    VALUE self;
+tbtn_toggled(VALUE self)
 {
     gtk_toggle_button_toggled(GTK_TOGGLE_BUTTON(RVAL2GOBJ(self)));
     return self;

data/ext/gtk2/rbgtktoggletoolbutton.c

@@ -15,10 +15,7 @@
 
 #define _SELF(self) (GTK_TOGGLE_TOOL_BUTTON(RVAL2GOBJ(self)))
 static VALUE
-toggletoolbutton_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+toggletoolbutton_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE stock_id;
     GtkToolItem* item;
@@ -39,16 +36,14 @@ toggletoolbutton_initialize(argc, argv, self)
 }
 
 static VALUE
-toggletoolbutton_set_active(self, is_active)
-    VALUE self, is_active;
+toggletoolbutton_set_active(VALUE self, VALUE is_active)
 {
     gtk_toggle_tool_button_set_active(_SELF(self), RVAL2CBOOL(is_active));
     return self;
 }
 
 static VALUE
-toggletoolbutton_get_active(self)
-    VALUE self;
+toggletoolbutton_get_active(VALUE self)
 {
     return CBOOL2RVAL(gtk_toggle_tool_button_get_active(_SELF(self)));
 }

data/ext/gtk2/rbgtktoolbar.c

@@ -19,18 +19,14 @@
 #define N_RVAL2WIDGET(w)  (NIL_P(w) ? NULL : GTK_WIDGET(RVAL2GOBJ(w)))
 
 static VALUE
-tbar_initialize(self)
-    VALUE self;
+tbar_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_toolbar_new());
     return Qnil;
 }
 
 static VALUE
-tbar_append(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE  self;
+tbar_append(int argc, VALUE *argv, VALUE self)
 {
     GtkWidget* ret = NULL;
     VALUE type = Qnil;
@@ -82,10 +78,7 @@ tbar_append(argc, argv, self)
 }
 
 static VALUE
-tbar_prepend(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE  self;
+tbar_prepend(int argc, VALUE *argv, VALUE self)
 {
     GtkWidget* ret = NULL;
     VALUE type = Qnil;
@@ -136,10 +129,7 @@ tbar_prepend(argc, argv, self)
 }
 
 static VALUE
-tbar_insert(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE  self;
+tbar_insert(int argc, VALUE *argv, VALUE self)
 {
     GtkWidget* ret = NULL;
     VALUE type = Qnil;
@@ -201,36 +191,31 @@ tbar_insert(argc, argv, self)
 
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-tbar_get_item_index(self, item)
-    VALUE self, item;
+tbar_get_item_index(VALUE self, VALUE item)
 {
     return INT2NUM(gtk_toolbar_get_item_index(_SELF(self), GTK_TOOL_ITEM(RVAL2GOBJ(item))));
 }
 
 static VALUE
-tbar_get_n_items(self)
-    VALUE self;
+tbar_get_n_items(VALUE self)
 {
     return INT2NUM(gtk_toolbar_get_n_items(_SELF(self)));
 }
 
 static VALUE
-tbar_get_nth_item(self, n)
-    VALUE self, n;
+tbar_get_nth_item(VALUE self, VALUE n)
 {
     return GOBJ2RVAL(gtk_toolbar_get_nth_item(_SELF(self), NUM2INT(n)));
 }
 
 static VALUE
-tbar_get_drop_index(self, x, y)
-    VALUE self, x, y;
+tbar_get_drop_index(VALUE self, VALUE x, VALUE y)
 {
     return INT2NUM(gtk_toolbar_get_drop_index(_SELF(self), NUM2INT(x), NUM2INT(y)));
 }
 
 static VALUE
-tbar_set_drop_highlight_item(self, item, index)
-    VALUE self, item, index;
+tbar_set_drop_highlight_item(VALUE self, VALUE item, VALUE index)
 {
     gtk_toolbar_set_drop_highlight_item(_SELF(self), 
                                         GTK_TOOL_ITEM(RVAL2GOBJ(item)), 
@@ -244,86 +229,75 @@ gboolean    gtk_toolbar_get_show_arrow      (GtkToolbar *toolbar);
 */
 
 static VALUE
-tbar_get_relief_style(self)
-    VALUE self;
+tbar_get_relief_style(VALUE self)
 {
     return GENUM2RVAL(gtk_toolbar_get_relief_style(_SELF(self)), GTK_TYPE_RELIEF_STYLE);
 }
 #endif
 
 static VALUE
-tbar_append_space(self)
-    VALUE self;
+tbar_append_space(VALUE self)
 {
     gtk_toolbar_append_space(_SELF(self));
     return self;
 }
 
 static VALUE
-tbar_prepend_space(self)
-    VALUE self;
+tbar_prepend_space(VALUE self)
 {
     gtk_toolbar_prepend_space(_SELF(self));
     return self;
 }
 
 static VALUE
-tbar_insert_space(self, pos)
-    VALUE self, pos;
+tbar_insert_space(VALUE self, VALUE pos)
 {
     gtk_toolbar_insert_space(_SELF(self), NUM2INT(pos));
     return self;
 }
 
 static VALUE
-tbar_set_tooltips(self, enable)
-    VALUE self, enable;
+tbar_set_tooltips(VALUE self, VALUE enable)
 {
     gtk_toolbar_set_tooltips(_SELF(self), RVAL2CBOOL(enable));
     return self;
 }
 
 static VALUE
-tbar_set_icon_size(self, size)
-    VALUE self, size;
+tbar_set_icon_size(VALUE self, VALUE size)
 {
     gtk_toolbar_set_icon_size(_SELF(self), RVAL2GENUM(size, GTK_TYPE_ICON_SIZE));
     return self;
 }
 
 static VALUE
-tbar_get_icon_size(self)
-    VALUE self;
+tbar_get_icon_size(VALUE self)
 {
     return GENUM2RVAL(gtk_toolbar_get_icon_size(_SELF(self)), GTK_TYPE_ICON_SIZE);
 }
 
 static VALUE
-tbar_get_tooltips(self)
-    VALUE self;
+tbar_get_tooltips(VALUE self)
 {
     return CBOOL2RVAL(gtk_toolbar_get_tooltips(_SELF(self)));
 }
 
 static VALUE
-tbar_remove_space(self, position)
-    VALUE self, position;
+tbar_remove_space(VALUE self, VALUE position)
 {
     gtk_toolbar_remove_space(_SELF(self), NUM2INT(position));
     return self;
 }
 
 static VALUE
-tbar_unset_icon_size(self)
-    VALUE self;
+tbar_unset_icon_size(VALUE self)
 {
     gtk_toolbar_unset_icon_size(_SELF(self));
     return self;
 }
 
 static VALUE
-tbar_unset_style(self)
-    VALUE self;
+tbar_unset_style(VALUE self)
 {
     gtk_toolbar_unset_style(_SELF(self));
     return self;