gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtkpagesetupunixdialog.c

@@ -1,23 +1,34 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkpagesetupunixdialog.c -
-
-  $Author: mutoh $
-  $Date: 2006/12/26 15:47:52 $
-
-  Copyright (C) 2006 Ruby-GNOME2 Project Team
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2006  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"
 
 #ifdef HAVE_GTK_UNIX_PRINT
 #include <gtk/gtkpagesetupunixdialog.h>
 
+#define RG_TARGET_NAMESPACE cPageSetupUnixDialog
 #define _SELF(s) (GTK_PAGE_SETUP_UNIX_DIALOG(RVAL2GOBJ(s)))
 
 static VALUE
-psud_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     GtkWidget *dialog;
     VALUE title, parent;
@@ -30,7 +41,7 @@ psud_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-psud_set_page_setup(VALUE self, VALUE page_setup)
+rg_set_page_setup(VALUE self, VALUE page_setup)
 {
     gtk_page_setup_unix_dialog_set_page_setup(_SELF(self),
                                               RVAL2GOBJ(page_setup));
@@ -38,13 +49,13 @@ psud_set_page_setup(VALUE self, VALUE page_setup)
 }
 
 static VALUE
-psud_get_page_setup(VALUE self)
+rg_page_setup(VALUE self)
 {
     return GOBJ2RVAL(gtk_page_setup_unix_dialog_get_page_setup(_SELF(self)));
 }
 
 static VALUE
-psud_set_print_settings(VALUE self, VALUE print_settings)
+rg_set_print_settings(VALUE self, VALUE print_settings)
 {
     gtk_page_setup_unix_dialog_set_print_settings(_SELF(self),
                                                   RVAL2GOBJ(print_settings));
@@ -52,29 +63,25 @@ psud_set_print_settings(VALUE self, VALUE print_settings)
 }
 
 static VALUE
-psud_get_print_settings(VALUE self)
+rg_print_settings(VALUE self)
 {
     return GOBJ2RVAL(gtk_page_setup_unix_dialog_get_print_settings(_SELF(self)));
 }
 #endif
 
 void
-Init_gtk_page_setup_unix_dialog()
+Init_gtk_page_setup_unix_dialog(VALUE mGtk)
 {
-#if HAVE_GTK_UNIX_PRINT
-    VALUE gPageSetupUnixDialog = G_DEF_CLASS(GTK_TYPE_PAGE_SETUP_UNIX_DIALOG,
+#ifdef HAVE_GTK_UNIX_PRINT
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_PAGE_SETUP_UNIX_DIALOG,
                                              "PageSetupUnixDialog", mGtk);
 
-    rb_define_method(gPageSetupUnixDialog, "initialize", psud_initialize, -1);
-    rb_define_method(gPageSetupUnixDialog, "set_page_setup",
-                     psud_set_page_setup, 1);
-    rb_define_method(gPageSetupUnixDialog, "page_setup",
-                     psud_get_page_setup, 0);
-    rb_define_method(gPageSetupUnixDialog, "set_print_settings",
-                     psud_set_print_settings, 1);
-    rb_define_method(gPageSetupUnixDialog, "print_settings",
-                     psud_get_print_settings, 0);
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD(set_page_setup, 1);
+    RG_DEF_METHOD(page_setup, 0);
+    RG_DEF_METHOD(set_print_settings, 1);
+    RG_DEF_METHOD(print_settings, 0);
 
-    G_DEF_SETTERS(gPageSetupUnixDialog);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 #endif
 }

data/ext/gtk2/rbgtkpaned.c

@@ -1,39 +1,49 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkpaned.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  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 cPaned
 #define _SELF(self) (GTK_PANED(RVAL2GOBJ(self)))
 #define RVAL2WIDGET(w) (GTK_WIDGET(RVAL2GOBJ(w)))
 
-
 static VALUE
-paned_add1(VALUE self, VALUE child)
+rg_add1(VALUE self, VALUE child)
 {
     gtk_paned_add1(_SELF(self), RVAL2WIDGET(child));
     return self;
 }
 
 static VALUE
-paned_add2(VALUE self, VALUE child)
+rg_add2(VALUE self, VALUE child)
 {
     gtk_paned_add2(_SELF(self), RVAL2WIDGET(child));
     return self;
 }
 
 static VALUE
