gtk2 0.90.7 → 0.90.8

data/ext/gtk2/rbgdkcolor.c

@@ -19,9 +19,7 @@
 VALUE rb_cGdkColor = Qnil;
 
 static VALUE
-gdkcolor_initialize(self, red, green, blue)
-    VALUE self;
-    VALUE red, green, blue;
+gdkcolor_initialize(VALUE self, VALUE red, VALUE green, VALUE blue)
 {
     GdkColor c;
     c.pixel = 0;
@@ -35,9 +33,7 @@ gdkcolor_initialize(self, red, green, blue)
 }
 
 static VALUE
-gdkcolor_s_parse(self, name)
-    VALUE self;
-    VALUE name;
+gdkcolor_s_parse(VALUE self, VALUE name)
 {
     GdkColor c;
     if (! gdk_color_parse(RVAL2CSTR(name), &c)) {
@@ -47,64 +43,53 @@ gdkcolor_s_parse(self, name)
 }
 
 static VALUE
-gdkcolor_pixel(self)
-    VALUE self;
+gdkcolor_pixel(VALUE self)
 {
     return INT2NUM(_SELF(self)->pixel);
 }
 
 static VALUE
-gdkcolor_red(self)
-    VALUE self;
+gdkcolor_red(VALUE self)
 {
 
     return INT2FIX(_SELF(self)->red);
 }
 
 static VALUE
-gdkcolor_set_red(self, red)
-    VALUE self;
-    VALUE red;
+gdkcolor_set_red(VALUE self, VALUE red)
 {
     _SELF(self)->red = NUM2INT(red);
     return self;
 }
 
 static VALUE
-gdkcolor_green(self)
-    VALUE self;
+gdkcolor_green(VALUE self)
 {
     return INT2FIX(_SELF(self)->green);
 }
 
 static VALUE
-gdkcolor_set_green(self, green)
-    VALUE self;
-    VALUE green;
+gdkcolor_set_green(VALUE self, VALUE green)
 {
     _SELF(self)->green = NUM2INT(green);
     return self;
 }
 
 static VALUE
-gdkcolor_blue(self)
-    VALUE self;
+gdkcolor_blue(VALUE self)
 {
     return INT2FIX(_SELF(self)->blue);
 }
 
 static VALUE
-gdkcolor_set_blue(self, blue)
-    VALUE self;
-    VALUE blue;
+gdkcolor_set_blue(VALUE self, VALUE blue)
 {
     _SELF(self)->blue = NUM2INT(blue);
     return self;
 }
 
 static VALUE
-gdkcolor_to_a(self)
-    VALUE self;
+gdkcolor_to_a(VALUE self)
 {
     GdkColor *c = _SELF(self);
     return rb_ary_new3(3, INT2FIX(c->red), 
@@ -112,8 +97,7 @@ gdkcolor_to_a(self)
 }
 
 static VALUE
-gdkcolor_equal(self, other)
-    VALUE self, other;
+gdkcolor_equal(VALUE self, VALUE other)
 {
     return CBOOL2RVAL(gdk_color_equal(_SELF(self), _SELF(other)));
 }

data/ext/gtk2/rbgdkcolormap.c

@@ -20,8 +20,7 @@
 #define _SELF(self) (GDK_COLORMAP(RVAL2GOBJ(self)))
 
 static VALUE
-gdkcmap_initialize(self, visual, allocate)
-    VALUE self, visual, allocate;
+gdkcmap_initialize(VALUE self, VALUE visual, VALUE allocate)
 {
     GdkColormap *cmap  = gdk_colormap_new(GDK_VISUAL(RVAL2GOBJ(visual)),
                                           RVAL2CBOOL(allocate));
@@ -30,8 +29,7 @@ gdkcmap_initialize(self, visual, allocate)
 }
 
 static VALUE
-gdkcmap_s_get_system(self)
-    VALUE self;
+gdkcmap_s_get_system(VALUE self)
 {
     return GOBJ2RVAL(gdk_colormap_get_system());
 }
@@ -48,8 +46,7 @@ gint        gdk_colormap_alloc_colors       (GdkColormap *colormap,
 */
 
 static VALUE
-gdkcmap_alloc_color(self, color, writeable, best_match)
-    VALUE self, color, writeable, best_match;
+gdkcmap_alloc_color(VALUE self, VALUE color, VALUE writeable, VALUE best_match)
 {
     gboolean result;
     GdkColor *c = RVAL2GDKCOLOR(color);
@@ -61,16 +58,14 @@ gdkcmap_alloc_color(self, color, writeable, best_match)
 /* Don't implement Gdk::Colormap#free_colors.
    Because it should be pair with Gdk::Colormap#alloc_colors */
 static VALUE
-gdkcmap_free_color(self, color)
-    VALUE self, color;
+gdkcmap_free_color(VALUE self, VALUE color)
 {
     gdk_colormap_free_colors(_SELF(self), RVAL2GDKCOLOR(color), 1);
     return self;
 }
 
 static VALUE
-gdkcmap_query_color(self, pixel)
-    VALUE self, pixel;
+gdkcmap_query_color(VALUE self, VALUE pixel)
 {
     GdkColor color;
     gdk_colormap_query_color(_SELF(self), NUM2ULONG(pixel), &color);
@@ -78,24 +73,21 @@ gdkcmap_query_color(self, pixel)
 }
 
 static VALUE
-gdkcmap_get_visual(self)
-    VALUE self;
+gdkcmap_get_visual(VALUE self)
 {
     return GOBJ2RVAL(gdk_colormap_get_visual(_SELF(self)));
 }
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-gdkcmap_get_screen(self)
-    VALUE self;
+gdkcmap_get_screen(VALUE self)
 {
     return GOBJ2RVAL(gdk_colormap_get_screen(_SELF(self)));
 }
 #endif
 
 static VALUE
-gdkcmap_colors(self)
-    VALUE self;
+gdkcmap_colors(VALUE self)
 {
     GdkColormap *cmap;
     GdkColor *colors;

data/ext/gtk2/rbgdkcursor.c

@@ -12,10 +12,7 @@
 #include "global.h"
 
 static VALUE
-gdkcursor_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+gdkcursor_initialize(int argc, VALUE *argv, VALUE self)
 {
     GdkCursor* cursor = NULL;
 
@@ -64,32 +61,28 @@ gdkcursor_initialize(argc, argv, self)
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-gdkcursor_get_display(self)
-    VALUE self;
+gdkcursor_get_display(VALUE self)
 {
     return GOBJ2RVAL(gdk_cursor_get_display((GdkCursor*)RVAL2BOXED(self, GDK_TYPE_CURSOR)));
 }
 #endif
 
 static VALUE
-gdkcursor_is_pixmap(self)
-    VALUE self;
+gdkcursor_is_pixmap(VALUE self)
 {
     return CBOOL2RVAL(((GdkCursor*)RVAL2BOXED(self, GDK_TYPE_COLOR))->type == 
                       GDK_CURSOR_IS_PIXMAP);
 }
 
 static VALUE
-gdkcursor_cursor_type(self)
-    VALUE self;
+gdkcursor_cursor_type(VALUE self)
 {
     return GENUM2RVAL(((GdkCursor*)RVAL2BOXED(self, GDK_TYPE_CURSOR))->type, GDK_TYPE_CURSOR_TYPE);
 }
 
 #if GTK_CHECK_VERSION(2,8,0)
 static VALUE
-gdkcursor_get_image(self)
-    VALUE self;
+gdkcursor_get_image(VALUE self)
 {
     return GOBJ2RVAL(gdk_cursor_get_image((GdkCursor*)RVAL2BOXED(self, GDK_TYPE_CURSOR)));
 }

data/ext/gtk2/rbgdkdevice.c

@@ -15,16 +15,14 @@
 
 /* Methods */
 static VALUE
-device_s_list(self)
-    VALUE self;
+device_s_list(VALUE self)
 {
     /* Owned by GDK */
     return GLIST2ARY(gdk_devices_list());
 }
 
 static VALUE
-device_s_set_extension_events(self, window, mask, mode)
-    VALUE self, window, mask, mode;
+device_s_set_extension_events(VALUE self, VALUE window, VALUE mask, VALUE mode)
 {
     gdk_input_set_extension_events(GDK_WINDOW(RVAL2GOBJ(window)),
                                    NUM2INT(mask), FIX2INT(mode));
@@ -33,23 +31,20 @@ device_s_set_extension_events(self, window, mask, mode)
 
 
 static VALUE
-device_set_source(self, source)
-    VALUE self, source;
+device_set_source(VALUE self, VALUE source)
 {
     gdk_device_set_source(_SELF(self), RVAL2GENUM(source, GDK_TYPE_INPUT_SOURCE));
     return self;
 }
 
 static VALUE
-device_set_mode(self, mode)
-    VALUE self, mode;
+device_set_mode(VALUE self, VALUE mode)
 {
     return CBOOL2RVAL(gdk_device_set_mode(_SELF(self), RVAL2GENUM(mode, GDK_TYPE_INPUT_MODE)));
 }
 
 static VALUE
-device_set_key(self, index, keyval, modifiers)
-    VALUE self, index, keyval, modifiers;
+device_set_key(VALUE self, VALUE index, VALUE keyval, VALUE modifiers)
 {
     gdk_device_set_key(_SELF(self), NUM2UINT(index), NUM2UINT(keyval),
                        RVAL2GFLAGS(modifiers, GDK_TYPE_MODIFIER_TYPE));
@@ -57,8 +52,7 @@ device_set_key(self, index, keyval, modifiers)
 }
 
 static VALUE
-device_set_axis_use(self, index, use)
-    VALUE self, index, use;
+device_set_axis_use(VALUE self, VALUE index, VALUE use)
 {
     gdk_device_set_axis_use(_SELF(self), NUM2UINT(index), 
                             RVAL2GENUM(use, GDK_TYPE_AXIS_USE));
@@ -66,15 +60,13 @@ device_set_axis_use(self, index, use)
 }
 
 static VALUE
-device_s_get_core_pointer(self)
-    VALUE self;
+device_s_get_core_pointer(VALUE self)
 {
     return GOBJ2RVAL(gdk_device_get_core_pointer());
 }
 
 static VALUE
-device_get_state(self, window)
-    VALUE self, window;
+device_get_state(VALUE self, VALUE window)
 {
     gdouble axes[2];
     GdkModifierType mask;
@@ -86,8 +78,7 @@ device_get_state(self, window)
 }
 
 static VALUE
-device_get_history(self, window, start, stop)
-    VALUE self, window, start, stop;
+device_get_history(VALUE self, VALUE window, VALUE start, VALUE stop)
 {
     gboolean ret;
     GdkTimeCoord** events;
@@ -108,8 +99,7 @@ device_get_history(self, window, start, stop)
 }
 
 static VALUE
-device_get_axis(self, axes, use)
-    VALUE self, axes, use;
+device_get_axis(VALUE self, VALUE axes, VALUE use)
 {
     gdouble value;
     gboolean ret;
@@ -133,36 +123,31 @@ device_get_axis(self, axes, use)
 
 /* Accessor */
 static VALUE
-device_name(self)
-    VALUE self;
+device_name(VALUE self)
 {
     return CSTR2RVAL(_SELF(self)->name);
 }
 
 static VALUE
-device_source(self)
-    VALUE self;
+device_source(VALUE self)
 {
     return GENUM2RVAL(_SELF(self)->source, GDK_TYPE_INPUT_SOURCE);
 }
 
 static VALUE
-device_mode(self)
-    VALUE self;
+device_mode(VALUE self)
 {
     return GENUM2RVAL(_SELF(self)->mode, GDK_TYPE_INPUT_MODE);
 }
 
 static VALUE
-device_has_cursor(self)
-    VALUE self;
+device_has_cursor(VALUE self)
 {
     return CBOOL2RVAL(_SELF(self)->has_cursor);
 }
 
 static VALUE
-device_axes(self)
-    VALUE self;
+device_axes(VALUE self)
 {
     gint i;
     VALUE ary = rb_ary_new();
@@ -176,8 +161,7 @@ device_axes(self)
 }
 
 static VALUE
-device_keys(self)
-    VALUE self;
+device_keys(VALUE self)
 {
     gint i;
     VALUE ary = rb_ary_new();

data/ext/gtk2/rbgdkdisplay.c

@@ -16,16 +16,14 @@
 
 
 static VALUE
-gdkdisplay_close(self)
-    VALUE self;
+gdkdisplay_close(VALUE self)
 {
     gdk_display_close(_SELF(self));
     return self;
 }
 
 static VALUE
-gdkdisplay_s_open(self, display_name)
-    VALUE self, display_name;
+gdkdisplay_s_open(VALUE self, VALUE display_name)
 {
     GdkDisplay* gdisplay = gdk_display_open(RVAL2CSTR(display_name));
     if (! gdisplay) {
@@ -46,8 +44,7 @@ gdkdisplay_s_open(self, display_name)
 }
 
 static VALUE
-gdkdisplay_s_get_default(self)
-    VALUE self;
+gdkdisplay_s_get_default(VALUE self)
 {
     GdkDisplay* gdisplay = gdk_display_get_default();
      if (! gdisplay)
@@ -58,67 +55,58 @@ gdkdisplay_s_get_default(self)
 
 
 static VALUE
-gdkdisplay_name(self)
-    VALUE self;
+gdkdisplay_name(VALUE self)
 {
     return CSTR2RVAL(gdk_display_get_name(_SELF(self)));
 }
 
 static VALUE
-gdkdisplay_n_screens(self)
-    VALUE self;
+gdkdisplay_n_screens(VALUE self)
 {
     return INT2NUM(gdk_display_get_n_screens(_SELF(self)));
 }
 
 static VALUE
-gdkdisplay_get_screen(self, num)
-    VALUE self, num;
+gdkdisplay_get_screen(VALUE self, VALUE num)
 {
     return GOBJ2RVAL(gdk_display_get_screen(_SELF(self), NUM2INT(num)));
 }
 
 static VALUE
-gdkdisplay_default_screen(self)
-    VALUE self;
+gdkdisplay_default_screen(VALUE self)
 {
     return GOBJ2RVAL(gdk_display_get_default_screen(_SELF(self)));
 }
 
 static VALUE
-gdkdisplay_pointer_ungrab(self, time)
-    VALUE self, time;
+gdkdisplay_pointer_ungrab(VALUE self, VALUE time)
 {
     gdk_display_pointer_ungrab(_SELF(self), NUM2ULONG(time));
     return self;
 }
 
 static VALUE
-gdkdisplay_keyboard_ungrab(self, time)
-    VALUE self, time;
+gdkdisplay_keyboard_ungrab(VALUE self, VALUE time)
 {
     gdk_display_keyboard_ungrab(_SELF(self), NUM2ULONG(time));
     return self;
 }
 
 static VALUE
-gdkdisplay_pointer_grabbed(self)
-    VALUE self;
+gdkdisplay_pointer_grabbed(VALUE self)
 {
     return CBOOL2RVAL(gdk_display_pointer_is_grabbed(_SELF(self)));
 }
 
 static VALUE
-gdkdisplay_beep(self)
-    VALUE self;
+gdkdisplay_beep(VALUE self)
 {
     gdk_display_beep(_SELF(self));
     return self;
 }
 
 static VALUE
-gdkdisplay_sync(self)
-    VALUE self;
+gdkdisplay_sync(VALUE self)
 {
     gdk_display_sync(_SELF(self));
     return self;
@@ -126,8 +114,7 @@ gdkdisplay_sync(self)
 
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-gdkdisplay_flush(self)
-    VALUE self;
+gdkdisplay_flush(VALUE self)
 {
     gdk_display_flush(_SELF(self));
     return self;
@@ -135,29 +122,25 @@ gdkdisplay_flush(self)
 #endif
 
 static VALUE
-gdkdisplay_list_devices(self)
-    VALUE self;
+gdkdisplay_list_devices(VALUE self)
 {
     return rbgutil_glist2ary(gdk_display_list_devices(_SELF(self)));
 }
 
 static VALUE
-gdkdisplay_get_event(self)
-    VALUE self;
+gdkdisplay_get_event(VALUE self)
 {
     return GEV2RVAL(gdk_display_get_event(_SELF(self)));
 }
 
 static VALUE
-gdkdisplay_peek_event(self)
-    VALUE self;
+gdkdisplay_peek_event(VALUE self)
 {
     return GEV2RVAL(gdk_display_peek_event(_SELF(self)));
 }
 
 static VALUE
-gdkdisplay_put_event(self, event)
-    VALUE self, event;
+gdkdisplay_put_event(VALUE self, VALUE event)
 {
     gdk_display_put_event(_SELF(self), RVAL2GEV(event));
     return self;
@@ -165,10 +148,7 @@ gdkdisplay_put_event(self, event)
 
 /* Don't implement this.
 static GdkFilterReturn
-filter_func(xevent, event, func)
-    GdkXEvent xevent;
-    GdkEvent event;
-    gpointer func;
+filter_func(GdkXEvent xevent, GdkEvent event, gpointer func)
 {
     return GENUM2RVAL(rb_funcall((VALUE)func, id_call, 2, 
                                  ????, GEV2RVAL(event)), 
@@ -176,8 +156,7 @@ filter_func(xevent, event, func)
 }
 
 static VALUE
-gdkdisplay_add_client_message_filter(self, message_type)
-    VALUE self, message_type;
+gdkdisplay_add_client_message_filter(VALUE self, VALUE message_type)
 {
     VALUE func = RB_BLOCK_PROC();
     G_RELATIVE(self, func);
@@ -188,23 +167,20 @@ gdkdisplay_add_client_message_filter(self, message_type)
 */
 
 static VALUE
-gdkdisplay_set_double_click_time(self, msec)
-    VALUE self, msec;
+gdkdisplay_set_double_click_time(VALUE self, VALUE msec)
 {
     gdk_display_set_double_click_time(_SELF(self), NUM2UINT(msec));
     return self;
 }
 
 static VALUE
-gdkdisplay_get_double_click_time(self)
-    VALUE self;
+gdkdisplay_get_double_click_time(VALUE self)
 {
     return UINT2NUM(_SELF(self)->double_click_time);
 }
 
 static VALUE
-gdkdisplay_get_button_click_time(self)
-    VALUE self;
+gdkdisplay_get_button_click_time(VALUE self)
 {
     return rb_ary_new3(2,
                        UINT2NUM(_SELF(self)->button_click_time[0]),
@@ -212,8 +188,7 @@ gdkdisplay_get_button_click_time(self)
 }
 
 static VALUE
-gdkdisplay_get_button_window(self)
-    VALUE self;
+gdkdisplay_get_button_window(VALUE self)
 {
     return rb_ary_new3(2,
                        GOBJ2RVAL(_SELF(self)->button_window[0]),
@@ -221,8 +196,7 @@ gdkdisplay_get_button_window(self)
 }
 
 static VALUE
-gdkdisplay_get_button_number(self)
-    VALUE self;
+gdkdisplay_get_button_number(VALUE self)
 {
     return rb_ary_new3(2,
                        INT2NUM(_SELF(self)->button_number[0]),
@@ -230,16 +204,14 @@ gdkdisplay_get_button_number(self)
 }
 
 static VALUE
-gdkdisplay_get_closed(self)
-    VALUE self;
+gdkdisplay_get_closed(VALUE self)
 {
     return CBOOL2RVAL(_SELF(self)->closed);
 }
 
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-gdkdisplay_get_button_x(self)
-    VALUE self;
+gdkdisplay_get_button_x(VALUE self)
 {
     return rb_ary_new3(2,
                        INT2NUM(_SELF(self)->button_x[0]),
@@ -247,8 +219,7 @@ gdkdisplay_get_button_x(self)
 }
 
 static VALUE
-gdkdisplay_get_button_y(self)
-    VALUE self;
+gdkdisplay_get_button_y(VALUE self)
 {
     return rb_ary_new3(2,
                        INT2NUM(_SELF(self)->button_y[0]),
@@ -256,24 +227,21 @@ gdkdisplay_get_button_y(self)
 }
 
 static VALUE
-gdkdisplay_set_double_click_distance(self, distance)
-    VALUE self, distance;
+gdkdisplay_set_double_click_distance(VALUE self, VALUE distance)
 {
     gdk_display_set_double_click_distance(_SELF(self), NUM2UINT(distance));
     return self;
 }
 
 static VALUE
-gdkdisplay_get_double_click_distance(self, distance)
-    VALUE self;
+gdkdisplay_get_double_click_distance(VALUE self)
 {
     return UINT2NUM(_SELF(self)->double_click_distance);
 }
 #endif
 
 static VALUE
-gdkdisplay_get_pointer(self)
-    VALUE self;
+gdkdisplay_get_pointer(VALUE self)
 {
     GdkScreen *screen;
     int x,y;
@@ -284,8 +252,7 @@ gdkdisplay_get_pointer(self)
     return rb_ary_new3(4, GOBJ2RVAL(screen), INT2NUM(x), INT2NUM(y), INT2NUM(mask));
 }
 static VALUE
-gdkdisplay_get_window_at_pointer(self)
-    VALUE self;
+gdkdisplay_get_window_at_pointer(VALUE self)
 {
     GdkWindow *window;
     int x,y;
@@ -303,29 +270,25 @@ GdkDisplayPointerHooks* gdk_display_set_pointer_hooks
 
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-gdkdisplay_supports_cursor_color(self)
-    VALUE self;
+gdkdisplay_supports_cursor_color(VALUE self)
 {
     return CBOOL2RVAL(gdk_display_supports_cursor_color(_SELF(self)));
 }
 
 static VALUE
-gdkdisplay_supports_cursor_alpha(self)
-    VALUE self;
+gdkdisplay_supports_cursor_alpha(VALUE self)
 {
     return CBOOL2RVAL(gdk_display_supports_cursor_alpha(_SELF(self)));
 }
 
 static VALUE
-gdkdisplay_get_default_cursor_size(self)
-    VALUE self;
+gdkdisplay_get_default_cursor_size(VALUE self)
 {
     return UINT2NUM(gdk_display_get_default_cursor_size(_SELF(self)));
 }
 
 static VALUE
-gdkdisplay_get_maximal_cursor_size(self)
-    VALUE self;
+gdkdisplay_get_maximal_cursor_size(VALUE self)
 {
     guint width, height;
     gdk_display_get_maximal_cursor_size(_SELF(self), &width, &height);
@@ -333,8 +296,7 @@ gdkdisplay_get_maximal_cursor_size(self)
 }
 
 static VALUE
-gdkdisplay_get_default_group(self)
-    VALUE self;
+gdkdisplay_get_default_group(VALUE self)
 {
     return GOBJ2RVAL(gdk_display_get_default_group(_SELF(self)));
 }
@@ -342,30 +304,26 @@ gdkdisplay_get_default_group(self)
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-gdkdisplay_supports_selection_notification(self)
-    VALUE self;
+gdkdisplay_supports_selection_notification(VALUE self)
 {
     return CBOOL2RVAL(gdk_display_supports_selection_notification(_SELF(self)));
 }
 
 static VALUE
-gdkdisplay_request_selection_notification(self, selection)
-    VALUE self, selection;
+gdkdisplay_request_selection_notification(VALUE self, VALUE selection)
 {
     return CBOOL2RVAL(gdk_display_request_selection_notification(_SELF(self), 
                                                                  RVAL2ATOM(selection)));
 }
 
 static VALUE
-gdkdisplay_supports_clipboard_persistence(self)
-    VALUE self;
+gdkdisplay_supports_clipboard_persistence(VALUE self)
 {
     return CBOOL2RVAL(gdk_display_supports_clipboard_persistence(_SELF(self)));
 }
 
 static VALUE
-gdkdisplay_store_clipboard(self, clipboard_window, time_, targets)
-    VALUE self, clipboard_window, time_, targets;
+gdkdisplay_store_clipboard(VALUE self, VALUE clipboard_window, VALUE time_, VALUE targets)
 {
     gint i;
     gint n_targets = RARRAY_LEN(targets);
@@ -382,16 +340,14 @@ gdkdisplay_store_clipboard(self, clipboard_window, time_, targets)
 #endif
 
 static VALUE
-gdkdisplay_get_core_pointer(self)
-    VALUE self;
+gdkdisplay_get_core_pointer(VALUE self)
 {
     return GOBJ2RVAL(gdk_display_get_core_pointer(_SELF(self)));
 }
 
 #if GTK_CHECK_VERSION(2,8,0)
 static VALUE
-gdkdisplay_warp_pointer(self, screen, x, y)
-    VALUE self, screen, x, y;
+gdkdisplay_warp_pointer(VALUE self, VALUE screen, VALUE x, VALUE y)
 {
     gdk_display_warp_pointer(_SELF(self), RVAL2GOBJ(screen), NUM2INT(x), NUM2INT(y));
     return self;
@@ -400,23 +356,20 @@ gdkdisplay_warp_pointer(self, screen, x, y)
 
 #ifdef GDK_WINDOWING_X11
 static VALUE
-gdkdisplay_grab(self)
-    VALUE self;
+gdkdisplay_grab(VALUE self)
 {
     gdk_x11_display_grab(_SELF(self));
     return self;
 }
 static VALUE
-gdkdisplay_ungrab(self)
-    VALUE self;
+gdkdisplay_ungrab(VALUE self)
 {
     gdk_x11_display_ungrab(_SELF(self));
     return self;
 }
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-gdkdisplay_register_standard_event_type(self, event_base, n_events)
-    VALUE self, event_base, n_events;
+gdkdisplay_register_standard_event_type(VALUE self, VALUE event_base, VALUE n_events)
 {
     gdk_x11_register_standard_event_type(_SELF(self),
                                          NUM2INT(event_base), NUM2INT(n_events));
@@ -425,15 +378,13 @@ gdkdisplay_register_standard_event_type(self, event_base, n_events)
 #endif
 #if GTK_CHECK_VERSION(2,8,0)
 static VALUE
-gdkdisplay_get_user_time(self)
-    VALUE self;
+gdkdisplay_get_user_time(VALUE self)
 {
     return UINT2NUM(gdk_x11_display_get_user_time(_SELF(self)));
 }
 
 static VALUE
-gdkdisplay_set_cursor_theme(self, theme, size)
-    VALUE self, theme, size;
+gdkdisplay_set_cursor_theme(VALUE self, VALUE theme, VALUE size)
 {
     gdk_x11_display_set_cursor_theme(_SELF(self), RVAL2CSTR(theme), NUM2INT(size));
     return self;
@@ -510,15 +461,13 @@ gdkdisplay_get_startup_notification_id(VALUE self)
 
 #if GTK_CHECK_VERSION(2,10,0)
 static VALUE
-gdkdisplay_supports_shapes(self)
-    VALUE self;
+gdkdisplay_supports_shapes(VALUE self)
 {
     return CBOOL2RVAL(gdk_display_supports_shapes(_SELF(self)));
 }
 
 static VALUE
-gdkdisplay_supports_input_shapes(self)
-    VALUE self;
+gdkdisplay_supports_input_shapes(VALUE self)
 {
     return CBOOL2RVAL(gdk_display_supports_input_shapes(_SELF(self)));
 }