gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtkaccelgroupentry.c

@@ -1,18 +1,30 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkaccelgroupentry.c -
-
-  $Author: sakai $
-  $Date: 2003/02/17 11:29:20 $
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 OGASAWARA, Takeshi
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
-  Copyright (C) 2002,2003 OGASAWARA, Takeshi
-************************************************/
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE cAccelGroupEntry
 #define _SELF(s) ((GtkAccelGroupEntry*)RVAL2BOXED(s, GTK_TYPE_ACCEL_GROUP_ENTRY))
 
-static GtkAccelGroupEntry*
+static GtkAccelGroupEntry *
 agentry_copy(const GtkAccelGroupEntry *agentry)
 {
     GtkAccelGroupEntry *new_agentry;
@@ -23,7 +35,7 @@ agentry_copy(const GtkAccelGroupEntry *agentry)
 }
 
 GType
-gtk_accel_group_entry_get_type()
+gtk_accel_group_entry_get_type(void)
 {
     static GType our_type = 0;
     if(our_type == 0)
@@ -42,7 +54,7 @@ struct _GtkAccelGroupEntry
 };
 */
 static VALUE
-agentry_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     GtkAccelGroupEntry key;
     G_INITIALIZE(self, &key);
@@ -50,32 +62,32 @@ agentry_initialize(VALUE self)
 }
 
 static VALUE
-agentry_get_accel_key(VALUE self)
+rg_accel_key(VALUE self)
 {
     return BOXED2RVAL(&_SELF(self)->key, GTK_TYPE_ACCEL_KEY);
 }
 
 static VALUE
-agentry_get_closure(VALUE self)
+rg_closure(VALUE self)
 {
     return BOXED2RVAL(_SELF(self)->closure, G_TYPE_CLOSURE);
 }
 
 static VALUE
-agentry_get_accel_path(VALUE self)
+rg_accel_path(VALUE self)
 {
     const gchar *quark_str = g_quark_to_string(_SELF(self)->accel_path_quark);
     return quark_str ? CSTR2RVAL(quark_str) : Qnil;
 }
 
 void
-Init_agentry()
+Init_gtk_accel_group_entry(VALUE mGtk)
 {
-    VALUE gAccelGroupEntry = G_DEF_CLASS(GTK_TYPE_ACCEL_GROUP_ENTRY, "AccelGroupEntry", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ACCEL_GROUP_ENTRY, "AccelGroupEntry", mGtk);
 
-    rb_define_method(gAccelGroupEntry, "initialize", agentry_initialize, 0);
+    RG_DEF_METHOD(initialize, 0);
 
-    rb_define_method(gAccelGroupEntry, "accel_key", agentry_get_accel_key, 0);
-    rb_define_method(gAccelGroupEntry, "closure", agentry_get_closure, 0);
-    rb_define_method(gAccelGroupEntry, "accel_path", agentry_get_accel_path, 0);
+    RG_DEF_METHOD(accel_key, 0);
+    RG_DEF_METHOD(closure, 0);
+    RG_DEF_METHOD(accel_path, 0);
 }

data/ext/gtk2/rbgtkaccelkey.c

@@ -1,19 +1,31 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkaccelkey.c -
-
-  $Author: mutoh $
-  $Date: 2004/05/20 16:57:59 $
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 OGASAWARA, Takeshi
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
-  Copyright (C) 2002,2003 OGASAWARA, Takeshi
-************************************************/
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE cAccelKey
 #define _SELF(s) ((GtkAccelKey*)RVAL2BOXED(s, GTK_TYPE_ACCEL_KEY))
 #define GTK_TYPE_ACCEL_KEY (gtk_accel_key_get_type())
 
-static GtkAccelKey*
+static GtkAccelKey *
 accel_key_copy(const GtkAccelKey *key)
 {
     GtkAccelKey *new_key;
@@ -24,7 +36,7 @@ accel_key_copy(const GtkAccelKey *key)
 }
 
 GType
-gtk_accel_key_get_type()
+gtk_accel_key_get_type(void)
 {
     static GType our_type = 0;
     if(our_type == 0)
@@ -44,7 +56,7 @@ struct _GtkAccelKey
 */
 
 static VALUE
-accel_key_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     GtkAccelKey key;
     G_INITIALIZE(self, &key);
@@ -52,58 +64,58 @@ accel_key_initialize(VALUE self)
 }
 
 static VALUE