-paned_pack1(VALUE self, VALUE child, VALUE resize, VALUE shrink)
+rg_pack1(VALUE self, VALUE child, VALUE resize, VALUE shrink)
 {
     gtk_paned_pack1(_SELF(self), RVAL2WIDGET(child),
                     RVAL2CBOOL(resize), RVAL2CBOOL(shrink));
@@ -41,7 +51,7 @@ paned_pack1(VALUE self, VALUE child, VALUE resize, VALUE shrink)
 }
 
 static VALUE
-paned_pack2(VALUE self, VALUE child, VALUE resize, VALUE shrink)
+rg_pack2(VALUE self, VALUE child, VALUE resize, VALUE shrink)
 {
     gtk_paned_pack2(_SELF(self), RVAL2WIDGET(child),
                     RVAL2CBOOL(resize), RVAL2CBOOL(shrink));
@@ -49,56 +59,56 @@ paned_pack2(VALUE self, VALUE child, VALUE resize, VALUE shrink)
 }
 
 static VALUE
-paned_child1(VALUE self)
+rg_child1(VALUE self)
 {
     GtkWidget *child = _SELF(self)->child1;
     return (child == NULL) ? Qnil : GOBJ2RVAL(child);
 }
 
 static VALUE
-paned_child2(VALUE self)
+rg_child2(VALUE self)
 {
     GtkWidget *child = _SELF(self)->child2;
     return (child == NULL) ? Qnil : GOBJ2RVAL(child);
 }
 
 static VALUE
-paned_child1_resize(VALUE self)
+rg_child1_resize_p(VALUE self)
 {
     return CBOOL2RVAL(_SELF(self)->child1_resize);
 }
 
 static VALUE
-paned_child1_shrink(VALUE self)
+rg_child1_shrink_p(VALUE self)
 {
     return CBOOL2RVAL(_SELF(self)->child1_shrink);
 }
 
 static VALUE
-paned_child2_resize(VALUE self)
+rg_child2_resize_p(VALUE self)
 {
     return CBOOL2RVAL(_SELF(self)->child2_resize);
 }
 
 static VALUE
-paned_child2_shrink(VALUE self)
+rg_child2_shrink_p(VALUE self)
 {
     return CBOOL2RVAL(_SELF(self)->child2_shrink);
 }
 
 void 
-Init_gtk_paned()
+Init_gtk_paned(VALUE mGtk)
 {
-    VALUE gPaned = G_DEF_CLASS(GTK_TYPE_PANED, "Paned", mGtk);
-
-    rb_define_method(gPaned, "add1", paned_add1, 1);
-    rb_define_method(gPaned, "add2", paned_add2, 1);
-    rb_define_method(gPaned, "pack1", paned_pack1, 3);
-    rb_define_method(gPaned, "pack2", paned_pack2, 3);
-    rb_define_method(gPaned, "child1", paned_child1, 0);
-    rb_define_method(gPaned, "child2", paned_child2, 0);
-    rb_define_method(gPaned, "child1_resize?", paned_child1_resize, 0);
-    rb_define_method(gPaned, "child1_shrink?", paned_child1_shrink, 0);
-    rb_define_method(gPaned, "child2_resize?", paned_child2_resize, 0);
-    rb_define_method(gPaned, "child2_shrink?", paned_child2_shrink, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_PANED, "Paned", mGtk);
+
+    RG_DEF_METHOD(add1, 1);
+    RG_DEF_METHOD(add2, 1);
+    RG_DEF_METHOD(pack1, 3);
+    RG_DEF_METHOD(pack2, 3);
+    RG_DEF_METHOD(child1, 0);
+    RG_DEF_METHOD(child2, 0);
+    RG_DEF_METHOD_P(child1_resize, 0);
+    RG_DEF_METHOD_P(child1_shrink, 0);
+    RG_DEF_METHOD_P(child2_resize, 0);
+    RG_DEF_METHOD_P(child2_shrink, 0);
 }

data/ext/gtk2/rbgtkpapersize.c

@@ -1,25 +1,36 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkpapersize.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  Copyright (C) 2006 Ruby-GNOME2 Project Team
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2006  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,10,0)
 
+#define RG_TARGET_NAMESPACE cPaperSize
 #define _SELF(s) (RVAL2BOXED(s, GTK_TYPE_PAPER_SIZE))
 #define SIZE2RVAL(o) (BOXED2RVAL(o, GTK_TYPE_PAPER_SIZE))
 
 #define RVAL2UNIT(o) (RVAL2GENUM(o, GTK_TYPE_UNIT))
 
 static VALUE
