gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtkbindingset.c

@@ -1,13 +1,23 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkbindingset.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 14:27:09 $
-
-  Copyright (C) 2003 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003  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
+ */
 
 /* 
    NOTE:
@@ -31,7 +41,7 @@ gtk_bindingset_copy(const GtkBindingSet* bin)
 }
 
 static void
-gtk_bindingset_free(GtkBindingSet* bin)
+gtk_bindingset_free(G_GNUC_UNUSED GtkBindingSet* bin)
 {
     /* GtkBindingSet should not be freed */
 }
@@ -47,25 +57,26 @@ gtk_bindingset_get_type(void)
   return our_type;
 }
 /*****************************************/
-                                                                                
+
+#define RG_TARGET_NAMESPACE cBindingSet
 #define _SELF(s) (GtkBindingSet*)(RVAL2BOXED(s, GTK_TYPE_BINDING_SET))
 
 static VALUE
-binding_initialize(VALUE self, VALUE set_name)
+rg_initialize(VALUE self, VALUE set_name)
 {
     G_INITIALIZE(self, gtk_binding_set_new(RVAL2CSTR(set_name)));
     return Qnil;
 }
 
 static VALUE
-binding_s_find(VALUE self, VALUE set_name)
+rg_s_find(G_GNUC_UNUSED VALUE self, VALUE set_name)
 {
     return BOXED2RVAL(gtk_binding_set_find(RVAL2CSTR(set_name)), 
                       GTK_TYPE_BINDING_SET);
 }
 
 static VALUE