-accel_key_get_key(VALUE self)
+rg_key(VALUE self)
 {
     return UINT2NUM(_SELF(self)->accel_key);
 }
 
 static VALUE
-accel_key_get_mods(VALUE self)
+rg_mods(VALUE self)
 {
     return GFLAGS2RVAL(_SELF(self)->accel_mods, GDK_TYPE_MODIFIER_TYPE);
 }
 
 static VALUE
-accel_key_get_flags(VALUE self)
+rg_flags(VALUE self)
 {
     return INT2FIX(_SELF(self)->accel_flags);
 }
 
 static VALUE
-accel_key_set_key(VALUE self, VALUE key)
+rg_set_key(VALUE self, VALUE key)
 {
     _SELF(self)->accel_key = NUM2UINT(key);
     return self;
 }
 
 static VALUE
-accel_key_set_mods(VALUE self, VALUE mods)
+rg_set_mods(VALUE self, VALUE mods)
 {
     _SELF(self)->accel_mods = RVAL2GFLAGS(mods, GDK_TYPE_MODIFIER_TYPE);
     return self;
 }
 
 static VALUE
-accel_key_set_flags(VALUE self, VALUE flags)
+rg_set_flags(VALUE self, VALUE flags)
 {
     _SELF(self)->accel_flags = FIX2INT(flags);
     return self;
 }
 
 void
-Init_accel_key()
+Init_gtk_accel_key(VALUE mGtk)
 {
-    VALUE gAccelKey = G_DEF_CLASS(GTK_TYPE_ACCEL_KEY, "AccelKey", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ACCEL_KEY, "AccelKey", mGtk);
+
+    RG_DEF_METHOD(initialize, 0);
 
-    rb_define_method(gAccelKey, "initialize", accel_key_initialize, 0);
+    RG_DEF_METHOD(key, 0);
+    RG_DEF_METHOD(mods, 0);
+    RG_DEF_METHOD(flags, 0);
 
-    rb_define_method(gAccelKey, "key", accel_key_get_key, 0);
-    rb_define_method(gAccelKey, "mods", accel_key_get_mods, 0);
-    rb_define_method(gAccelKey, "flags", accel_key_get_flags, 0);
+    RG_DEF_METHOD(set_key, 1);
+    RG_DEF_METHOD(set_mods, 1);
+    RG_DEF_METHOD(set_flags, 1);
 
-    rb_define_method(gAccelKey, "set_key", accel_key_set_key, 1);
-    rb_define_method(gAccelKey, "set_mods", accel_key_set_mods, 1);
-    rb_define_method(gAccelKey, "set_flags", accel_key_set_flags, 1);
-    
-    G_DEF_SETTERS(gAccelKey);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/gtk2/rbgtkaccellabel.c

@@ -1,43 +1,55 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkaccellabel.c -
-
-  $Author: mutoh $
-  $Date: 2003/02/01 16:46:23 $
-
-  Copyright (C) 2002,2003 Ruby-GNOME2 Project Team
-  Copyright (C) 2001 Neil Conway
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 Ruby-GNOME2 Project Team
+ *  Copyright (C) 2001  Neil Conway
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE cAccelLabel
+
 static VALUE
-alabel_initialize(VALUE self, VALUE string)
+rg_initialize(VALUE self, VALUE string)
 {
     RBGTK_INITIALIZE(self, gtk_accel_label_new(RVAL2CSTR(string)));
     return Qnil;
 }
 
 static VALUE
-alabel_get_accel_width(VALUE self)
+rg_accel_width(VALUE self)
 {
     return INT2NUM(gtk_accel_label_get_accel_width(GTK_ACCEL_LABEL(RVAL2GOBJ(self))));
 }
 
 static VALUE
-alabel_refetch(VALUE self)
+rg_refetch(VALUE self)
 {
     gtk_accel_label_refetch(GTK_ACCEL_LABEL(RVAL2GOBJ(self)));
     return Qfalse; // always returns false
 }
 
 void
-Init_gtk_accel_label()
+Init_gtk_accel_label(VALUE mGtk)
 {
-  VALUE gAccelLabel = G_DEF_CLASS(GTK_TYPE_ACCEL_LABEL, "AccelLabel", mGtk);
+  VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ACCEL_LABEL, "AccelLabel", mGtk);
 
-  rb_define_method(gAccelLabel, "initialize", alabel_initialize, 1);
-  rb_define_method(gAccelLabel, "accel_width", alabel_get_accel_width, 0);
-  rb_define_method(gAccelLabel, "refetch", alabel_refetch, 0);
+  RG_DEF_METHOD(initialize, 1);
+  RG_DEF_METHOD(accel_width, 0);
+  RG_DEF_METHOD(refetch, 0);
 }