-ps_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     GtkPaperSize *size;
 
@@ -48,7 +59,7 @@ ps_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-ps_is_equal(VALUE self, VALUE other)
+rg_operator_equal(VALUE self, VALUE other)
 {
     return CBOOL2RVAL(RVAL2CBOOL(rb_equal(rb_obj_class(self), rb_obj_class(other))) &&
                       gtk_paper_size_is_equal(_SELF(self), _SELF(other)));
@@ -56,131 +67,126 @@ ps_is_equal(VALUE self, VALUE other)
 
 /* The width is always the shortest side, measure in mm */
 static VALUE
-ps_get_name(VALUE self)
+rg_name(VALUE self)
 {
     return CSTR2RVAL(gtk_paper_size_get_name(_SELF(self)));
 }
 
 static VALUE
-ps_get_display_name(VALUE self)
+rg_display_name(VALUE self)
 {
     return CSTR2RVAL(gtk_paper_size_get_display_name(_SELF(self)));
 }
 
 static VALUE
-ps_get_ppd_name(VALUE self)
+rg_ppd_name(VALUE self)
 {
     return CSTR2RVAL(gtk_paper_size_get_ppd_name(_SELF(self)));
 }
 
 static VALUE
-ps_get_width(VALUE self, VALUE unit)
+rg_get_width(VALUE self, VALUE unit)
 {
     return rb_float_new(gtk_paper_size_get_width(_SELF(self), RVAL2UNIT(unit)));
 }
 
 static VALUE
-ps_get_height(VALUE self, VALUE unit)
+rg_get_height(VALUE self, VALUE unit)
 {
     return rb_float_new(gtk_paper_size_get_height(_SELF(self), RVAL2UNIT(unit)));
 }
 
 static VALUE
-ps_is_custom(VALUE self)
+rg_custom_p(VALUE self)
 {
     return CBOOL2RVAL(gtk_paper_size_is_custom(_SELF(self)));
 }
 
 /* Only for custom sizes: */
 static VALUE
-ps_set_size(VALUE self, VALUE width, VALUE height, VALUE unit)
+rg_set_size(VALUE self, VALUE width, VALUE height, VALUE unit)
 {
     gtk_paper_size_set_size(_SELF(self), NUM2DBL(width), NUM2DBL(height),
                             RVAL2UNIT(unit));
     return self;
 }
 
-
 static VALUE
-ps_get_default_top_margin(VALUE self, VALUE unit)
+rg_get_default_top_margin(VALUE self, VALUE unit)
 {
     return rb_float_new(gtk_paper_size_get_default_top_margin(_SELF(self),
                                                               RVAL2UNIT(unit)));
 }
 
 static VALUE
-ps_get_default_bottom_margin(VALUE self, VALUE unit)
+rg_get_default_bottom_margin(VALUE self, VALUE unit)
 {
     return rb_float_new(gtk_paper_size_get_default_bottom_margin(_SELF(self),
                                                                  RVAL2UNIT(unit)));
 }
 
 static VALUE
-ps_get_default_left_margin(VALUE self, VALUE unit)
+rg_get_default_left_margin(VALUE self, VALUE unit)
 {
     return rb_float_new(gtk_paper_size_get_default_left_margin(_SELF(self),
                                                                RVAL2UNIT(unit)));
 }
 
 static VALUE
-ps_get_default_right_margin(VALUE self, VALUE unit)
+rg_get_default_right_margin(VALUE self, VALUE unit)
 {
     return rb_float_new(gtk_paper_size_get_default_right_margin(_SELF(self),
                                                                 RVAL2UNIT(unit)));
 }
 
 static VALUE
-ps_s_get_default(VALUE self)
+rg_s_default(G_GNUC_UNUSED VALUE self)
 {
     return CSTR2RVAL(gtk_paper_size_get_default());
 }
 #endif
 
 void
-Init_gtk_paper_size()
+Init_gtk_paper_size(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,10,0)
-    VALUE gPaperSize = G_DEF_CLASS(GTK_TYPE_PAPER_SIZE, "PaperSize", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_PAPER_SIZE, "PaperSize", mGtk);
 
-    rb_define_singleton_method(gPaperSize, "default", ps_s_get_default, 0);
+    RG_DEF_SMETHOD(default, 0);
 
-    rb_define_const(gPaperSize, "A3", CSTR2RVAL(GTK_PAPER_NAME_A3));
-    rb_define_const(gPaperSize, "A4", CSTR2RVAL(GTK_PAPER_NAME_A4));
-    rb_define_const(gPaperSize, "A5", CSTR2RVAL(GTK_PAPER_NAME_A5));
-    rb_define_const(gPaperSize, "B5", CSTR2RVAL(GTK_PAPER_NAME_B5));
-    rb_define_const(gPaperSize, "LETTER", CSTR2RVAL(GTK_PAPER_NAME_LETTER));
-    rb_define_const(gPaperSize, "EXECUTIVE",
+    rb_define_const(RG_TARGET_NAMESPACE, "A3", CSTR2RVAL(GTK_PAPER_NAME_A3));
+    rb_define_const(RG_TARGET_NAMESPACE, "A4", CSTR2RVAL(GTK_PAPER_NAME_A4));
+    rb_define_const(RG_TARGET_NAMESPACE, "A5", CSTR2RVAL(GTK_PAPER_NAME_A5));
+    rb_define_const(RG_TARGET_NAMESPACE, "B5", CSTR2RVAL(GTK_PAPER_NAME_B5));
+    rb_define_const(RG_TARGET_NAMESPACE, "LETTER", CSTR2RVAL(GTK_PAPER_NAME_LETTER));
+    rb_define_const(RG_TARGET_NAMESPACE, "EXECUTIVE",
                     CSTR2RVAL(GTK_PAPER_NAME_EXECUTIVE));
-    rb_define_const(gPaperSize, "LEGAL", CSTR2RVAL(GTK_PAPER_NAME_LEGAL));
+    rb_define_const(RG_TARGET_NAMESPACE, "LEGAL", CSTR2RVAL(GTK_PAPER_NAME_LEGAL));
 
-    rb_define_method(gPaperSize, "initialize", ps_initialize, -1);
-    rb_define_method(gPaperSize, "==", ps_is_equal, 1);
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD_OPERATOR("==", equal, 1);
 
-    rb_define_method(gPaperSize, "name", ps_get_name, 0);
-    rb_define_method(gPaperSize, "display_name", ps_get_display_name, 0);
-    rb_define_method(gPaperSize, "ppd_name", ps_get_ppd_name, 0);
+    RG_DEF_METHOD(name, 0);
+    RG_DEF_METHOD(display_name, 0);
+    RG_DEF_METHOD(ppd_name, 0);
 
-    rb_define_method(gPaperSize, "get_width", ps_get_width, 1);
-    rb_define_method(gPaperSize, "get_height", ps_get_height, 1);
+    RG_DEF_METHOD(get_width, 1);
+    RG_DEF_METHOD(get_height, 1);
 
-    rb_define_method(gPaperSize, "custom?", ps_is_custom, 0);
+    RG_DEF_METHOD_P(custom, 0);
 
-    rb_define_method(gPaperSize, "set_size", ps_set_size, 3);
+    RG_DEF_METHOD(set_size, 3);
 
-    rb_define_method(gPaperSize, "get_default_top_margin",
-                     ps_get_default_top_margin, 1);
-    rb_define_method(gPaperSize, "get_default_bottom_margin",
-                     ps_get_default_bottom_margin, 1);
-    rb_define_method(gPaperSize, "get_default_left_margin",
-                     ps_get_default_left_margin, 1);
-    rb_define_method(gPaperSize, "get_default_right_margin",
-                     ps_get_default_right_margin, 1);
+    RG_DEF_METHOD(get_default_top_margin, 1);
+    RG_DEF_METHOD(get_default_bottom_margin, 1);
+    RG_DEF_METHOD(get_default_left_margin, 1);
+    RG_DEF_METHOD(get_default_right_margin, 1);
 
-    G_DEF_SETTERS(gPaperSize);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 
     /* GtkUnit */
-    G_DEF_CLASS(GTK_TYPE_UNIT, "Unit", gPaperSize);
-    G_DEF_CONSTANTS(gPaperSize, GTK_TYPE_UNIT, "GTK_");
+    G_DEF_CLASS(GTK_TYPE_UNIT, "Unit", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_UNIT, "GTK_");
 
 #endif
 }