gtk2 1.0.3-x86-mingw32 → 1.1.0-x86-mingw32

data/ext/gtk2/rbgdkgeometry.c

@@ -1,19 +1,27 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  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
+ */
 
-  rbgdkgeometry.c -
-
-  $Author: mutoh $
-  $Date: 2003/10/17 16:30:51 $
-
-  Copyright (C) 2002,2003 Masao Mutoh
-
-  This file is derived from rbgdkregion.c.
-  rbgdkregion.c -
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
 #include "global.h"
 
 /*****************************************/
@@ -39,10 +47,11 @@ gdk_geometry_get_type(void)
 }
 /*****************************************/
 
+#define RG_TARGET_NAMESPACE cGeometry
 #define _SELF(g) ((GdkGeometry*)RVAL2BOXED(g, GDK_TYPE_GEOMETRY))
 
 static VALUE
-geo_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     GdkGeometry g;
     G_INITIALIZE(self, &g);
@@ -50,7 +59,7 @@ geo_initialize(VALUE self)
 }
 
 static VALUE
-geo_set(VALUE self, VALUE min_width, VALUE min_height, VALUE max_width, VALUE max_height, VALUE base_width, VALUE base_height, VALUE width_inc, VALUE height_inc, VALUE min_aspect, VALUE max_aspect, VALUE gravity)
+rg_set(VALUE self, VALUE min_width, VALUE min_height, VALUE max_width, VALUE max_height, VALUE base_width, VALUE base_height, VALUE width_inc, VALUE height_inc, VALUE min_aspect, VALUE max_aspect, VALUE gravity)
 {
     GdkGeometry *geo = _SELF(self);
     geo->min_width = NUM2INT(min_width);
@@ -69,178 +78,178 @@ geo_set(VALUE self, VALUE min_width, VALUE min_height, VALUE max_width, VALUE ma
 }
 
 static VALUE
-geo_min_width(VALUE self)
+rg_min_width(VALUE self)
 {
     return INT2NUM(_SELF(self)->min_width);
 }
 
 static VALUE
-geo_min_height(VALUE self)
+rg_min_height(VALUE self)
 {
     return INT2NUM(_SELF(self)->min_height);
 }
 
 static VALUE
-geo_max_width(VALUE self)
+rg_max_width(VALUE self)
 {
     return INT2NUM(_SELF(self)->max_width);
 }
 
 static VALUE
-geo_max_height(VALUE self)
+rg_max_height(VALUE self)
 {
     return INT2NUM(_SELF(self)->max_height);
 }
 
 static VALUE
-geo_base_width(VALUE self)
+rg_base_width(VALUE self)
 {
     return INT2NUM(_SELF(self)->base_width);
 }
 
 static VALUE
-geo_base_height(VALUE self)
+rg_base_height(VALUE self)
 {
     return INT2NUM(_SELF(self)->base_height);
 }
 
 static VALUE
-geo_width_inc(VALUE self)
+rg_width_inc(VALUE self)
 {
     return INT2NUM(_SELF(self)->width_inc);
 }
 
 static VALUE
-geo_height_inc(VALUE self)
+rg_height_inc(VALUE self)
 {
     return INT2NUM(_SELF(self)->height_inc);
 }
 
 static VALUE
-geo_min_aspect(VALUE self)
+rg_min_aspect(VALUE self)
 {
     return rb_float_new(_SELF(self)->min_aspect);
 }
 
 static VALUE
-geo_max_aspect(VALUE self)
+rg_max_aspect(VALUE self)
 {
     return rb_float_new(_SELF(self)->max_aspect);
 }
 
 static VALUE
-geo_win_gravity(VALUE self)
+rg_win_gravity(VALUE self)
 {
     return GENUM2RVAL(_SELF(self)->win_gravity, GDK_TYPE_GRAVITY);
 }
 
 static VALUE
-geo_set_min_width(VALUE self, VALUE min_width)
+rg_set_min_width(VALUE self, VALUE min_width)
 {
     _SELF(self)->min_width = NUM2INT(min_width);
     return self;
 }
 
 static VALUE
-geo_set_min_height(VALUE self, VALUE min_height)
+rg_set_min_height(VALUE self, VALUE min_height)
 {
     _SELF(self)->min_height = NUM2INT(min_height);
     return self;
 }
 
 static VALUE
-geo_set_max_width(VALUE self, VALUE max_width)
+rg_set_max_width(VALUE self, VALUE max_width)
 {
     _SELF(self)->max_width = NUM2INT(max_width);
     return self;
 }
 
 static VALUE
-geo_set_max_height(VALUE self, VALUE max_height)
+rg_set_max_height(VALUE self, VALUE max_height)
 {
     _SELF(self)->max_height = NUM2INT(max_height);
     return self;
 }
 
 static VALUE
-geo_set_base_width(VALUE self, VALUE base_width)
+rg_set_base_width(VALUE self, VALUE base_width)
 {
     _SELF(self)->base_width = NUM2INT(base_width);
     return self;
 }
 
 static VALUE
-geo_set_base_height(VALUE self, VALUE base_height)
+rg_set_base_height(VALUE self, VALUE base_height)
 {
     _SELF(self)->base_height = NUM2INT(base_height);
     return self;
 }
 
 static VALUE
-geo_set_width_inc(VALUE self, VALUE width_inc)
+rg_set_width_inc(VALUE self, VALUE width_inc)
 {
     _SELF(self)->width_inc = NUM2INT(width_inc);
     return self;
 }
 
 static VALUE
-geo_set_height_inc(VALUE self, VALUE height_inc)
+rg_set_height_inc(VALUE self, VALUE height_inc)
 {
     _SELF(self)->height_inc = NUM2INT(height_inc);
     return self;
 }
 
 static VALUE
-geo_set_min_aspect(VALUE self, VALUE min_aspect)
+rg_set_min_aspect(VALUE self, VALUE min_aspect)
 {
     _SELF(self)->min_aspect = NUM2DBL(min_aspect);
     return self;
 }
 
 static VALUE
-geo_set_max_aspect(VALUE self, VALUE max_aspect)
+rg_set_max_aspect(VALUE self, VALUE max_aspect)
 {
     _SELF(self)->max_aspect = NUM2DBL(max_aspect);
     return self;
 }
 
 static VALUE
-geo_set_win_gravity(VALUE self, VALUE gravity)
+rg_set_win_gravity(VALUE self, VALUE gravity)
 {
     _SELF(self)->win_gravity = RVAL2GENUM(gravity, GDK_TYPE_GRAVITY);
     return self;
 }
 
 void 
-Init_gtk_gdk_geometry()
-{
-    VALUE gdkGeometry = G_DEF_CLASS(GDK_TYPE_GEOMETRY, "Geometry", mGdk);
-
-    rb_define_method(gdkGeometry, "initialize", geo_initialize, 0);
-    rb_define_method(gdkGeometry, "min_width", geo_min_width, 0);
-    rb_define_method(gdkGeometry, "min_height", geo_min_height, 0);
-    rb_define_method(gdkGeometry, "max_width", geo_max_width, 0);
-    rb_define_method(gdkGeometry, "max_height", geo_max_height, 0);
-    rb_define_method(gdkGeometry, "base_width", geo_base_width, 0);
-    rb_define_method(gdkGeometry, "base_height", geo_base_height, 0);
-    rb_define_method(gdkGeometry, "width_inc", geo_width_inc, 0);
-    rb_define_method(gdkGeometry, "height_inc", geo_height_inc, 0);
-    rb_define_method(gdkGeometry, "min_aspect", geo_min_aspect, 0);
-    rb_define_method(gdkGeometry, "max_aspect", geo_max_aspect, 0);
-    rb_define_method(gdkGeometry, "win_gravity", geo_win_gravity, 0);
-    rb_define_method(gdkGeometry, "set", geo_set, 11);
-    rb_define_method(gdkGeometry, "set_min_width", geo_set_min_width, 1);
-    rb_define_method(gdkGeometry, "set_min_height", geo_set_min_height, 1);
-    rb_define_method(gdkGeometry, "set_max_width", geo_set_max_width, 1);
-    rb_define_method(gdkGeometry, "set_max_height", geo_set_max_height, 1);
-    rb_define_method(gdkGeometry, "set_base_width", geo_set_base_width, 1);
-    rb_define_method(gdkGeometry, "set_base_height", geo_set_base_height, 1);
-    rb_define_method(gdkGeometry, "set_width_inc", geo_set_width_inc, 1);
-    rb_define_method(gdkGeometry, "set_height_inc", geo_set_height_inc, 1);
-    rb_define_method(gdkGeometry, "set_min_aspect", geo_set_min_aspect, 1);
-    rb_define_method(gdkGeometry, "set_max_aspect", geo_set_max_aspect, 1);
-    rb_define_method(gdkGeometry, "set_win_gravity", geo_set_win_gravity, 1);
-
-    G_DEF_SETTERS(gdkGeometry);
+Init_gtk_gdk_geometry(VALUE mGdk)
+{
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_GEOMETRY, "Geometry", mGdk);
+
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(min_width, 0);
+    RG_DEF_METHOD(min_height, 0);
+    RG_DEF_METHOD(max_width, 0);
+    RG_DEF_METHOD(max_height, 0);
+    RG_DEF_METHOD(base_width, 0);
+    RG_DEF_METHOD(base_height, 0);
+    RG_DEF_METHOD(width_inc, 0);
+    RG_DEF_METHOD(height_inc, 0);
+    RG_DEF_METHOD(min_aspect, 0);
+    RG_DEF_METHOD(max_aspect, 0);
+    RG_DEF_METHOD(win_gravity, 0);
+    RG_DEF_METHOD(set, 11);
+    RG_DEF_METHOD(set_min_width, 1);
+    RG_DEF_METHOD(set_min_height, 1);
+    RG_DEF_METHOD(set_max_width, 1);
+    RG_DEF_METHOD(set_max_height, 1);
+    RG_DEF_METHOD(set_base_width, 1);
+    RG_DEF_METHOD(set_base_height, 1);
+    RG_DEF_METHOD(set_width_inc, 1);
+    RG_DEF_METHOD(set_height_inc, 1);
+    RG_DEF_METHOD(set_min_aspect, 1);
+    RG_DEF_METHOD(set_max_aspect, 1);
+    RG_DEF_METHOD(set_win_gravity, 1);
+
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 
 }

data/ext/gtk2/rbgdkimage.c

@@ -1,23 +1,34 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgdkimage.c -
-
-  $Author: mutoh $
-  $Date: 2003/10/01 15:15:53 $
-
-  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 cImage
 #define _SELF(i) GDK_IMAGE(RVAL2GOBJ(i))
 
 static VALUE
-gdkimage_initialize(VALUE self, VALUE type, VALUE visual, VALUE w, VALUE h)
+rg_initialize(VALUE self, VALUE type, VALUE visual, VALUE w, VALUE h)
 {
     GdkImage* image = gdk_image_new((GdkImageType)RVAL2GENUM(type, GDK_TYPE_IMAGE_TYPE),
                                     GDK_VISUAL(RVAL2GOBJ(visual)),
@@ -32,20 +43,20 @@ gdkimage_initialize(VALUE self, VALUE type, VALUE visual, VALUE w, VALUE h)
 }
 
 static VALUE
-gdkimage_get_colormap(VALUE self)
+rg_colormap(VALUE self)
 {
     return GOBJ2RVAL(gdk_image_get_colormap(_SELF(self)));
 }
 
 static VALUE
-gdkimage_set_colormap(VALUE self, VALUE colormap)
+rg_set_colormap(VALUE self, VALUE colormap)
 {
     gdk_image_set_colormap(_SELF(self), RVAL2GOBJ(colormap));
     return self;
 }
 
 static VALUE
-gdkimage_put_pixel(VALUE self, VALUE x, VALUE y, VALUE pix)
+rg_put_pixel(VALUE self, VALUE x, VALUE y, VALUE pix)
 {
     gdk_image_put_pixel(_SELF(self),
                         NUM2INT(x), NUM2INT(y), NUM2INT(pix));
@@ -53,89 +64,89 @@ gdkimage_put_pixel(VALUE self, VALUE x, VALUE y, VALUE pix)
 }
 
 static VALUE
-gdkimage_get_pixel(VALUE self, VALUE x, VALUE y)
+rg_get_pixel(VALUE self, VALUE x, VALUE y)
 {
     return INT2NUM(gdk_image_get_pixel(_SELF(self),
                                        NUM2INT(x), NUM2INT(y)));
 }
 
 static VALUE
-gdkimage_image_type(VALUE self)
+rg_image_type(VALUE self)
 {
     return GENUM2RVAL((_SELF(self))->type, GDK_TYPE_IMAGE_TYPE);
 }
 
 static VALUE
-gdkimage_visual(VALUE self)
+rg_visual(VALUE self)
 {
     return GOBJ2RVAL((_SELF(self))->visual);
 }
 
 static VALUE
-gdkimage_byte_order(VALUE self)
+rg_byte_order(VALUE self)
 {
     return GENUM2RVAL((_SELF(self))->byte_order, GDK_TYPE_BYTE_ORDER);
 }
 
 static VALUE
-gdkimage_bits_per_pixel(VALUE self)
+rg_bits_per_pixel(VALUE self)
 {
     return INT2NUM((_SELF(self))->bits_per_pixel);
 }
 
 static VALUE
-gdkimage_width(VALUE self)
+rg_width(VALUE self)
 {
     return INT2NUM((_SELF(self))->width);
 }
 
 static VALUE
-gdkimage_height(VALUE self)
+rg_height(VALUE self)
 {
     return INT2NUM((_SELF(self))->height);
 }
 
 static VALUE
-gdkimage_depth(VALUE self)
+rg_depth(VALUE self)
 {
     return INT2NUM((_SELF(self))->depth);
 }
 
 static VALUE
-gdkimage_bpp(VALUE self)
+rg_bpp(VALUE self)
 {
     return INT2NUM((_SELF(self))->bpp);
 }
 
 static VALUE
-gdkimage_bpl(VALUE self)
+rg_bpl(VALUE self)
 {
     return INT2NUM((_SELF(self))->bpl);
 }
 
 void 
-Init_gtk_gdk_image()
+Init_gtk_gdk_image(VALUE mGdk)
 {
-    VALUE gdkImage = G_DEF_CLASS(GDK_TYPE_IMAGE, "Image", mGdk);
-
-    rb_define_method(gdkImage, "initialize", gdkimage_initialize, 4);
-    rb_define_method(gdkImage, "colormap", gdkimage_get_colormap, 0);
-    rb_define_method(gdkImage, "set_colormap", gdkimage_set_colormap, 1);
-    rb_define_method(gdkImage, "put_pixel", gdkimage_put_pixel, 3);
-    rb_define_method(gdkImage, "get_pixel", gdkimage_get_pixel, 2);
-    rb_define_method(gdkImage, "image_type", gdkimage_image_type, 0);
-    rb_define_method(gdkImage, "visual", gdkimage_visual, 0);
-    rb_define_method(gdkImage, "byte_order", gdkimage_byte_order, 0);
-    rb_define_method(gdkImage, "bits_per_pixel", gdkimage_bits_per_pixel, 0);
-    rb_define_method(gdkImage, "width", gdkimage_width, 0);
-    rb_define_method(gdkImage, "height", gdkimage_height, 0);
-    rb_define_method(gdkImage, "depth", gdkimage_depth, 0);
-    rb_define_method(gdkImage, "bpp", gdkimage_bpp, 0);
-    rb_define_method(gdkImage, "bpl", gdkimage_bpl, 0);
-
-    G_DEF_SETTERS(gdkImage);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_IMAGE, "Image", mGdk);
+
+    RG_DEF_METHOD(initialize, 4);
+    RG_DEF_METHOD(colormap, 0);
+    RG_DEF_METHOD(set_colormap, 1);
+    RG_DEF_METHOD(put_pixel, 3);
+    RG_DEF_METHOD(get_pixel, 2);
+    RG_DEF_METHOD(image_type, 0);
+    RG_DEF_METHOD(visual, 0);
+    RG_DEF_METHOD(byte_order, 0);
+    RG_DEF_METHOD(bits_per_pixel, 0);
+    RG_DEF_METHOD(width, 0);
+    RG_DEF_METHOD(height, 0);
+    RG_DEF_METHOD(depth, 0);
+    RG_DEF_METHOD(bpp, 0);
+    RG_DEF_METHOD(bpl, 0);
+
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 
     /* GdkImageType */
-    G_DEF_CLASS(GDK_TYPE_IMAGE_TYPE, "Type", gdkImage);
-    G_DEF_CONSTANTS(gdkImage, GDK_TYPE_IMAGE_TYPE, "GDK_IMAGE_");
+    G_DEF_CLASS(GDK_TYPE_IMAGE_TYPE, "Type", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GDK_TYPE_IMAGE_TYPE, "GDK_IMAGE_");
 }