gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtkhseparator.c

@@ -1,29 +1,41 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkhseparator.c -
-
-  $Author: mutoh $
-  $Date: 2003/02/01 16:46:23 $
-
-  Copyright (C) 2002,2003 Ruby-GNOME2 Project Team
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 Ruby-GNOME2 Project Team
+ *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
+ *                          Daisuke Kanda,
+ *                          Hiroshi Igarashi
+ *
+ *  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 cHSeparator
+
 static VALUE
-hsep_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_hseparator_new());
     return Qnil;
 }
 
 void 
-Init_gtk_hseparator()
+Init_gtk_hseparator(VALUE mGtk)
 {
-    VALUE gHSeparator = G_DEF_CLASS(GTK_TYPE_HSEPARATOR, "HSeparator", mGtk);
-    rb_define_method(gHSeparator, "initialize", hsep_initialize, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_HSEPARATOR, "HSeparator", mGtk);
+    RG_DEF_METHOD(initialize, 0);
 }

data/ext/gtk2/rbgtkiconfactory.c

@@ -1,26 +1,38 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  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
+ */
 
-  rbgtkiconfactory.c -
-
-  $Author: ggc $
-  $Date: 2006/06/22 19:52:54 $
-
-  Copyright (C) 2002,2003 OGASAWARA, Takeshi
-************************************************/
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE cIconFactory
 #define _SELF(s) (GTK_ICON_FACTORY(RVAL2GOBJ(s)))
 
 static VALUE
-ifactory_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     G_INITIALIZE(self, gtk_icon_factory_new());
     return Qnil;
 }
 
 static VALUE
-ifactory_add(VALUE self, VALUE id, VALUE icon_set)
+rg_add(VALUE self, VALUE id, VALUE icon_set)
 {
     gtk_icon_factory_add(_SELF(self), RVAL2CSTR(id),
                          (GtkIconSet*)RVAL2BOXED(icon_set, GTK_TYPE_ICON_SET));
@@ -28,14 +40,14 @@ ifactory_add(VALUE self, VALUE id, VALUE icon_set)
 }
 
 static VALUE
-ifactory_add_default(VALUE self)
+rg_add_default(VALUE self)
 {
     gtk_icon_factory_add_default(_SELF(self));
     return self;
 }
 
 static VALUE
-ifactory_lookup(VALUE self, VALUE id)
+rg_lookup(VALUE self, VALUE id)
 {
     GtkIconSet *icon_set;
 
@@ -44,7 +56,7 @@ ifactory_lookup(VALUE self, VALUE id)
 }
 
 static VALUE
-ifactory_lookup_default(VALUE self, VALUE id)
+rg_s_lookup_default(G_GNUC_UNUSED VALUE self, VALUE id)
 {
     GtkIconSet *icon_set;
 
@@ -53,22 +65,22 @@ ifactory_lookup_default(VALUE self, VALUE id)
 }
 
 static VALUE
-ifactory_remove_default(VALUE self)
+rg_remove_default(VALUE self)
 {
     gtk_icon_factory_remove_default(_SELF(self));
     return self;
 }
 
 void
-Init_icon_factory()
+Init_gtk_icon_factory(VALUE mGtk)
 {
-    VALUE gIconFactory = G_DEF_CLASS(GTK_TYPE_ICON_FACTORY, "IconFactory", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ICON_FACTORY, "IconFactory", mGtk);
+
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(add, 2);
+    RG_DEF_METHOD(add_default, 0);
+    RG_DEF_METHOD(remove_default, 0);
+    RG_DEF_METHOD(lookup, 1);
 
-    rb_define_method(gIconFactory, "initialize", ifactory_initialize, 0);
-    rb_define_method(gIconFactory, "add", ifactory_add, 2);
-    rb_define_method(gIconFactory, "add_default", ifactory_add_default, 0);
-    rb_define_method(gIconFactory, "remove_default", ifactory_remove_default, 0);
-    rb_define_method(gIconFactory, "lookup", ifactory_lookup, 1);
-    
-    rb_define_singleton_method(gIconFactory, "lookup_default", ifactory_lookup_default, 1);
+    RG_DEF_SMETHOD(lookup_default, 1);
 }

data/ext/gtk2/rbgtkiconinfo.c

@@ -1,39 +1,51 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkiconinfo.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  Copyright (C) 2004 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2004  Masao Mutoh
+ *
+ *  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"
 
 #if GTK_CHECK_VERSION(2,4,0)
+
+#define RG_TARGET_NAMESPACE cIconInfo
 #define _SELF(i) ((GtkIconInfo*)RVAL2BOXED(i, GTK_TYPE_ICON_INFO))
 
 static VALUE
-iconinfo_get_base_size(VALUE self)
+rg_base_size(VALUE self)
 {
     return INT2NUM(gtk_icon_info_get_base_size(_SELF(self)));
 }
 
 static VALUE
-iconinfo_get_filename(VALUE self)
+rg_filename(VALUE self)
 {
     return CSTR2RVAL(gtk_icon_info_get_filename(_SELF(self)));
 }
 
 static VALUE
