gtk2 0.90.7 → 0.90.8

data/ext/gtk2/rbgtktextchild.c

@@ -15,25 +15,20 @@
 #define _SELF(self) GTK_TEXT_CHILD_ANCHOR(RVAL2GOBJ(self))
 
 static VALUE
-textchild_initialize(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+textchild_initialize(int argc, VALUE *argv, VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_text_child_anchor_new());
     return Qnil;
 }
 
 static VALUE
-textchild_get_widgets(self)
-    VALUE self;
+textchild_get_widgets(VALUE self)
 {
     return GLIST2ARYF(gtk_text_child_anchor_get_widgets(_SELF(self)));
 }
 
 static VALUE
-textchild_get_deleted(self)
-    VALUE self;
+textchild_get_deleted(VALUE self)
 {
     return CBOOL2RVAL(gtk_text_child_anchor_get_deleted(_SELF(self)));
 }

data/ext/gtk2/rbgtktextiter.c

@@ -20,16 +20,14 @@ static gboolean is_compat_240;
 static ID id_pixbuf;
 
 static VALUE
-get_buffer(self)
-    VALUE self;
+get_buffer(VALUE self)
 {
     return GOBJ2RVAL(gtk_text_iter_get_buffer(_SELF(self)));
 }
 
 #define def_gint_getter(__name__) \
 static VALUE \
