gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtkadjustment.c

@@ -1,26 +1,34 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkadjustment.c -
-
-  $Author: mutoh $
-  $Date: 2003/01/19 14:28:24 $
-
-  Copyright (C) 2002,2003 Masao Mutoh
-
-  This file is derived from rbgtkdata.c.
-  rbgtkdata.c -
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 Masao Mutoh
+ *  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 cAdjustment
 #define _SELF(self) (GTK_ADJUSTMENT(RVAL2GOBJ(self)))
 
 static VALUE
-adj_initialize(VALUE self, VALUE value, VALUE lower, VALUE upper, VALUE step_inc, VALUE page_inc, VALUE page_size)
+rg_initialize(VALUE self, VALUE value, VALUE lower, VALUE upper, VALUE step_inc, VALUE page_inc, VALUE page_size)
 {
     RBGTK_INITIALIZE(self, gtk_adjustment_new(NUM2DBL(value),
                                               NUM2DBL(lower),
@@ -32,54 +40,33 @@ adj_initialize(VALUE self, VALUE value, VALUE lower, VALUE upper, VALUE step_inc
 }
 
 static VALUE
-adj_clamp_page(VALUE self, VALUE lower, VALUE upper)
+rg_clamp_page(VALUE self, VALUE lower, VALUE upper)
 {
     gtk_adjustment_clamp_page(_SELF(self), NUM2DBL(lower), NUM2DBL(upper));
     return self;
 }
 
 static VALUE
-adj_changed(VALUE self)
+rg_changed(VALUE self)
 {
     gtk_adjustment_changed(_SELF(self));
     return self;
 }
 
 static VALUE
-adj_value_changed(VALUE self)
+rg_value_changed(VALUE self)
 {
     gtk_adjustment_value_changed(_SELF(self));
     return self;
 }
 
-/* Properties:
-gdouble             gtk_adjustment_get_value            (GtkAdjustment *adjustment);
-void                gtk_adjustment_set_value            (GtkAdjustment *adjustment,
-                                                         gdouble value);
-gdouble             gtk_adjustment_get_lower            (GtkAdjustment *adjustment);
-gdouble             gtk_adjustment_get_page_increment   (GtkAdjustment *adjustment);
-gdouble             gtk_adjustment_get_page_size        (GtkAdjustment *adjustment);
-gdouble             gtk_adjustment_get_step_increment   (GtkAdjustment *adjustment);
-gdouble             gtk_adjustment_get_upper            (GtkAdjustment *adjustment);
-void                gtk_adjustment_set_lower            (GtkAdjustment *adjustment,
-                                                         gdouble lower);
-void                gtk_adjustment_set_page_increment   (GtkAdjustment *adjustment,
-                                                         gdouble page_increment);
-void                gtk_adjustment_set_page_size        (GtkAdjustment *adjustment,
-                                                         gdouble page_size);
-void                gtk_adjustment_set_step_increment   (GtkAdjustment *adjustment,
-                                                         gdouble step_increment);
-void                gtk_adjustment_set_upper            (GtkAdjustment *adjustment,
-                                                         gdouble upper);
-*/
-
 void 
-Init_gtk_adjustment()
+Init_gtk_adjustment(VALUE mGtk)
 {
-    VALUE gAdjustment = G_DEF_CLASS(GTK_TYPE_ADJUSTMENT, "Adjustment", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ADJUSTMENT, "Adjustment", mGtk);
 
-    rb_define_method(gAdjustment, "initialize", adj_initialize, 6);
-    rb_define_method(gAdjustment, "clamp_page", adj_clamp_page, 2);
-    rb_define_method(gAdjustment, "changed", adj_changed, 0);
-    rb_define_method(gAdjustment, "value_changed", adj_value_changed, 0);
+    RG_DEF_METHOD(initialize, 6);
+    RG_DEF_METHOD(clamp_page, 2);
+    RG_DEF_METHOD(changed, 0);
+    RG_DEF_METHOD(value_changed, 0);
 }

data/ext/gtk2/rbgtkalignment.c

@@ -1,21 +1,33 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkalignment.c -
-
-  $Author: mutoh $
-  $Date: 2004/07/31 05:44:45 $
-
-  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 cAlignment
+
 static VALUE
-align_initialize(VALUE self, VALUE xalign, VALUE yalign, VALUE xscale, VALUE yscale)
+rg_initialize(VALUE self, VALUE xalign, VALUE yalign, VALUE xscale, VALUE yscale)
 {
     RBGTK_INITIALIZE(self, gtk_alignment_new(NUM2DBL(xalign),
                                              NUM2DBL(yalign),
@@ -25,16 +37,16 @@ align_initialize(VALUE self, VALUE xalign, VALUE yalign, VALUE xscale, VALUE ysc
 }
 
 static VALUE
-align_set(VALUE self, VALUE xalign, VALUE yalign, VALUE xscale, VALUE yscale)
+rg_set(VALUE self, VALUE xalign, VALUE yalign, VALUE xscale, VALUE yscale)
 {
     gtk_alignment_set(GTK_ALIGNMENT(RVAL2GOBJ(self)),
-		      NUM2DBL(xalign), NUM2DBL(yalign),
-		      NUM2DBL(xscale), NUM2DBL(yscale));
+                      NUM2DBL(xalign), NUM2DBL(yalign),
+                      NUM2DBL(xscale), NUM2DBL(yscale));
     return self;
 }
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-align_get_padding(VALUE self)
+rg_padding(VALUE self)
 {
     guint top, bottom, left, right;
     gtk_alignment_get_padding(GTK_ALIGNMENT(RVAL2GOBJ(self)),
@@ -43,7 +55,7 @@ align_get_padding(VALUE self)
                        UINT2NUM(left), UINT2NUM(right));
 }
 static VALUE
-align_set_padding(VALUE self, VALUE top, VALUE bottom, VALUE left, VALUE right)
+rg_set_padding(VALUE self, VALUE top, VALUE bottom, VALUE left, VALUE right)
 {
     gtk_alignment_set_padding(GTK_ALIGNMENT(RVAL2GOBJ(self)),
                               NUM2UINT(top), NUM2UINT(bottom),
@@ -53,15 +65,15 @@ align_set_padding(VALUE self, VALUE top, VALUE bottom, VALUE left, VALUE right)
 #endif
 
 void 
-Init_gtk_alignment()
+Init_gtk_alignment(VALUE mGtk)
 {
-    VALUE gAlignment = G_DEF_CLASS(GTK_TYPE_ALIGNMENT, "Alignment", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ALIGNMENT, "Alignment", mGtk);
 
-    rb_define_method(gAlignment, "initialize", align_initialize, 4);
-    rb_define_method(gAlignment, "set", align_set, 4);
+    RG_DEF_METHOD(initialize, 4);
+    RG_DEF_METHOD(set, 4);
 #if GTK_CHECK_VERSION(2,4,0)
-    rb_define_method(gAlignment, "padding", align_get_padding, 0);
-    rb_define_method(gAlignment, "set_padding", align_set_padding, 4);
+    RG_DEF_METHOD(padding, 0);
+    RG_DEF_METHOD(set_padding, 4);
 #endif
 
 }

data/ext/gtk2/rbgtkallocation.c

@@ -1,13 +1,23 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkallocation.c -
-
-  $Author: geoff_youngs $
-  $Date: 2004/11/06 10:46:26 $
-
-  Copyright (C) 2002-2004  Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-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"
 
@@ -31,10 +41,11 @@ gtk_allocation_get_type(void)
   return our_type;
 }
 
+#define RG_TARGET_NAMESPACE cAllocation
 #define _SELF(r) ((GtkAllocation*)RVAL2BOXED(r, GTK_TYPE_ALLOCATION))
 
 static VALUE
-alloc_initialize(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
+rg_initialize(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
 {
     GtkAllocation new;
 
@@ -48,7 +59,7 @@ alloc_initialize(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
 }
 
 static VALUE
-alloc_intersect(VALUE self, VALUE other)
+rg_intersect(VALUE self, VALUE other)
 {
     GtkAllocation dest;
     gboolean ret = gdk_rectangle_intersect(_SELF(self), _SELF(other), &dest);
@@ -56,7 +67,7 @@ alloc_intersect(VALUE self, VALUE other)
 }
 
 static VALUE
-alloc_union(VALUE self, VALUE other)
+rg_union(VALUE self, VALUE other)
 {
     GtkAllocation dest;
     gdk_rectangle_union(_SELF(self), _SELF(other), &dest);
@@ -65,59 +76,59 @@ alloc_union(VALUE self, VALUE other)
 
 /* Struct accessors */
 static VALUE
-alloc_x(VALUE self)
+rg_x(VALUE self)
 {
     return INT2NUM(_SELF(self)->x);
 }
 
 static VALUE
-alloc_y(VALUE self)
+rg_y(VALUE self)
 {
     return INT2NUM(_SELF(self)->y);
 }
 
 static VALUE
-alloc_w(VALUE self)
+rg_width(VALUE self)
 {
     return INT2NUM(_SELF(self)->width);
 }
 
 static VALUE
-alloc_h(VALUE self)
+rg_height(VALUE self)
 {
     return INT2NUM(_SELF(self)->height);
 }
 
 static VALUE
-alloc_set_x(VALUE self, VALUE x)
+rg_set_x(VALUE self, VALUE x)
 {
     _SELF(self)->x = NUM2INT(x);
     return self;
 }
 
 static VALUE
-alloc_set_y(VALUE self, VALUE y)
+rg_set_y(VALUE self, VALUE y)
 {
     _SELF(self)->y = NUM2INT(y);
     return self;
 }
 
 static VALUE
-alloc_set_w(VALUE self, VALUE width)
+rg_set_width(VALUE self, VALUE width)
 {
     _SELF(self)->width = NUM2INT(width);
     return self;
 }
 
 static VALUE
-alloc_set_h(VALUE self, VALUE height)
+rg_set_height(VALUE self, VALUE height)
 {
     _SELF(self)->height = NUM2INT(height);
     return self;
 }
 
 static VALUE
-alloc_to_a(VALUE self)
+rg_to_a(VALUE self)
 {
   GtkAllocation* a = _SELF(self);
   return rb_ary_new3(4, INT2FIX(a->x), INT2FIX(a->y),
@@ -125,34 +136,34 @@ alloc_to_a(VALUE self)
 }
 
 static VALUE
-alloc_to_rect(VALUE self)
+rg_to_rect(VALUE self)
 {
     return BOXED2RVAL(_SELF(self), GDK_TYPE_RECTANGLE);
 }
 
 void 
-Init_gtk_allocation()
+Init_gtk_allocation(VALUE mGtk)
 {
-    VALUE galloc;
+    VALUE RG_TARGET_NAMESPACE;
 
-    galloc = G_DEF_CLASS(GTK_TYPE_ALLOCATION, "Allocation", mGtk);
+    RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ALLOCATION, "Allocation", mGtk);
     rbgobj_boxed_not_copy_obj(GTK_TYPE_ALLOCATION);
 
-    rb_define_method(galloc, "initialize", alloc_initialize, 4);
-    rb_define_method(galloc, "intersect", alloc_intersect, 1);
-    rb_define_alias(galloc, "&", "intersect");
-    rb_define_method(galloc, "union", alloc_union, 1);
-    rb_define_alias(galloc, "|", "union");
-    rb_define_method(galloc, "x", alloc_x, 0);
-    rb_define_method(galloc, "y", alloc_y, 0);
-    rb_define_method(galloc, "width", alloc_w, 0);
-    rb_define_method(galloc, "height", alloc_h, 0);
-    rb_define_method(galloc, "set_x", alloc_set_x, 1);
-    rb_define_method(galloc, "set_y", alloc_set_y, 1);
-    rb_define_method(galloc, "set_width", alloc_set_w, 1);
-    rb_define_method(galloc, "set_height", alloc_set_h, 1);
-    rb_define_method(galloc, "to_a", alloc_to_a, 0);
-    rb_define_method(galloc, "to_rect", alloc_to_rect, 0);
-
-    G_DEF_SETTERS(galloc);
+    RG_DEF_METHOD(initialize, 4);
+    RG_DEF_METHOD(intersect, 1);
+    RG_DEF_ALIAS("&", "intersect");
+    RG_DEF_METHOD(union, 1);
+    RG_DEF_ALIAS("|", "union");
+    RG_DEF_METHOD(x, 0);
+    RG_DEF_METHOD(y, 0);
+    RG_DEF_METHOD(width, 0);
+    RG_DEF_METHOD(height, 0);
+    RG_DEF_METHOD(set_x, 1);
+    RG_DEF_METHOD(set_y, 1);
+    RG_DEF_METHOD(set_width, 1);
+    RG_DEF_METHOD(set_height, 1);
+    RG_DEF_METHOD(to_a, 0);
+    RG_DEF_METHOD(to_rect, 0);
+
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/gtk2/rbgtkarrow.c

@@ -1,21 +1,33 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkarrow.c -
-
-  $Author: mutoh $
-  $Date: 2003/08/31 15:29:44 $
-
-  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 cArrow
+
 static VALUE
-arrow_initialize(VALUE self, VALUE arrow_t, VALUE shadow_t)
+rg_initialize(VALUE self, VALUE arrow_t, VALUE shadow_t)
 {
     RBGTK_INITIALIZE(self, gtk_arrow_new(RVAL2GENUM(arrow_t, GTK_TYPE_ARROW_TYPE),
                                          RVAL2GENUM(shadow_t, GTK_TYPE_SHADOW_TYPE)));
@@ -23,23 +35,23 @@ arrow_initialize(VALUE self, VALUE arrow_t, VALUE shadow_t)
 }
 
 static VALUE
-arrow_set(VALUE self, VALUE arrow_t, VALUE shadow_t)
+rg_set(VALUE self, VALUE arrow_t, VALUE shadow_t)
 {
     gtk_arrow_set(GTK_ARROW(RVAL2GOBJ(self)),
-		  RVAL2GENUM(arrow_t, GTK_TYPE_ARROW_TYPE),
-		  RVAL2GENUM(shadow_t, GTK_TYPE_SHADOW_TYPE));
+                  RVAL2GENUM(arrow_t, GTK_TYPE_ARROW_TYPE),
+                  RVAL2GENUM(shadow_t, GTK_TYPE_SHADOW_TYPE));
     return self;
 }
 
 void 
-Init_gtk_arrow()
+Init_gtk_arrow(VALUE mGtk)
 {
-    VALUE gArrow = G_DEF_CLASS(GTK_TYPE_ARROW, "Arrow", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ARROW, "Arrow", mGtk);
 
-    rb_define_method(gArrow, "initialize", arrow_initialize, 2);
-    rb_define_method(gArrow, "set", arrow_set, 2);
+    RG_DEF_METHOD(initialize, 2);
+    RG_DEF_METHOD(set, 2);
 
     /* GtkArrowType (from General constants) */
-    G_DEF_CLASS(GTK_TYPE_ARROW_TYPE, "Type", gArrow);
-    G_DEF_CONSTANTS(gArrow, GTK_TYPE_ARROW_TYPE, "GTK_ARROW_");
+    G_DEF_CLASS(GTK_TYPE_ARROW_TYPE, "Type", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_ARROW_TYPE, "GTK_ARROW_");
 }