-iconinfo_get_builtin_pixbuf(VALUE self)
+rg_builtin_pixbuf(VALUE self)
 {
     return GOBJ2RVAL(gtk_icon_info_get_builtin_pixbuf(_SELF(self)));
 }
 
 static VALUE
-iconinfo_load_icon(VALUE self)
+rg_load_icon(VALUE self)
 {
     GError* error = NULL;
     GdkPixbuf* pixbuf = gtk_icon_info_load_icon(_SELF(self), &error);
@@ -47,14 +59,14 @@ iconinfo_load_icon(VALUE self)
 }
 
 static VALUE
-iconinfo_set_raw_coordinates(VALUE self, VALUE raw_coordinates)
+rg_set_raw_coordinates(VALUE self, VALUE raw_coordinates)
 {
     gtk_icon_info_set_raw_coordinates(_SELF(self), RVAL2CBOOL(raw_coordinates));
     return self;
 }
 
 static VALUE
-iconinfo_get_embedded_rect(VALUE self)
+rg_embedded_rect(VALUE self)
 {
     GdkRectangle rectangle;
     gboolean ret = gtk_icon_info_get_embedded_rect(_SELF(self), &rectangle);
@@ -66,7 +78,7 @@ iconinfo_get_embedded_rect(VALUE self)
 }
 
 static VALUE
-iconinfo_get_attach_points(VALUE self)
+rg_attach_points(VALUE self)
 {
     GdkPoint* points;
     gint n_points, i;
@@ -84,27 +96,27 @@ iconinfo_get_attach_points(VALUE self)
 }
 
 static VALUE
-iconinfo_get_display_name(VALUE self)
+rg_display_name(VALUE self)
 {
     return CSTR2RVAL(gtk_icon_info_get_display_name(_SELF(self)));
 }
 #endif
 
 void 
-Init_gtk_iconinfo()
+Init_gtk_iconinfo(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,4,0)
-    VALUE ii = G_DEF_CLASS(GTK_TYPE_ICON_INFO, "IconInfo", mGtk);
-
-    rb_define_method(ii, "base_size", iconinfo_get_base_size, 0);
-    rb_define_method(ii, "filename", iconinfo_get_filename, 0);
-    rb_define_method(ii, "builtin_pixbuf", iconinfo_get_builtin_pixbuf, 0);
-    rb_define_method(ii, "load_icon", iconinfo_load_icon, 0);
-    rb_define_method(ii, "set_raw_coordinates", iconinfo_set_raw_coordinates, 1);
-    rb_define_method(ii, "embedded_rect", iconinfo_get_embedded_rect, 0);
-    rb_define_method(ii, "attach_points", iconinfo_get_attach_points, 0);
-    rb_define_method(ii, "display_name", iconinfo_get_display_name, 0);
-
-    G_DEF_SETTERS(ii);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ICON_INFO, "IconInfo", mGtk);
+
+    RG_DEF_METHOD(base_size, 0);
+    RG_DEF_METHOD(filename, 0);
+    RG_DEF_METHOD(builtin_pixbuf, 0);
+    RG_DEF_METHOD(load_icon, 0);
+    RG_DEF_METHOD(set_raw_coordinates, 1);
+    RG_DEF_METHOD(embedded_rect, 0);
+    RG_DEF_METHOD(attach_points, 0);
+    RG_DEF_METHOD(display_name, 0);
+
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 #endif
 }

data/ext/gtk2/rbgtkiconset.c

@@ -1,19 +1,31 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  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
+ */
 
-  rbgtkiconset.c -
-
-  $Author: mutoh $
-  $Date: 2003/08/31 17:10:08 $
-
-  Copyright (C) 2002,2003 OGASAWARA, Takeshi
-************************************************/
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE cIconSet
 #define _SELF(s) ((GtkIconSet*)RVAL2BOXED(s, GTK_TYPE_ICON_SET))
 
 static VALUE
-icon_set_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     GtkIconSet *icon_set;
     VALUE pixbuf;
@@ -30,14 +42,14 @@ icon_set_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-icon_set_add_source(VALUE self, VALUE source)
+rg_add_source(VALUE self, VALUE source)
 {
     gtk_icon_set_add_source(_SELF(self), RVAL2BOXED(source, GTK_TYPE_ICON_SOURCE));
     return self;
 }
 
 static VALUE
-icon_set_get_sizes(VALUE self)
+rg_sizes(VALUE self)
 {
     GtkIconSize *sizes;
     gint n_sizes;
@@ -52,7 +64,7 @@ icon_set_get_sizes(VALUE self)
 }
 
 static VALUE
-icon_set_render_icon(int argc, VALUE *argv, VALUE self)
+rg_render_icon(int argc, VALUE *argv, VALUE self)
 {
     VALUE style, direction, state, size, widget, detail;
 
@@ -67,13 +79,13 @@ icon_set_render_icon(int argc, VALUE *argv, VALUE self)
 }
 
 void