-get_##__name__(self) \
-    VALUE self; \
+get_##__name__(VALUE self) \
 { \
     return INT2NUM(gtk_text_iter_get_##__name__(_SELF(self))); \
 }
@@ -42,8 +40,7 @@ def_gint_getter(visible_line_offset)
 def_gint_getter(visible_line_index)
 
 static VALUE
-get_char(self)
-    VALUE self;
+get_char(VALUE self)
 {
     gchar buf[10];
     gint len = g_unichar_to_utf8(gtk_text_iter_get_char(_SELF(self)), buf);
@@ -52,36 +49,31 @@ get_char(self)
 }
 
 static VALUE
-get_slice(self, rhs)
-    VALUE self, rhs;
+get_slice(VALUE self, VALUE rhs)
 {
     return CSTR2RVAL(gtk_text_iter_get_slice(_SELF(self), _SELF(rhs)));
 }
 
 static VALUE
-get_text(self, rhs)
-    VALUE self, rhs;
+get_text(VALUE self, VALUE rhs)
 {
     return CSTR2RVAL(gtk_text_iter_get_text(_SELF(self), _SELF(rhs)));
 }
 
 static VALUE
-get_visible_slice(self, rhs)
-    VALUE self, rhs;
+get_visible_slice(VALUE self, VALUE rhs)
 {
     return CSTR2RVAL(gtk_text_iter_get_visible_slice(_SELF(self), _SELF(rhs)));
 }
 
 static VALUE
-get_visible_text(self, rhs)
-    VALUE self, rhs;
+get_visible_text(VALUE self, VALUE rhs)
 {
     return CSTR2RVAL(gtk_text_iter_get_visible_text(_SELF(self), _SELF(rhs)));
 }
 
 static VALUE
-get_pixbuf(self)
-    VALUE self;
+get_pixbuf(VALUE self)
 {
     GdkPixbuf* pixbuf = gtk_text_iter_get_pixbuf(_SELF(self));
     VALUE ret = Qnil;
@@ -93,72 +85,62 @@ get_pixbuf(self)
 }
 
 static VALUE
-get_marks(self)
-    VALUE self;
+get_marks(VALUE self)
 {
     return GSLIST2ARYF(gtk_text_iter_get_marks(_SELF(self)));
 }
 
 static VALUE
-get_toggled_tags(self, toggled_on)
-    VALUE self, toggled_on;
+get_toggled_tags(VALUE self, VALUE toggled_on)
 {
     return GSLIST2ARYF(gtk_text_iter_get_toggled_tags(_SELF(self), RVAL2CBOOL(toggled_on)));
 }
 
 static VALUE
-get_child_anchor(self)
-    VALUE self;
+get_child_anchor(VALUE self)
 {
     GtkTextChildAnchor* anchor = gtk_text_iter_get_child_anchor(_SELF(self));
     return anchor ? GOBJ2RVAL(anchor) : Qnil;
 }
 
 static VALUE
-begins_tag(self, tag)
-    VALUE self, tag;
+begins_tag(VALUE self, VALUE tag)
 {
     return CBOOL2RVAL(gtk_text_iter_begins_tag(_SELF(self), RVAL2TAG(tag)));
 }
 
 static VALUE
-ends_tag(self, tag)
-    VALUE self, tag;
+ends_tag(VALUE self, VALUE tag)
 {
     return CBOOL2RVAL(gtk_text_iter_ends_tag(_SELF(self), RVAL2TAG(tag)));
 }
 
 static VALUE
-toggles_tag(self, tag)
-    VALUE self, tag;
+toggles_tag(VALUE self, VALUE tag)
 {
     return CBOOL2RVAL(gtk_text_iter_toggles_tag(_SELF(self), RVAL2TAG(tag)));
 }
 
 static VALUE
-has_tag(self, tag)
-    VALUE self, tag;
+has_tag(VALUE self, VALUE tag)
 {
     return CBOOL2RVAL(gtk_text_iter_has_tag(_SELF(self), RVAL2TAG(tag)));
 }
 
 static VALUE
-get_tags(self)
-    VALUE self;
+get_tags(VALUE self)
 {
     return GSLIST2ARYF(gtk_text_iter_get_tags(_SELF(self)));
 }
 
 static VALUE
-editable(self, default_setting)
-    VALUE self, default_setting;
+editable(VALUE self, VALUE default_setting)
 {
     return CBOOL2RVAL(gtk_text_iter_editable(_SELF(self), RVAL2CBOOL(default_setting)));
 }
 
 static VALUE
-can_insert(self, default_setting)
-    VALUE self, default_setting;
+can_insert(VALUE self, VALUE default_setting)
 {
     return CBOOL2RVAL(gtk_text_iter_can_insert(_SELF(self), RVAL2CBOOL(default_setting)));
 }
@@ -166,8 +148,7 @@ can_insert(self, default_setting)
     
 #define def_predicate(__name__) \
 static VALUE \
-__name__(self) \
-    VALUE self; \
+__name__(VALUE self) \
 { \
     return CBOOL2RVAL(gtk_text_iter_##__name__(_SELF(self)));   \
 }
@@ -185,8 +166,7 @@ def_gint_getter(chars_in_line)
 def_gint_getter(bytes_in_line)
 
 static VALUE
-get_attributes(self)
-    VALUE self;
+get_attributes(VALUE self)
 {
     GtkTextAttributes attr;
     
@@ -198,8 +178,7 @@ get_attributes(self)
 }
     
 static VALUE
-get_language(self)
-    VALUE self;
+get_language(VALUE self)
 {
     return CSTR2RVAL(pango_language_to_string(gtk_text_iter_get_language(_SELF(self))));
 }
@@ -210,16 +189,14 @@ def_predicate(is_start)
 
 #define def_move(__name__) \
 static VALUE \
-__name__(self) \
-    VALUE self; \
+__name__(VALUE self) \
 { \
     return CBOOL2RVAL(gtk_text_iter_##__name__(_SELF(self))); \
 }
 
 #define def_move_gint(__name__) \
 static VALUE \
-__name__(self, i) \
-    VALUE self, i; \
+__name__(VALUE self, VALUE i) \
 { \
     return CBOOL2RVAL(gtk_text_iter_##__name__(_SELF(self), NUM2INT(i))); \
 }
@@ -264,8 +241,7 @@ def_move_gint(backward_cursor_positions)
 def_move(forward_to_line_end)
 
 static VALUE
-forward_to_end(self)
-    VALUE self;
+forward_to_end(VALUE self)
 {
     gtk_text_iter_forward_to_end(_SELF(self));
     return self;
@@ -273,8 +249,7 @@ forward_to_end(self)
 
 #define def_gint_setter(__name__) \
 static VALUE \
-set_##__name__(self, val) \
-    VALUE self, val; \
+set_##__name__(VALUE self, VALUE val) \
 { \
     gtk_text_iter_set_##__name__(_SELF(self), NUM2INT(val)); \
     return val; \
@@ -289,10 +264,7 @@ def_gint_setter(visible_line_offset)
 def_gint_setter(visible_line_index)
 
 static VALUE
-forward_to_tag_toggle(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+forward_to_tag_toggle(int argc, VALUE *argv, VALUE self)
 {
     VALUE tag;
 
@@ -302,10 +274,7 @@ forward_to_tag_toggle(argc, argv, self)
 }
 
 static VALUE
-backward_to_tag_toggle(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+backward_to_tag_toggle(int argc, VALUE *argv, VALUE self)
 {
     VALUE tag;
 
@@ -315,18 +284,13 @@ backward_to_tag_toggle(argc, argv, self)
 }
 
 static gboolean
-char_predicate_func(ch, func)
-    guint32 ch;
-    gpointer func;
+char_predicate_func(guint32 ch, gpointer func)
 {
     return RVAL2CBOOL(rb_funcall((VALUE)func, id_call, 1, UINT2NUM(ch)));
 }
 
 static VALUE
-forward_find_char(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+forward_find_char(int argc, VALUE *argv, VALUE self)
 {
     VALUE limit;
     volatile VALUE func = rb_block_proc();
@@ -339,10 +303,7 @@ forward_find_char(argc, argv, self)
 }
 
 static VALUE
-backward_find_char(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+backward_find_char(int argc, VALUE *argv, VALUE self)
 {
     VALUE limit;
     volatile VALUE func = rb_block_proc();
@@ -355,10 +316,7 @@ backward_find_char(argc, argv, self)
 }
 
 static VALUE
-forward_search(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+forward_search(int argc, VALUE *argv, VALUE self)
 {
     GtkTextIter m_start, m_end;
     VALUE str, flags, limit;
@@ -381,10 +339,7 @@ forward_search(argc, argv, self)
 }
 
 static VALUE
-backward_search(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+backward_search(int argc, VALUE *argv, VALUE self)
 {
     GtkTextIter m_start, m_end;
     VALUE str, flags, limit;
@@ -406,15 +361,13 @@ backward_search(argc, argv, self)
 }
 
 static VALUE
-equal(self, other)
-    VALUE self, other;
+equal(VALUE self, VALUE other)
 {
     return CBOOL2RVAL(gtk_text_iter_equal(_SELF(self), _SELF(other)));
 }
 
 static VALUE
-compare(self, rhs)
-    VALUE self, rhs;
+compare(VALUE self, VALUE rhs)
 {
     return INT2NUM(gtk_text_iter_compare(_SELF(self), _SELF(rhs)));
 }

data/ext/gtk2/rbgtktextmark.c

@@ -15,8 +15,7 @@
 
 #if GTK_CHECK_VERSION(2,12,0)
 static VALUE
-initialize(self, name, left_gravity)
-    VALUE self, name, left_gravity;
+initialize(VALUE self, VALUE name, VALUE left_gravity)
 {
     if (NIL_P(name))
         G_INITIALIZE(self, gtk_text_mark_new(NULL, RVAL2CBOOL(left_gravity)));
@@ -27,44 +26,38 @@ initialize(self, name, left_gravity)
 #endif
 
 static VALUE
-set_visible(self, setting)
-    VALUE self, setting;
+set_visible(VALUE self, VALUE setting)
 {
     gtk_text_mark_set_visible(_SELF(self), RVAL2CBOOL(setting));
     return setting;
 }
 
 static VALUE
-get_visible(self)
-    VALUE self;
+get_visible(VALUE self)
 {
     return CBOOL2RVAL(gtk_text_mark_get_visible(_SELF(self)));
 }
 
 static VALUE
-get_name(self)
-    VALUE self;
+get_name(VALUE self)
 {
     return CSTR2RVAL(gtk_text_mark_get_name(_SELF(self)));
 }
 
 static VALUE
-get_deleted(self)
-    VALUE self;
+get_deleted(VALUE self)
 {
     return CBOOL2RVAL(gtk_text_mark_get_deleted(_SELF(self)));
 }
 
 static VALUE
-get_buffer(self)
-    VALUE self;
+get_buffer(VALUE self)
 {
     return GOBJ2RVAL(gtk_text_mark_get_buffer(_SELF(self)));
 }
 
 static VALUE
-get_left_gravity(self)
-    VALUE self;
+get_left_gravity(VALUE self)
 {
     return CBOOL2RVAL(gtk_text_mark_get_left_gravity(_SELF(self)));
 }

data/ext/gtk2/rbgtktexttag.c

@@ -12,10 +12,7 @@
 #include "global.h"
 
 static VALUE
-initialize(argc, argv, self)
-    int argc;
-    VALUE* argv;
-    VALUE self;
+initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE name;
     rb_scan_args(argc, argv, "01", &name);
@@ -24,23 +21,20 @@ initialize(argc, argv, self)
 }
 
 static VALUE
-get_priority(self)
-    VALUE self;
+get_priority(VALUE self)
 {
     return INT2NUM(gtk_text_tag_get_priority(GTK_TEXT_TAG(RVAL2GOBJ(self))));
 }
 
 static VALUE
-set_priority(self, priority)
-    VALUE self, priority;
+set_priority(VALUE self, VALUE priority)
 {
     gtk_text_tag_set_priority(GTK_TEXT_TAG(RVAL2GOBJ(self)), NUM2INT(priority));
     return priority;
 }
 
 static VALUE
-event(self, event_object, event, iter)
-    VALUE self, event_object, event, iter;
+event(VALUE self, VALUE event_object, VALUE event, VALUE iter)
 {
     gboolean ret = gtk_text_tag_event(GTK_TEXT_TAG(RVAL2GOBJ(self)), 
                                       RVAL2GOBJ(event_object),

data/ext/gtk2/rbgtktexttagtable.c

@@ -14,16 +14,14 @@
 #define RVAL2TAG(t) (GTK_TEXT_TAG(RVAL2GOBJ(t)))
 
 static VALUE
-txt_tt_initialize(self)
-    VALUE self;
+txt_tt_initialize(VALUE self)
 {
     G_INITIALIZE(self, gtk_text_tag_table_new());
     return Qnil;
 }
 
 static VALUE
-txt_tt_add(self, tag)
-    VALUE self, tag;
+txt_tt_add(VALUE self, VALUE tag)
 {
     G_CHILD_ADD(self, tag);
     gtk_text_tag_table_add(_SELF(self), RVAL2TAG(tag));
@@ -31,8 +29,7 @@ txt_tt_add(self, tag)
 }
 
 static VALUE
-txt_tt_remove(self, tag)
-    VALUE self, tag;
+txt_tt_remove(VALUE self, VALUE tag)
 {
     G_CHILD_REMOVE(self, tag);
     gtk_text_tag_table_remove(_SELF(self), RVAL2TAG(tag));
@@ -40,8 +37,7 @@ txt_tt_remove(self, tag)
 }
 
 static VALUE
-txt_tt_lookup(self, name)
-    VALUE self, name;
+txt_tt_lookup(VALUE self, VALUE name)
 {
     VALUE ret = Qnil;
     GtkTextTag* tag = gtk_text_tag_table_lookup(_SELF(self), RVAL2CSTR(name));
@@ -53,16 +49,13 @@ txt_tt_lookup(self, name)
 }
 
 static gboolean
-txt_tt_foreach_func(tag, func)
-    GtkTextTag *tag;
-    gpointer func;
+txt_tt_foreach_func(GtkTextTag *tag, gpointer func)
 {
     return RVAL2CBOOL(rb_funcall((VALUE)func, id_call, 1, GOBJ2RVAL(tag)));
 }
 
 static VALUE
-txt_tt_foreach(self)
-    VALUE self;
+txt_tt_foreach(VALUE self)
 {
     volatile VALUE func = rb_block_proc();
     gtk_text_tag_table_foreach(_SELF(self), 
@@ -72,8 +65,7 @@ txt_tt_foreach(self)
 }
 
 static VALUE
-txt_tt_get_size(self)
-    VALUE self;
+txt_tt_get_size(VALUE self)
 {
     return INT2NUM(gtk_text_tag_table_get_size(_SELF(self)));
 }