data/ext/gtk2/rbgtkaccelmap.c

@@ -1,26 +1,39 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkaccelmap.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 OGASAWARA, Takeshi
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
-  Copyright (C) 2002,2003 OGASAWARA, Takeshi
-************************************************/
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE cAccelMap
+
 #define RVAL2MOD(mods) (NIL_P(mods) ? 0 : RVAL2GFLAGS(mods, GDK_TYPE_MODIFIER_TYPE))
 
 static VALUE
-accel_map_add_entry(VALUE self, VALUE path, VALUE key, VALUE mods)
+rg_s_add_entry(VALUE self, VALUE path, VALUE key, VALUE mods)
 {
     gtk_accel_map_add_entry(RVAL2CSTR(path), NUM2UINT(key), RVAL2MOD(mods));
     return self;
 }
 
 static VALUE
-accel_map_lookup_entry(VALUE self, VALUE path)
+rg_s_lookup_entry(VALUE self, VALUE path)
 {
     GtkAccelKey key;
     if(gtk_accel_map_lookup_entry(RVAL2CSTR(path), &key))
@@ -30,28 +43,28 @@ accel_map_lookup_entry(VALUE self, VALUE path)
 }
 
 static VALUE
-accel_map_change_entry(VALUE self, VALUE path, VALUE key, VALUE mods, VALUE replace)
+rg_s_change_entry(G_GNUC_UNUSED VALUE self, VALUE path, VALUE key, VALUE mods, VALUE replace)
 {
     return CBOOL2RVAL(gtk_accel_map_change_entry(RVAL2CSTR(path), NUM2UINT(key),
                                                  RVAL2MOD(mods), RVAL2CBOOL(replace)));
 }
 
 static VALUE
-accel_map_load(VALUE self, VALUE filename)
+rg_s_load(VALUE self, VALUE filename)
 {
     gtk_accel_map_load(RVAL2CSTR(filename));
     return self;
 }
 
 static VALUE
-accel_map_save(VALUE self, VALUE filename)
+rg_s_save(VALUE self, VALUE filename)
 {
     gtk_accel_map_save(RVAL2CSTR(filename));
     return self;
 }
 
 static VALUE