-Init_icon_set()
+Init_gtk_icon_set(VALUE mGtk)
 {
-    VALUE gIconSet = G_DEF_CLASS(GTK_TYPE_ICON_SET, "IconSet", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ICON_SET, "IconSet", mGtk);
+
+    RG_DEF_METHOD(initialize, -1);
 
-    rb_define_method(gIconSet, "initialize", icon_set_initialize, -1);
-    
-    rb_define_method(gIconSet, "add_source", icon_set_add_source, 1);
-    rb_define_method(gIconSet, "sizes", icon_set_get_sizes, 0);
-    rb_define_method(gIconSet, "render_icon", icon_set_render_icon, -1);
+    RG_DEF_METHOD(add_source, 1);
+    RG_DEF_METHOD(sizes, 0);
+    RG_DEF_METHOD(render_icon, -1);
 }

data/ext/gtk2/rbgtkiconsize.c

@@ -1,17 +1,30 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  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
+ */
 
-  rbgtkiconsize.c -
-
-  $Author: sakai $
-  $Date: 2003/11/20 18:27:54 $
-
-  Copyright (C) 2002,2003 OGASAWARA, Takeshi
-************************************************/
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE mIconSize
+
 static VALUE
-icon_size_lookup(VALUE self, VALUE size)
+rg_m_lookup(G_GNUC_UNUSED VALUE self, VALUE size)
 {
     gint width, height;
 
@@ -23,7 +36,7 @@ icon_size_lookup(VALUE self, VALUE size)
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-icon_size_lookup_for_settings(VALUE self, VALUE settings, VALUE size)
+rg_m_lookup_for_settings(G_GNUC_UNUSED VALUE self, VALUE settings, VALUE size)
 {
     gint width, height;
 
@@ -37,7 +50,7 @@ icon_size_lookup_for_settings(VALUE self, VALUE settings, VALUE size)
 #endif
 
 static VALUE
-icon_size_register(VALUE self, VALUE name, VALUE width, VALUE height)
+rg_m_register(G_GNUC_UNUSED VALUE self, VALUE name, VALUE width, VALUE height)
 {
     /* XXXX FIXME This should be GENUM2RVAL */
     return INT2FIX(gtk_icon_size_register(RVAL2CSTR(name),
@@ -46,39 +59,39 @@ icon_size_register(VALUE self, VALUE name, VALUE width, VALUE height)
 }
 
 static VALUE
-icon_size_register_alias(VALUE self, VALUE alias, VALUE target)
+rg_m_register_alias(G_GNUC_UNUSED VALUE self, VALUE alias, VALUE target)
 {
     gtk_icon_size_register_alias(RVAL2CSTR(alias), RVAL2GENUM(target, GTK_TYPE_ICON_SIZE));
     return Qnil;
 }
 
 static VALUE
-icon_size_from_name(VALUE self, VALUE name)
+rg_m_from_name(G_GNUC_UNUSED VALUE self, VALUE name)
 {
     return INT2FIX(gtk_icon_size_from_name(RVAL2CSTR(name)));
 }
 
 static VALUE
-icon_size_get_name(VALUE self, VALUE size)
+rg_m_get_name(G_GNUC_UNUSED VALUE self, VALUE size)
 {
     return CSTR2RVAL(gtk_icon_size_get_name(RVAL2GENUM(size, GTK_TYPE_ICON_SIZE)));
 }
 
 void
-Init_icon_size()
+Init_gtk_icon_size(VALUE mGtk)
 {
-    VALUE mIconSize = rb_define_module_under(mGtk, "IconSize");
+    VALUE RG_TARGET_NAMESPACE = rb_define_module_under(mGtk, "IconSize");
 
-    rb_define_module_function(mIconSize, "lookup", icon_size_lookup, 1);
+    RG_DEF_MODFUNC(lookup, 1);
 #if GTK_CHECK_VERSION(2,2,0)
-    rb_define_module_function(mIconSize, "lookup_for_settings", icon_size_lookup_for_settings, 2);
+    RG_DEF_MODFUNC(lookup_for_settings, 2);
 #endif
-    rb_define_module_function(mIconSize, "register", icon_size_register, 3);
-    rb_define_module_function(mIconSize, "register_alias", icon_size_register_alias, 2);
-    rb_define_module_function(mIconSize, "from_name", icon_size_from_name, 1);
-    rb_define_module_function(mIconSize, "get_name", icon_size_get_name, 1);
-    
+    RG_DEF_MODFUNC(register, 3);
+    RG_DEF_MODFUNC(register_alias, 2);
+    RG_DEF_MODFUNC(from_name, 1);
+    RG_DEF_MODFUNC(get_name, 1);
+
     /* GtkIconSize */
-    G_DEF_CLASS(GTK_TYPE_ICON_SIZE, "IconSize", mIconSize);
-    G_DEF_CONSTANTS(mIconSize, GTK_TYPE_ICON_SIZE, "GTK_ICON_SIZE_");
+    G_DEF_CLASS(GTK_TYPE_ICON_SIZE, "IconSize", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_ICON_SIZE, "GTK_ICON_SIZE_");
 }