-binding_activate(VALUE self, VALUE keyval, VALUE modifiers, VALUE object)
+rg_activate(VALUE self, VALUE keyval, VALUE modifiers, VALUE object)
 {
     return CBOOL2RVAL(gtk_binding_set_activate(_SELF(self), NUM2UINT(keyval),
                                                RVAL2MOD(modifiers),
@@ -73,7 +84,7 @@ binding_activate(VALUE self, VALUE keyval, VALUE modifiers, VALUE object)
 }
 
 static VALUE
-binding_entry_clear(VALUE self, VALUE keyval, VALUE modifiers)
+rg_entry_clear(VALUE self, VALUE keyval, VALUE modifiers)
 {
     gtk_binding_entry_clear(_SELF(self), NUM2UINT(keyval),
                             RVAL2MOD(modifiers));
@@ -81,7 +92,7 @@ binding_entry_clear(VALUE self, VALUE keyval, VALUE modifiers)
 }
 
 static VALUE
-binding_entry_add_signal(int argc, VALUE *argv, VALUE self)
+rg_add_signal(int argc, VALUE *argv, VALUE self)
 {
     VALUE keyval, modifiers, signame, rest;
     long i;
@@ -112,7 +123,7 @@ binding_entry_add_signal(int argc, VALUE *argv, VALUE self)
             arg->arg_type = G_TYPE_LONG;
             arg->d.long_data = 1;
         } else if (rb_respond_to (param, rb_intern("to_str"))) {
-	    arg->arg_type = G_TYPE_STRING;
+            arg->arg_type = G_TYPE_STRING;
             arg->d.string_data = (gchar *)RVAL2CSTR(param);
         } else {
             rb_raise(rb_eTypeError, 
@@ -136,7 +147,7 @@ binding_entry_add_signal(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-binding_add_path(VALUE self, VALUE path_type, VALUE path_pattern, VALUE priority)
+rg_add_path(VALUE self, VALUE path_type, VALUE path_pattern, VALUE priority)
 {
     gtk_binding_set_add_path(_SELF(self), RVAL2GENUM(path_type, GTK_TYPE_PATH_TYPE),
                              RVAL2CSTR(path_pattern),
@@ -145,7 +156,7 @@ binding_add_path(VALUE self, VALUE path_type, VALUE path_pattern, VALUE priority
 }
 
 static VALUE
-binding_entry_remove(VALUE self, VALUE keyval, VALUE modifiers)
+rg_entry_remove(VALUE self, VALUE keyval, VALUE modifiers)
 {
     gtk_binding_entry_remove(_SELF(self), NUM2UINT(keyval), RVAL2MOD(modifiers));
     return self;
@@ -153,30 +164,26 @@ binding_entry_remove(VALUE self, VALUE keyval, VALUE modifiers)
 
 #if GTK_CHECK_VERSION(2,12,0)
 static VALUE
-binding_entry_skip(VALUE self, VALUE keyval, VALUE modifiers)
+rg_entry_skip(VALUE self, VALUE keyval, VALUE modifiers)
 {
     gtk_binding_entry_skip(_SELF(self), NUM2UINT(keyval), RVAL2MOD(modifiers));
     return self;
 }
 #endif
 
-/* Deprecated.
-guint       gtk_binding_parse_binding       (GScanner *scanner);
-*/
-
 void 
-Init_gtk_bindings()
+Init_gtk_bindings(VALUE mGtk)
 {
-    VALUE gBinding = G_DEF_CLASS(GTK_TYPE_BINDING_SET, "BindingSet", mGtk);
-    rb_define_method(gBinding, "initialize", binding_initialize, 1);
-    rb_define_singleton_method(gBinding, "find", binding_s_find, 1);
-    rb_define_method(gBinding, "activate", binding_activate, 3);
-    rb_define_method(gBinding, "entry_clear", binding_entry_clear, 2);
-    rb_define_method(gBinding, "add_signal", binding_entry_add_signal, -1);
-    rb_define_method(gBinding, "add_path", binding_add_path, 3);
-    rb_define_method(gBinding, "entry_add_signal", binding_entry_add_signal, -1);
-    rb_define_method(gBinding, "entry_remove", binding_entry_remove, 2);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_BINDING_SET, "BindingSet", mGtk);
+    RG_DEF_METHOD(initialize, 1);
+    RG_DEF_SMETHOD(find, 1);
+    RG_DEF_METHOD(activate, 3);
+    RG_DEF_METHOD(entry_clear, 2);
+    RG_DEF_METHOD(add_signal, -1);
+    RG_DEF_ALIAS("entry_add_signal", "add_signal");
+    RG_DEF_METHOD(add_path, 3);
+    RG_DEF_METHOD(entry_remove, 2);
 #if GTK_CHECK_VERSION(2,12,0)
-    rb_define_method(gBinding, "entry_skip", binding_entry_skip, 2);
+    RG_DEF_METHOD(entry_skip, 2);
 #endif
 }

data/ext/gtk2/rbgtkborder.c

@@ -1,19 +1,30 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkborder.c -
-
-  $Author: mutoh $
-  $Date: 2004/05/24 17:22:58 $
-
-  Copyright (C) 2002-2004 Ruby-GNOME2 Project Team
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2004 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 cBorder
 #define _SELF(self) ((GtkBorder*)RVAL2BOXED(self, GTK_TYPE_BORDER))
 
 #define ATTR_INT(name)\
@@ -39,7 +50,7 @@ ATTR_INT(bottom);
     rb_define_method(gt, G_STRINGIFY(set_ ## name), border_ ## type ## _set_## name, 1);
 
 static VALUE
-border_initialize(VALUE self, VALUE left, VALUE right, VALUE top, VALUE bottom)
+rg_initialize(VALUE self, VALUE left, VALUE right, VALUE top, VALUE bottom)
 {
     GtkBorder border;
     border.left = NUM2INT(left);
@@ -52,7 +63,7 @@ border_initialize(VALUE self, VALUE left, VALUE right, VALUE top, VALUE bottom)
 }
 
 static VALUE
-border_to_a(VALUE self)
+rg_to_a(VALUE self)
 {
     GtkBorder* border = _SELF(self);
     return rb_ary_new3(4, INT2NUM(border->left), INT2NUM(border->right),
@@ -60,17 +71,17 @@ border_to_a(VALUE self)
 }
 
 void 
-Init_gtk_border()
+Init_gtk_border(VALUE mGtk)
 {
-    VALUE gBorder = G_DEF_CLASS(GTK_TYPE_BORDER, "Border", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_BORDER, "Border", mGtk);
 
-    rb_define_method(gBorder, "initialize", border_initialize, 4);
-    rb_define_method(gBorder, "to_a", border_to_a, 0);
+    RG_DEF_METHOD(initialize, 4);
+    RG_DEF_METHOD(to_a, 0);
 
-    DEFINE_ACCESSOR(gBorder, int, left);
-    DEFINE_ACCESSOR(gBorder, int, right);
-    DEFINE_ACCESSOR(gBorder, int, top);
-    DEFINE_ACCESSOR(gBorder, int, bottom);
+    DEFINE_ACCESSOR(RG_TARGET_NAMESPACE, int, left);
+    DEFINE_ACCESSOR(RG_TARGET_NAMESPACE, int, right);
+    DEFINE_ACCESSOR(RG_TARGET_NAMESPACE, int, top);
+    DEFINE_ACCESSOR(RG_TARGET_NAMESPACE, int, bottom);
 
-    G_DEF_SETTERS(gBorder);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/gtk2/rbgtkbox.c

@@ -1,19 +1,30 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkbox.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  Copyright (C) 2002-2005 Ruby-GNOME2 Project Team
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2005 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 cBox
 #define _SELF(self) (GTK_BOX(RVAL2GOBJ(self)))
 #define RVAL2WIDGET(w) (GTK_WIDGET(RVAL2GOBJ(w)))
 
@@ -46,35 +57,35 @@ box_pack_start_or_end(int argc, VALUE *argv, VALUE self, int start)
 }
 
 static VALUE
-box_pack_start(int argc, VALUE *argv, VALUE self)
+rg_pack_start(int argc, VALUE *argv, VALUE self)
 {
     box_pack_start_or_end(argc, argv, self, 1);
     return self;
 }
 
 static VALUE
-box_pack_end(int argc, VALUE *argv, VALUE self)
+rg_pack_end(int argc, VALUE *argv, VALUE self)
 {
     box_pack_start_or_end(argc, argv, self, 0);
     return self;
 }
 
 static VALUE
-box_pack_start_defaults(VALUE self, VALUE widget)
+rg_pack_start_defaults(VALUE self, VALUE widget)
 {
     gtk_box_pack_start_defaults(_SELF(self), RVAL2WIDGET(widget));
     return self;
 }
 
 static VALUE
-box_pack_end_defaults(VALUE self, VALUE widget)
+rg_pack_end_defaults(VALUE self, VALUE widget)
 {
     gtk_box_pack_end_defaults(_SELF(self), RVAL2WIDGET(widget));
     return self;
 }
 
 static VALUE
-box_reorder_child(VALUE self, VALUE child, VALUE pos)
+rg_reorder_child(VALUE self, VALUE child, VALUE pos)
 {
     gtk_box_reorder_child(_SELF(self),
                           RVAL2WIDGET(child), NUM2INT(pos));
@@ -82,7 +93,7 @@ box_reorder_child(VALUE self, VALUE child, VALUE pos)
 }
 
 static VALUE
-box_query_child_packing(VALUE self, VALUE child)
+rg_query_child_packing(VALUE self, VALUE child)
 {
     gboolean expand, fill;
     guint padding;
@@ -103,7 +114,7 @@ box_query_child_packing(VALUE self, VALUE child)
 }
 
 static VALUE
-box_set_child_packing(VALUE self, VALUE child, VALUE expand, VALUE fill, VALUE padding, VALUE pack_type)
+rg_set_child_packing(VALUE self, VALUE child, VALUE expand, VALUE fill, VALUE padding, VALUE pack_type)
 {
     gtk_box_set_child_packing(_SELF(self), 
                               RVAL2WIDGET(child),
@@ -113,15 +124,15 @@ box_set_child_packing(VALUE self, VALUE child, VALUE expand, VALUE fill, VALUE p
 }
 
 void 
-Init_gtk_box()
+Init_gtk_box(VALUE mGtk)
 {
-    VALUE gBox = G_DEF_CLASS(GTK_TYPE_BOX, "Box", mGtk);
-
-    rb_define_method(gBox, "pack_start", box_pack_start, -1);
-    rb_define_method(gBox, "pack_end", box_pack_end, -1);
-    rb_define_method(gBox, "pack_start_defaults", box_pack_start_defaults, 1);
-    rb_define_method(gBox, "pack_end_defaults", box_pack_end_defaults, 1);
-    rb_define_method(gBox, "reorder_child", box_reorder_child, 2);
-    rb_define_method(gBox, "query_child_packing", box_query_child_packing, 1);
-    rb_define_method(gBox, "set_child_packing", box_set_child_packing, 5);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_BOX, "Box", mGtk);
+
+    RG_DEF_METHOD(pack_start, -1);
+    RG_DEF_METHOD(pack_end, -1);
+    RG_DEF_METHOD(pack_start_defaults, 1);
+    RG_DEF_METHOD(pack_end_defaults, 1);
+    RG_DEF_METHOD(reorder_child, 2);
+    RG_DEF_METHOD(query_child_packing, 1);
+    RG_DEF_METHOD(set_child_packing, 5);
 }

data/ext/gtk2/rbgtkbuildable.c

@@ -1,32 +1,47 @@
-/* -*- c-file-style: "ruby" -*- */
-/************************************************
-
-  rbgtkbuildable.c -
-
-  Copyright (C) 2008 Ruby-GNOME2 Project Team
-************************************************/
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2008  Ruby-GNOME2 Project Team
+ *
+ *  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, 12, 0)
+
+#define RG_TARGET_NAMESPACE cBuildable
 #define _SELF(self) (GTK_BUILDABLE(RVAL2GOBJ(self)))
 #define RVAL2BUILDER(obj) (GTK_BUILDER(RVAL2GOBJ(obj)))
 
 static VALUE
-buildable_get_name(VALUE self, VALUE name)
+rg_builder_name(VALUE self)
 {
     return CSTR2RVAL(gtk_buildable_get_name(_SELF(self)));
 }
 
 static VALUE
-buildable_set_name(VALUE self, VALUE name)
+rg_set_builder_name(VALUE self, VALUE name)
 {
     gtk_buildable_set_name(_SELF(self), RVAL2CSTR(name));
     return self;
 }
 
 static VALUE
-buildable_add_child(int argc, VALUE *argv, VALUE self)
+rg_add_child(int argc, VALUE *argv, VALUE self)
 {
     VALUE builder, child, type;
 
@@ -37,12 +52,12 @@ buildable_add_child(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-buildable_set_buildable_property(VALUE self, VALUE rb_builder,
+rg_set_buildable_property(VALUE self, VALUE rb_builder,
                                  VALUE rb_name, VALUE rb_value)
 {
     GtkBuilder *builder;
     const gchar *name;
-    GValue value = {0};
+    GValue value = G_VALUE_INIT;
 
     builder = RVAL2BUILDER(rb_builder);
     name = RVAL2CSTR(rb_name);
@@ -53,63 +68,60 @@ buildable_set_buildable_property(VALUE self, VALUE rb_builder,
 }
 
 static VALUE
-buildable_construct_child(VALUE self, VALUE builder, VALUE name)
+rg_construct_child(VALUE self, VALUE builder, VALUE name)
 {
     return GOBJ2RVAL(gtk_buildable_construct_child(_SELF(self),
-						   RVAL2BUILDER(builder),
-						   RVAL2CSTR(name)));
+                                                   RVAL2BUILDER(builder),
+                                                   RVAL2CSTR(name)));
 }
 
 /*
   customized buildable is not supported yet.
 
 gboolean  gtk_buildable_custom_tag_start       (GtkBuildable        *buildable,
-						GtkBuilder          *builder,
-						GObject             *child,
-						const gchar         *tagname,
-						GMarkupParser       *parser,
-						gpointer            *data);
+                        GtkBuilder          *builder,
+                        GObject             *child,
+                        const gchar         *tagname,
+                        GMarkupParser       *parser,
+                        gpointer            *data);
 void      gtk_buildable_custom_tag_end         (GtkBuildable        *buildable,
-						GtkBuilder          *builder,
-						GObject             *child,
-						const gchar         *tagname,
-						gpointer            *data);
+                        GtkBuilder          *builder,
+                        GObject             *child,
+                        const gchar         *tagname,
+                        gpointer            *data);
 void      gtk_buildable_custom_finished        (GtkBuildable        *buildable,
-						GtkBuilder          *builder,
-						GObject             *child,
-						const gchar         *tagname,
-						gpointer             data);
+                        GtkBuilder          *builder,
+                        GObject             *child,
+                        const gchar         *tagname,
+                        gpointer             data);
 void      gtk_buildable_parser_finished        (GtkBuildable        *buildable,
-						GtkBuilder          *builder);
+                        GtkBuilder          *builder);
 */
 
 static VALUE
-buildable_get_internal_child(VALUE self, VALUE builder, VALUE child_name)
+rg_get_internal_child(VALUE self, VALUE builder, VALUE child_name)
 {
     return GOBJ2RVAL(gtk_buildable_get_internal_child(_SELF(self),
-						      RVAL2BUILDER(builder),
-						      RVAL2CSTR(child_name)));
+                                                      RVAL2BUILDER(builder),
+                                                      RVAL2CSTR(child_name)));
 }
 #endif
 
 void
-Init_gtk_buildable()
+Init_gtk_buildable(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2, 12, 0)
-    VALUE cGtkBuildable;
+    VALUE RG_TARGET_NAMESPACE;
 
-    cGtkBuildable = G_DEF_CLASS(GTK_TYPE_BUILDABLE, "Buildable", mGtk);
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_BUILDABLE, "Buildable", mGtk);
 
-    rb_define_method(cGtkBuildable, "builder_name", buildable_get_name, 0);
-    rb_define_method(cGtkBuildable, "set_builder_name", buildable_set_name, 1);
-    rb_define_method(cGtkBuildable, "add_child", buildable_add_child, -1);
-    rb_define_method(cGtkBuildable, "set_buildable_property",
-                     buildable_set_buildable_property, 3);
-    rb_define_method(cGtkBuildable, "construct_child",
-                     buildable_construct_child, 2);
-    rb_define_method(cGtkBuildable, "get_internal_child",
-                     buildable_get_internal_child, 2);
+    RG_DEF_METHOD(builder_name, 0);
+    RG_DEF_METHOD(set_builder_name, 1);
+    RG_DEF_METHOD(add_child, -1);
+    RG_DEF_METHOD(set_buildable_property, 3);
+    RG_DEF_METHOD(construct_child, 2);
+    RG_DEF_METHOD(get_internal_child, 2);
 
-    G_DEF_SETTERS(cGtkBuildable);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 #endif
 }