-accel_map_add_filter(VALUE self, VALUE pattern)
+rg_s_add_filter(VALUE self, VALUE pattern)
 {
     gtk_accel_map_add_filter(RVAL2CSTR(pattern));
     return self;
@@ -66,7 +79,7 @@ accel_map_foreach_func(gpointer func, const gchar *path, guint key, GdkModifierT
 }
 
 static VALUE
-accel_map_foreach(VALUE self)
+rg_s_each(VALUE self)
 {
     volatile VALUE func = rb_block_proc();
     gtk_accel_map_foreach((gpointer)func,
@@ -75,7 +88,7 @@ accel_map_foreach(VALUE self)
 }
 
 static VALUE
-accel_map_foreach_unfilterd(VALUE self)
+rg_s_each_unfilterd(VALUE self)
 {
     volatile VALUE func = rb_block_proc();
     gtk_accel_map_foreach_unfiltered((gpointer)func,
@@ -94,20 +107,20 @@ void        gtk_accel_map_save_fd           (gint fd);
 
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-accel_map_get(VALUE self)
+rg_s_get(G_GNUC_UNUSED VALUE self)
 {
     return GOBJ2RVAL(gtk_accel_map_get());
 }
 
 static VALUE
-accel_map_lock_path(VALUE self, VALUE accel_path)
+rg_s_lock_path(VALUE self, VALUE accel_path)
 {
     gtk_accel_map_lock_path(RVAL2CSTR(accel_path));
     return self;
 }
 
 static VALUE
-accel_map_unlock_path(VALUE self, VALUE accel_path)
+rg_s_unlock_path(VALUE self, VALUE accel_path)
 {
     gtk_accel_map_unlock_path(RVAL2CSTR(accel_path));
     return self;
@@ -115,32 +128,32 @@ accel_map_unlock_path(VALUE self, VALUE accel_path)
 #endif
 
 void
-Init_accel_map()
+Init_gtk_accel_map(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,4,0)
-    VALUE mAccelMap = G_DEF_CLASS(GTK_TYPE_ACCEL_MAP, "AccelMap", mGtk);
-
-    rb_define_singleton_method(mAccelMap, "add_entry", accel_map_add_entry, 3);
-    rb_define_singleton_method(mAccelMap, "lookup_entry", accel_map_lookup_entry, 1);
-    rb_define_singleton_method(mAccelMap, "change_entry", accel_map_change_entry, 4);
-    rb_define_singleton_method(mAccelMap, "load", accel_map_load, 1);
-    rb_define_singleton_method(mAccelMap, "save", accel_map_save, 1);
-    rb_define_singleton_method(mAccelMap, "add_filter", accel_map_add_filter, 1);
-    rb_define_singleton_method(mAccelMap, "each", accel_map_foreach, 0);
-    rb_define_singleton_method(mAccelMap, "each_unfilterd", accel_map_foreach_unfilterd, 0);
-    rb_define_singleton_method(mAccelMap, "get", accel_map_get, 0);
-    rb_define_singleton_method(mAccelMap, "lock_path", accel_map_lock_path, 1);
-    rb_define_singleton_method(mAccelMap, "unlock_path", accel_map_unlock_path, 1);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ACCEL_MAP, "AccelMap", mGtk);
+
+    RG_DEF_SMETHOD(add_entry, 3);
+    RG_DEF_SMETHOD(lookup_entry, 1);
+    RG_DEF_SMETHOD(change_entry, 4);
+    RG_DEF_SMETHOD(load, 1);
+    RG_DEF_SMETHOD(save, 1);
+    RG_DEF_SMETHOD(add_filter, 1);
+    RG_DEF_SMETHOD(each, 0);
+    RG_DEF_SMETHOD(each_unfilterd, 0);
+    RG_DEF_SMETHOD(get, 0);
+    RG_DEF_SMETHOD(lock_path, 1);
+    RG_DEF_SMETHOD(unlock_path, 1);
 #else
     VALUE mAccelMap = rb_define_module_under(mGtk, "AccelMap");
-                                                                                
-    rb_define_module_function(mAccelMap, "add_entry", accel_map_add_entry, 3);
-    rb_define_module_function(mAccelMap, "lookup_entry", accel_map_lookup_entry, 1);
-    rb_define_module_function(mAccelMap, "change_entry", accel_map_change_entry, 4);
-    rb_define_module_function(mAccelMap, "load", accel_map_load, 1);
-    rb_define_module_function(mAccelMap, "save", accel_map_save, 1);
-    rb_define_module_function(mAccelMap, "add_filter", accel_map_add_filter, 1);
-    rb_define_module_function(mAccelMap, "each", accel_map_foreach, 0);
-    rb_define_module_function(mAccelMap, "each_unfilterd", accel_map_foreach_unfilterd, 0);
+
+    rb_define_module_function(mAccelMap, "add_entry", rg_s_add_entry, 3);
+    rb_define_module_function(mAccelMap, "lookup_entry", rg_s_lookup_entry, 1);
+    rb_define_module_function(mAccelMap, "change_entry", rg_s_change_entry, 4);
+    rb_define_module_function(mAccelMap, "load", rg_s_load, 1);
+    rb_define_module_function(mAccelMap, "save", rg_s_save, 1);
+    rb_define_module_function(mAccelMap, "add_filter", rg_s_add_filter, 1);
+    rb_define_module_function(mAccelMap, "each", rg_s_each, 0);
+    rb_define_module_function(mAccelMap, "each_unfilterd", rg_s_each_unfilterd, 0);
 #endif
 }