gtk2 0.90.7 → 0.90.8

data/ext/gtk2/rbgdkwindowattr.c

@@ -51,14 +51,12 @@ attr_initialize(VALUE self, VALUE width, VALUE height, VALUE wclass,
 
 #define ATTR_STR(name)\
 static VALUE \
-attr_get_ ## name (self)\
-    VALUE self;\
+attr_get_ ## name (VALUE self)\
 {\
     return CSTR2RVAL(_SELF(self)->name);\
 }\
 static VALUE \
-attr_set_ ## name (self, val)\
-    VALUE self, val;\
+attr_set_ ## name (VALUE self, VALUE val)\
 {\
     _SELF(self)->name = RVAL2CSTR(val);\
     return self;\
@@ -66,14 +64,12 @@ attr_set_ ## name (self, val)\
 
 #define ATTR_INT(name)\
 static VALUE \
-attr_get_ ## name (self)\
-    VALUE self;\
+attr_get_ ## name (VALUE self)\
 {\
     return INT2NUM(_SELF(self)->name);\
 }\
 static VALUE \
-attr_set_ ## name (self, val)\
-    VALUE self, val;\
+attr_set_ ## name (VALUE self, VALUE val)\
 {\
     _SELF(self)->name = NUM2INT(val);\
     return self;\
@@ -87,70 +83,60 @@ ATTR_INT(width);
 ATTR_INT(height);
 
 static VALUE
-attr_get_wclass(self)
-    VALUE self;
+attr_get_wclass(VALUE self)
 {
     return GENUM2RVAL(_SELF(self)->wclass, GDK_TYPE_WINDOW_CLASS);
 }
 static VALUE
-attr_set_wclass(self, val)
-    VALUE self, val;
+attr_set_wclass(VALUE self, VALUE val)
 {
     _SELF(self)->wclass = RVAL2GENUM(val, GDK_TYPE_WINDOW_CLASS);
     return self;
 }
 
 static VALUE
-attr_get_visual(self)
-    VALUE self;
+attr_get_visual(VALUE self)
 {
     return GOBJ2RVAL(_SELF(self)->visual);
 }
 static VALUE
-attr_set_visual(self, val)
-    VALUE self, val;
+attr_set_visual(VALUE self, VALUE val)
 {
     _SELF(self)->visual = GDK_VISUAL(RVAL2GOBJ(val));
     return self;
 }
 
 static VALUE
-attr_get_colormap(self)
-    VALUE self;
+attr_get_colormap(VALUE self)
 {
     return GOBJ2RVAL(_SELF(self)->colormap);
 }
 static VALUE
-attr_set_colormap(self, val)
-    VALUE self, val;
+attr_set_colormap(VALUE self, VALUE val)
 {
     _SELF(self)->colormap = GDK_COLORMAP(RVAL2GOBJ(val));
     return self;
 }
 
 static VALUE
-attr_get_window_type(self)
-    VALUE self;
+attr_get_window_type(VALUE self)
 {
     return GENUM2RVAL(_SELF(self)->window_type, GDK_TYPE_WINDOW_TYPE);
 }
 static VALUE
-attr_set_window_type(self, val)
-    VALUE self, val;
+attr_set_window_type(VALUE self, VALUE val)
 {
     _SELF(self)->window_type = RVAL2GENUM(val, GDK_TYPE_WINDOW_TYPE);
     return self;
 }
 
 static VALUE
-attr_get_cursor(self)
-    VALUE self;
+attr_get_cursor(VALUE self)
 {
     return BOXED2RVAL(_SELF(self)->cursor, GDK_TYPE_CURSOR);
 }
 static VALUE
-attr_set_cursor(self, val)
-    VALUE self, val;
+attr_set_cursor(VALUE self, VALUE val)
 {
     _SELF(self)->cursor = (GdkCursor*)(RVAL2BOXED(val, GDK_TYPE_CURSOR));
     return self;
@@ -160,14 +146,12 @@ ATTR_STR(wmclass_name);
 ATTR_STR(wmclass_class);
 
 static VALUE
-attr_get_override_redirect(self)
-    VALUE self;
+attr_get_override_redirect(VALUE self)
 {
     return CBOOL2RVAL(_SELF(self)->override_redirect);
 }
 static VALUE
-attr_set_override_redirect(self, val)
-    VALUE self, val;
+attr_set_override_redirect(VALUE self, VALUE val)
 {
     _SELF(self)->override_redirect = RVAL2CBOOL(val);
     return self;

data/ext/gtk2/rbgdkx11.c

@@ -77,10 +77,7 @@ GdkWindow*  gdk_window_foreign_new_for_display
 */
 
 static VALUE
-rbx11_xid_table_lookup(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+rbx11_xid_table_lookup(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg[2];
     GdkPixmap* win = NULL;
@@ -130,8 +127,7 @@ guint32     gdk_x11_get_server_time         (GdkWindow *window);
 */
 
 static VALUE
-rbx11_net_wm_supports(self, property)
-    VALUE self, property;
+rbx11_net_wm_supports(VALUE self, VALUE property)
 {
     return CBOOL2RVAL(gdk_net_wm_supports(RVAL2ATOM(property)));
 }
@@ -182,8 +178,7 @@ Window      gdk_x11_get_default_root_xwindow
 */
 
 static VALUE
-rbx11_get_default_screen(self)
-    VALUE self;
+rbx11_get_default_screen(VALUE self)
 {
     return INT2NUM(gdk_x11_get_default_screen());
 }
@@ -192,8 +187,7 @@ Display*    gdk_x11_get_default_xdisplay    (void);
 */
 
 static VALUE
-rbx11_grab_server(self)
-    VALUE self;
+rbx11_grab_server(VALUE self)
 {
     gdk_x11_grab_server();
     return Qnil;
@@ -211,8 +205,7 @@ Screen*     gdk_x11_screen_get_xscreen      (GdkScreen *screen);
 */
 
 static VALUE
-rbx11_ungrab_server(self)
-    VALUE self;
+rbx11_ungrab_server(VALUE self)
 {
     gdk_x11_ungrab_server();
     return Qnil;

data/ext/gtk2/rbgtk.c

@@ -26,15 +26,17 @@ static ID id__windows__;
 static void
 remove_from_windows(GtkWidget *window, VALUE obj)
 {
-    VALUE klass;
+    VALUE klass, windows;
+
     klass = rb_obj_class(obj);
-    rb_hash_delete(rb_ivar_get(klass, id__windows__), obj);
+    windows = rb_ivar_get(klass, id__windows__);
+    if (!NIL_P(windows)) {
+        rb_hash_delete(windows, obj);
+    }
 }
 
 void
-rbgtk_initialize_gtkobject(obj, gtkobj)
-    VALUE obj;
-    GtkObject *gtkobj;
+rbgtk_initialize_gtkobject(VALUE obj, GtkObject *gtkobj)
 {
     gtkobj = g_object_ref(gtkobj);
     gtk_object_sink(gtkobj);
@@ -54,9 +56,7 @@ rbgtk_initialize_gtkobject(obj, gtkobj)
 }
 
 void
-exec_callback(widget, proc)
-    GtkWidget *widget;
-    gpointer proc;
+exec_callback(GtkWidget *widget, gpointer proc)
 {
     rb_funcall((VALUE)proc, id_call, 1, GOBJ2RVAL(widget));
 }
@@ -70,8 +70,7 @@ exec_callback(widget, proc)
 #define USE_POLL_FUNC
 
 static VALUE
-gtk_m_events_pending(self)
-    VALUE self;
+gtk_m_events_pending(VALUE self)
 {
    return CBOOL2RVAL(gtk_events_pending());
 }

data/ext/gtk2/rbgtkaboutdialog.c

@@ -16,8 +16,7 @@
 #define _SELF(self) (GTK_ABOUT_DIALOG(RVAL2GOBJ(self)))
 
 static VALUE
-aboutdialog_initialize(self)
-    VALUE self;
+aboutdialog_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_about_dialog_new());
     return Qnil;
@@ -81,17 +80,13 @@ void        gtk_about_dialog_set_wrap_license
 */
 
 static void
-activate_link_func(about, link, func)
-    GtkAboutDialog* about;
-    const gchar* link;
-    gpointer func;
+activate_link_func(GtkAboutDialog *about, const gchar *link, gpointer func)
 {
     rb_funcall((VALUE)func, id_call, 2, GOBJ2RVAL(about), CSTR2RVAL(link));
 }
 
 static VALUE
-aboutdialog_s_set_email_hook(self)
-    VALUE self;
+aboutdialog_s_set_email_hook(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -100,8 +95,7 @@ aboutdialog_s_set_email_hook(self)
 }
 
 static VALUE
-aboutdialog_s_set_url_hook(self)
-    VALUE self;
+aboutdialog_s_set_url_hook(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -118,8 +112,7 @@ typedef struct {
 #define ABOUT_PROP_NUM (15)
 
 static VALUE
-aboutdialog_s_show_about_dialog(self, parent, props)
-    VALUE self, parent, props;
+aboutdialog_s_show_about_dialog(VALUE self, VALUE parent, VALUE props)
 {
     int i;
     VALUE ary;

data/ext/gtk2/rbgtkaccelerator.c

@@ -13,15 +13,13 @@
 #define RVAL2MOD(mods) RVAL2GFLAGS(mods, GDK_TYPE_MODIFIER_TYPE)
 
 static VALUE
-accel_valid(self, keyval, modifiers)
-    VALUE self, keyval, modifiers;
+accel_valid(VALUE self, VALUE keyval, VALUE modifiers)
 {
     return CBOOL2RVAL(gtk_accelerator_valid(NUM2UINT(keyval), RVAL2MOD(modifiers)));
 }
 
 static VALUE
-accel_parse(self, accelerator)
-    VALUE self, accelerator;
+accel_parse(VALUE self, VALUE accelerator)
 {
     guint key;
     GdkModifierType mods;
@@ -30,32 +28,28 @@ accel_parse(self, accelerator)
 }
 
 static VALUE
-accel_name(self, key, mods)
-    VALUE self, key, mods;
+accel_name(VALUE self, VALUE key, VALUE mods)
 {
     return CSTR2RVAL(gtk_accelerator_name(NUM2UINT(key), RVAL2MOD(mods)));
 }
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-accel_get_label(self, key, mods)
-    VALUE self, key, mods;
+accel_get_label(VALUE self, VALUE key, VALUE mods)
 {
     return CSTR2RVAL(gtk_accelerator_get_label(NUM2UINT(key), RVAL2MOD(mods)));
 }
 #endif
 
 static VALUE
-accel_set_default_mod_mask(self, default_mod_mask)
-    VALUE self, default_mod_mask;
+accel_set_default_mod_mask(VALUE self, VALUE default_mod_mask)
 {
     gtk_accelerator_set_default_mod_mask(RVAL2MOD(default_mod_mask));
     return self;
 }
 
 static VALUE
-accel_get_default_mod_mask(self)
-    VALUE self;
+accel_get_default_mod_mask(VALUE self)
 {
     return GFLAGS2RVAL(gtk_accelerator_get_default_mod_mask(), GDK_TYPE_MODIFIER_TYPE);
 }

data/ext/gtk2/rbgtkaccelgroup.c

@@ -18,18 +18,14 @@
 #define RVAL2MOD(mods) (NIL_P(mods) ? 0 : RVAL2GFLAGS(mods, GDK_TYPE_MODIFIER_TYPE))
 
 static VALUE
-gaccelgrp_initialize(self)
-    VALUE self;
+gaccelgrp_initialize(VALUE self)
 {
     G_INITIALIZE(self, gtk_accel_group_new());
     return Qnil;
 }
 
 static VALUE
-gaccelgrp_connect(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+gaccelgrp_connect(int argc, VALUE *argv, VALUE self)
 {
     VALUE key, mods, flags, path, closure;
     GClosure *rclosure;
@@ -60,16 +56,14 @@ gaccelgrp_connect(argc, argv, self)
 }
 
 static VALUE
-gaccelgrp_disconnect_key(self, key, mods)
-    VALUE self, key, mods;
+gaccelgrp_disconnect_key(VALUE self, VALUE key, VALUE mods)
 {
     return CBOOL2RVAL(gtk_accel_group_disconnect_key(_SELF(self), NUM2UINT(key),
                                                      RVAL2MOD(mods)));
 }
 
 static VALUE
-gaccelgrp_query(self, key, mods)
-    VALUE self, key, mods;
+gaccelgrp_query(VALUE self, VALUE key, VALUE mods)
 {
     GtkAccelGroupEntry *entries;
     guint n_entries;
@@ -90,16 +84,14 @@ gaccelgrp_query(self, key, mods)
 }
 
 static VALUE
-gaccelgrp_disconnect(self, closure)
-    VALUE self, closure;
+gaccelgrp_disconnect(VALUE self, VALUE closure)
 {
     return CBOOL2RVAL(gtk_accel_group_disconnect(_SELF(self),
                                                  (GClosure*)RVAL2BOXED(closure, G_TYPE_CLOSURE)));
 }
 
 static VALUE
-gaccelgrp_s_from_accel_closure(self, closure)
-    VALUE self, closure;
+gaccelgrp_s_from_accel_closure(VALUE self, VALUE closure)
 {
     return GOBJ2RVAL(gtk_accel_group_from_accel_closure(
                          (GClosure*)RVAL2BOXED(closure, G_TYPE_CLOSURE)));
@@ -107,10 +99,7 @@ gaccelgrp_s_from_accel_closure(self, closure)
 
 #if GTK_CHECK_VERSION(2,2,0)
 static gboolean
-gaccelgrp_find_func(key, closure, func)
-    GtkAccelKey *key;
-    GClosure *closure;
-    gpointer func;
+gaccelgrp_find_func(GtkAccelKey *key, GClosure *closure, gpointer func)
 {
     return RVAL2CBOOL(rb_funcall((VALUE)func, id_call, 2,
                             BOXED2RVAL(key, GTK_TYPE_ACCEL_KEY),
@@ -118,8 +107,7 @@ gaccelgrp_find_func(key, closure, func)
 }
 
 static VALUE
-gaccelgrp_find(self)
-    VALUE self;
+gaccelgrp_find(VALUE self)
 {
     GtkAccelKey *result;
     volatile VALUE func = rb_block_proc();
@@ -133,8 +121,7 @@ gaccelgrp_find(self)
 
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-gaccelgrp_activate(self, accel_quark, acceleratable, accel_key, accel_mods)
-    VALUE self, accel_quark, acceleratable, accel_key, accel_mods;
+gaccelgrp_activate(VALUE self, VALUE accel_quark, VALUE acceleratable, VALUE accel_key, VALUE accel_mods)
 {
     GQuark quark = 0;
     if (TYPE(accel_quark) == T_STRING){
@@ -148,16 +135,14 @@ gaccelgrp_activate(self, accel_quark, acceleratable, accel_key, accel_mods)
 #endif
 
 static VALUE
-_gaccelgrp_lock_ensure(self)
-    VALUE self;
+_gaccelgrp_lock_ensure(VALUE self)
 {
     gtk_accel_group_unlock(_SELF(self));
     return Qnil;
 }
 
 static VALUE
-gaccelgrp_lock(self)
-    VALUE self;
+gaccelgrp_lock(VALUE self)
 {
     gtk_accel_group_lock(_SELF(self));
     if (rb_block_given_p()){
@@ -167,8 +152,7 @@ gaccelgrp_lock(self)
 }
 
 static VALUE
-gaccelgrp_unlock(self)
-    VALUE self;
+gaccelgrp_unlock(VALUE self)
 {
     gtk_accel_group_unlock(_SELF(self));
     return self;
@@ -176,8 +160,7 @@ gaccelgrp_unlock(self)
 
 
 static VALUE
-gaccelgrp_s_activate(self, obj, key, modtype)
-    VALUE self, obj, key, modtype;
+gaccelgrp_s_activate(VALUE self, VALUE obj, VALUE key, VALUE modtype)
 {
     return CBOOL2RVAL(gtk_accel_groups_activate(G_OBJECT(RVAL2GOBJ(obj)),
                                                 NUM2UINT(key),
@@ -185,8 +168,7 @@ gaccelgrp_s_activate(self, obj, key, modtype)
 }
 
 static VALUE
-gaccelgrp_s_from_object(self, object)
-    VALUE self, object;
+gaccelgrp_s_from_object(VALUE self, VALUE object)
 {
     /* Owned by GTK+ */
     return GSLIST2ARY(gtk_accel_groups_from_object(RVAL2GOBJ(object)));