gtk2 0.90.7 → 0.90.8

data/ext/gtk2/rbgtktable.c

@@ -17,10 +17,7 @@
 #define _SELF(self) (GTK_TABLE(RVAL2GOBJ(self)))
 
 static VALUE
-tbl_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+tbl_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE row, col, homogeneous;
 
@@ -32,18 +29,14 @@ tbl_initialize(argc, argv, self)
 }
 
 static VALUE
-tbl_resize(self, rows, columns)
-    VALUE self, rows, columns;
+tbl_resize(VALUE self, VALUE rows, VALUE columns)
 {
     gtk_table_resize(_SELF(self), NUM2UINT(rows), NUM2UINT(columns));
     return self;
 }
 
 static VALUE
-tbl_attach(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+tbl_attach(int argc, VALUE *argv, VALUE self)
 {
     VALUE child, left, right, top, bottom;
     VALUE arg0, arg1, arg2, arg3;
@@ -72,9 +65,7 @@ tbl_attach(argc, argv, self)
 }
 
 static VALUE
-tbl_attach_defaults(self, widget, left_attach, right_attach, top_attach, 
-                    bottom_attach)
-    VALUE self, widget, left_attach, right_attach, top_attach, bottom_attach;
+tbl_attach_defaults(VALUE self, VALUE widget, VALUE left_attach, VALUE right_attach, VALUE top_attach, VALUE bottom_attach)
 {
     gtk_table_attach_defaults(_SELF(self), GTK_WIDGET(RVAL2GOBJ(widget)),
                               NUM2UINT(left_attach), NUM2UINT(right_attach),
@@ -84,75 +75,65 @@ tbl_attach_defaults(self, widget, left_attach, right_attach, top_attach,
 }
 
 static VALUE
-tbl_set_row_spacing(self, row, spc)
-    VALUE self, row, spc;
+tbl_set_row_spacing(VALUE self, VALUE row, VALUE spc)
 {
     gtk_table_set_row_spacing(_SELF(self), NUM2UINT(row), NUM2UINT(spc));
     return self;
 }
 
 static VALUE
-tbl_get_row_spacing(self, row)
-    VALUE self, row;
+tbl_get_row_spacing(VALUE self, VALUE row)
 {
     return UINT2NUM(gtk_table_get_row_spacing(_SELF(self), NUM2UINT(row)));
 }
 
 static VALUE
-tbl_set_col_spacing(self, col, spc)
-    VALUE self, col, spc;
+tbl_set_col_spacing(VALUE self, VALUE col, VALUE spc)
 {
     gtk_table_set_col_spacing(_SELF(self), NUM2UINT(col), NUM2UINT(spc));
     return self;
 }
 
 static VALUE
-tbl_get_col_spacing(self, col)
-    VALUE self, col;
+tbl_get_col_spacing(VALUE self, VALUE col)
 {
     return UINT2NUM(gtk_table_get_col_spacing(_SELF(self), NUM2UINT(col)));
 }
 
 static VALUE
-tbl_set_row_spacings(self, spc)
-    VALUE self, spc;
+tbl_set_row_spacings(VALUE self, VALUE spc)
 {
     gtk_table_set_row_spacings(_SELF(self), NUM2UINT(spc));
     return self;
 }
 
 static VALUE
-tbl_set_col_spacings(self, spc)
-    VALUE self, spc;
+tbl_set_col_spacings(VALUE self, VALUE spc)
 {
     gtk_table_set_col_spacings(_SELF(self), NUM2UINT(spc));
     return self;
 }
 
 static VALUE
-tbl_get_row_spacings(self)
-    VALUE self;
+tbl_get_row_spacings(VALUE self)
 {
     return UINT2NUM(_SELF(self)->row_spacing);
 }
 
 static VALUE
-tbl_get_col_spacings(self)
-    VALUE self;
+tbl_get_col_spacings(VALUE self)
 {
     return UINT2NUM(_SELF(self)->column_spacing);
 }
 
 static VALUE
-tbl_get_default_row_spacing(self)
-    VALUE self;
+tbl_get_default_row_spacing(VALUE self)
 {
     return UINT2NUM(gtk_table_get_default_row_spacing(_SELF(self)));
 }
 
 static VALUE
-tbl_get_default_col_spacing(self)
-    VALUE self;
+tbl_get_default_col_spacing(VALUE self)
 {
     return UINT2NUM(gtk_table_get_default_col_spacing(_SELF(self)));
 }

data/ext/gtk2/rbgtktargetlist.c

@@ -40,8 +40,7 @@ gtk_target_list_get_type(void)
 /**********************************/
 
 static VALUE
-target_list_initialize(self, targets)
-     VALUE self, targets;
+target_list_initialize(VALUE self, VALUE targets)
 {
     Check_Type(targets, T_ARRAY);
     G_INITIALIZE(self, gtk_target_list_new(
@@ -51,8 +50,7 @@ target_list_initialize(self, targets)
 }
 
 static VALUE
-target_list_add(self, target, flags, info)
-    VALUE self, target, flags, info;
+target_list_add(VALUE self, VALUE target, VALUE flags, VALUE info)
 {
     gtk_target_list_add(_SELF(self), RVAL2ATOM(target),
                         FIX2UINT(flags), FIX2UINT(info));
@@ -60,8 +58,7 @@ target_list_add(self, target, flags, info)
 }
 
 static VALUE
-target_list_add_table(self, targets)
-    VALUE self, targets;
+target_list_add_table(VALUE self, VALUE targets)
 {
     gtk_target_list_add_table(_SELF(self),
                               rbgtk_get_target_entry(targets), 
@@ -71,24 +68,21 @@ target_list_add_table(self, targets)
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-target_list_add_text_targets(self, info)
-    VALUE self, info;
+target_list_add_text_targets(VALUE self, VALUE info)
 {
     gtk_target_list_add_text_targets(_SELF(self), NUM2UINT(info));
     return self;
 }
 
 static VALUE
-target_list_add_image_targets(self, info, writable)
-    VALUE self, info, writable;
+target_list_add_image_targets(VALUE self, VALUE info, VALUE writable)
 {
     gtk_target_list_add_image_targets(_SELF(self), NUM2UINT(info), RVAL2CBOOL(writable));
     return self;
 }
 
 static VALUE
-target_list_add_uri_targets(self, info)
-    VALUE self, info;
+target_list_add_uri_targets(VALUE self, VALUE info)
 {
     gtk_target_list_add_uri_targets(_SELF(self), NUM2UINT(info));
     return self;
@@ -97,8 +91,7 @@ target_list_add_uri_targets(self, info)
 
 #if GTK_CHECK_VERSION(2,10,0)
 static VALUE
-target_list_add_rich_text_targets(self, info, deserializable, buffer)
-    VALUE self, info, deserializable, buffer;
+target_list_add_rich_text_targets(VALUE self, VALUE info, VALUE deserializable, VALUE buffer)
 {
     gtk_target_list_add_rich_text_targets(_SELF(self), NUM2UINT(info),
                                           RVAL2CBOOL(deserializable),
@@ -108,16 +101,14 @@ target_list_add_rich_text_targets(self, info, deserializable, buffer)
 #endif
 
 static VALUE
-target_list_remove(self, target)
-    VALUE self, target;
+target_list_remove(VALUE self, VALUE target)
 {
     gtk_target_list_remove(_SELF(self), RVAL2ATOM(target));
     return self;
 }
 
 static VALUE
-target_list_find(self, target)
-    VALUE self, target;
+target_list_find(VALUE self, VALUE target)
 {
     guint info;
     gboolean ret = gtk_target_list_find(_SELF(self), RVAL2ATOM(target),

data/ext/gtk2/rbgtktearoffmenuitem.c

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

data/ext/gtk2/rbgtktextappearance.c

@@ -39,14 +39,12 @@ gtk_text_appearance_get_type(void)
 /***********************************************/
 #define ATTR_INT(name)\
 static VALUE \
-txt_app_int_ ## name (self)\
-    VALUE self;\
+txt_app_int_ ## name (VALUE self)\
 {\
     return INT2NUM(_SELF(self)->name);\
 }\
 static VALUE \
-txt_app_int_set_ ## name (self, val)\
-    VALUE self, val;\
+txt_app_int_set_ ## name (VALUE self, VALUE val)\
 {\
     _SELF(self)->name = NUM2INT(val); \
     return self;\
@@ -54,14 +52,12 @@ txt_app_int_set_ ## name (self, val)\
 
 #define ATTR_BOOL(name)\
 static VALUE \
-txt_app_bool_ ## name (self)\
-    VALUE self;\
+txt_app_bool_ ## name (VALUE self)\
 {\
     return CBOOL2RVAL(_SELF(self)->name);\
 }\
 static VALUE \
-txt_app_bool_set_ ## name (self, val)\
-    VALUE self, val;\
+txt_app_bool_set_ ## name (VALUE self, VALUE val)\
 {\
     _SELF(self)->name = RVAL2CBOOL(val);\
     return self;\
@@ -69,14 +65,12 @@ txt_app_bool_set_ ## name (self, val)\
 
 #define ATTR_ENUM(name, gtype)\
 static VALUE \
-txt_app_enums_ ## name (self)\
-    VALUE self;\
+txt_app_enums_ ## name (VALUE self)\
 {\
     return GENUM2RVAL(_SELF(self)->name, gtype);\
 }\
 static VALUE \
-txt_app_enums_set_ ## name (self, val)\
-    VALUE self, val;\
+txt_app_enums_set_ ## name (VALUE self, VALUE val)\
 {\
     _SELF(self)->name = RVAL2GENUM(val, gtype);\
     return self;\
@@ -84,8 +78,7 @@ txt_app_enums_set_ ## name (self, val)\
 
 #define ATTR_GOBJ(name)\
 static VALUE \
-txt_app_gobj_ ## name (self)\
-    VALUE self;\
+txt_app_gobj_ ## name (VALUE self)\
 {\
     VALUE val; \
     if (_SELF(self)->name == NULL) return Qnil;\
@@ -94,8 +87,7 @@ txt_app_gobj_ ## name (self)\
     return val; \
 }\
 static VALUE \
-txt_app_gobj_set_ ## name (self, val)\
-    VALUE self, val;\
+txt_app_gobj_set_ ## name (VALUE self, VALUE val)\
 {\
     _SELF(self)->name = RVAL2GOBJ(val);\
     G_CHILD_SET(self, rb_intern(G_STRINGIFY(name)), val);\
@@ -104,16 +96,14 @@ txt_app_gobj_set_ ## name (self, val)\
 
 #define ATTR_COLOR(name)\
 static VALUE \
-txt_app_color_ ## name (self)\
-    VALUE self;\
+txt_app_color_ ## name (VALUE self)\
 {\
     VALUE val = BOXED2RVAL(&_SELF(self)->name, GDK_TYPE_COLOR);\
     G_CHILD_SET(self, rb_intern(G_STRINGIFY(name)), val);\
     return val;\
 }\
 static VALUE \
-txt_app_color_set_ ## name (self, val)\
-    VALUE self, val;\
+txt_app_color_set_ ## name (VALUE self, VALUE val)\
 {\
     G_CHILD_SET(self, rb_intern(G_STRINGIFY(name)), val);\
     _SELF(self)->name = *RVAL2GDKCOLOR(val);	\
@@ -137,8 +127,7 @@ ATTR_BOOL(inside_selection);
 ATTR_BOOL(is_text);
 
 static VALUE
-txt_app_initialize(self)
-    VALUE self;
+txt_app_initialize(VALUE self)
 {
     GtkTextAppearance* app = ALLOC(GtkTextAppearance);
     memset(app, 0, sizeof(GtkTextAppearance));

data/ext/gtk2/rbgtktextattributes.c

@@ -16,14 +16,12 @@
 /***********************************************/
 #define ATTR_INT(name)\
 static VALUE \
-txt_attr_int_ ## name (self)\
-    VALUE self;\
+txt_attr_int_ ## name (VALUE self)\
 {\
     return INT2NUM(_SELF(self)->name);\
 }\
 static VALUE \
-txt_attr_int_set_ ## name (self, val)\
-    VALUE self, val;\
+txt_attr_int_set_ ## name (VALUE self, VALUE val)\
 {\
     _SELF(self)->name = NUM2INT(val); \
     return self;\
@@ -31,14 +29,12 @@ txt_attr_int_set_ ## name (self, val)\
 
 #define ATTR_BOOL(name)\
 static VALUE \
-txt_attr_bool_ ## name (self)\
-    VALUE self;\
+txt_attr_bool_ ## name (VALUE self)\
 {\
     return CBOOL2RVAL(_SELF(self)->name);\
 }\
 static VALUE \
-txt_attr_bool_set_ ## name (self, val)\
-    VALUE self, val;\
+txt_attr_bool_set_ ## name (VALUE self, VALUE val)\
 {\
     _SELF(self)->name = RVAL2CBOOL(val);\
     return self;\
@@ -46,14 +42,12 @@ txt_attr_bool_set_ ## name (self, val)\
 
 #define ATTR_FLAGS(name, gtype)\
 static VALUE \
-txt_attr_flags_ ## name (self)\
-    VALUE self;\
+txt_attr_flags_ ## name (VALUE self)\
 {\
     return GFLAGS2RVAL(_SELF(self)->name, gtype);\
 }\
 static VALUE \
-txt_attr_flags_set_ ## name (self, val)\
-    VALUE self, val;\
+txt_attr_flags_set_ ## name (VALUE self, VALUE val)\
 {\
     _SELF(self)->name = RVAL2GFLAGS(val, gtype);\
     return self;\
@@ -61,14 +55,12 @@ txt_attr_flags_set_ ## name (self, val)\
 
 #define ATTR_ENUM(name, gtype)\
 static VALUE \
-txt_attr_enums_ ## name (self)\
-    VALUE self;\
+txt_attr_enums_ ## name (VALUE self)\
 {\
     return GENUM2RVAL(_SELF(self)->name, gtype);\
 }\
 static VALUE \
-txt_attr_enums_set_ ## name (self, val)\
-    VALUE self, val;\
+txt_attr_enums_set_ ## name (VALUE self, VALUE val)\
 {\
     _SELF(self)->name = RVAL2GENUM(val, gtype);\
     return self;\
@@ -76,8 +68,7 @@ txt_attr_enums_set_ ## name (self, val)\
 
 #define ATTR_BOXED(name, gtype)\
 static VALUE \
-txt_attr_boxed_ ## name (self)\
-    VALUE self;\
+txt_attr_boxed_ ## name (VALUE self)\
 {\
     VALUE val; \
     if (_SELF(self)->name == NULL) return Qnil;\
@@ -86,8 +77,7 @@ txt_attr_boxed_ ## name (self)\
     return val;\
 }\
 static VALUE \
-txt_attr_boxed_set_ ## name (self, val)\
-    VALUE self, val;\
+txt_attr_boxed_set_ ## name (VALUE self, VALUE val)\
 {\
     G_CHILD_SET(self, rb_intern(G_STRINGIFY(name)), val);\
     _SELF(self)->name = RVAL2BOXED(val, gtype);\
@@ -100,15 +90,13 @@ txt_attr_boxed_set_ ## name (self, val)\
 
 /***********************************************/
 static VALUE
-txt_attr_boxed_appearance(self)
-    VALUE self;
+txt_attr_boxed_appearance(VALUE self)
 {
     GtkTextAppearance app = _SELF(self)->appearance;
     return BOXED2RVAL(&app, GTK_TYPE_TEXT_APPEARANCE);
 }
 static VALUE
-txt_attr_boxed_set_appearance(self, val)
-    VALUE self, val;
+txt_attr_boxed_set_appearance(VALUE self, VALUE val)
 {
     GtkTextAppearance* app = (GtkTextAppearance*)RVAL2BOXED(val, GTK_TYPE_TEXT_APPEARANCE);
     _SELF(self)->appearance = *app;
@@ -120,14 +108,12 @@ ATTR_ENUM(direction, GTK_TYPE_DIRECTION_TYPE);
 ATTR_BOXED(font, PANGO_TYPE_FONT_DESCRIPTION);
 
 static VALUE
-txt_attr_double_font_scale(self)
-    VALUE self;
+txt_attr_double_font_scale(VALUE self)
 {
     return rb_float_new(_SELF(self)->font_scale);
 }
 static VALUE
-txt_attr_double_set_font_scale(self, val)
-    VALUE self, val;
+txt_attr_double_set_font_scale(VALUE self, VALUE val)
 {
     _SELF(self)->font_scale = NUM2DBL(val);
     return self;
@@ -153,8 +139,7 @@ ATTR_BOOL(realized);
 /***********************************************/
 
 static VALUE
-txt_attr_initialize(self)
-    VALUE self;
+txt_attr_initialize(VALUE self)
 {
     GtkTextAttributes *attr;
 
@@ -164,8 +149,7 @@ txt_attr_initialize(self)
 }
 
 static VALUE
-txt_attr_copy_values(self, dest)
-    VALUE self;
+txt_attr_copy_values(VALUE self, VALUE dest)
 {
     gtk_text_attributes_copy_values(_SELF(self), _SELF(dest));
     return self;