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

data/ext/gtk2/rbgtkobject.c

@@ -1,19 +1,31 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkobject.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 14:27:10 $
-
-  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 cObject
+
 /*
 We shouldn't implement it.
 void        gtk_object_sink                 (GtkObject *object);
@@ -26,80 +38,34 @@ GtkObject*  gtk_object_new                  (GtkType type,
 */
 
 static VALUE
-gobj_get_type_name(VALUE self)
+rg_type_name(VALUE self)
 {
     return CSTR2RVAL(GTK_OBJECT_TYPE_NAME(RVAL2GOBJ(self)));
 }
 
-/*
-They are all Deprecated.
-void        gtk_object_get                  (GtkObject *object,
-                                             const gchar *first_property_name,
-                                             ...);
-void        gtk_object_set                  (GtkObject *object,
-                                             const gchar *first_property_name,
-                                             ...);
-void        gtk_object_set_data             (GtkObject *object,
-                                             const gchar *key,
-                                             gpointer data);
-void        gtk_object_set_data_full        (GtkObject *object,
-                                             const gchar *key,
-                                             gpointer data,
-                                             GtkDestroyNotify destroy);
-void        gtk_object_remove_data          (GtkObject *object,
-                                             const gchar *key);
-gpointer    gtk_object_get_data             (GtkObject *object,
-                                             const gchar *key);
-void        gtk_object_remove_no_notify     (GtkObject *object,
-                                             const gchar *key);
-void        gtk_object_set_user_data        (GtkObject *object,
-                                             gpointer data);
-gpointer    gtk_object_get_user_data        (GtkObject *object);
-void        gtk_object_add_arg_type         (const gchar *arg_name,
-                                             GtkType arg_type,
-                                             guint arg_flags,
-                                             guint arg_id);
-void        gtk_object_set_data_by_id       (GtkObject *object,
-                                             GQuark data_id,
-                                             gpointer data);
-void        gtk_object_set_data_by_id_full  (GtkObject *object,
-                                             GQuark data_id,
-                                             gpointer data,
-                                             GtkDestroyNotify destroy);
-gpointer    gtk_object_get_data_by_id       (GtkObject *object,
-                                             GQuark data_id);
-void        gtk_object_remove_data_by_id    (GtkObject *object,
-                                             GQuark data_id);
-void        gtk_object_remove_no_notify_by_id
-                                            (GtkObject *object,
-                                             GQuark key_id);
-#define     gtk_object_data_try_key
-#define     gtk_object_data_force_id
-*/
-
 static VALUE
-gobj_destroy(VALUE self)
+rg_destroy(VALUE self)
 {
     gtk_object_destroy(GTK_OBJECT(RVAL2GOBJ(self)));
     return Qnil;
 }
 
 static VALUE
-gobj_get_flags(VALUE self)
+rg_flags(VALUE self)
 {
     /* _GtkObject.flags is int32 */
     return(INT2FIX(GTK_OBJECT_FLAGS(RVAL2GOBJ(self))));
 }
 
 static VALUE
-gobj_set_flags(VALUE self, VALUE flags)
+rg_set_flags(VALUE self, VALUE flags)
 {
     GTK_OBJECT_SET_FLAGS(RVAL2GOBJ(self), NUM2INT(flags));
     return self;
 }
 
 static VALUE
-gobj_unset_flags(VALUE self, VALUE flags)
+rg_unset_flags(VALUE self, VALUE flags)
 {
     GTK_OBJECT_UNSET_FLAGS(RVAL2GOBJ(self), NUM2INT(flags));
     return self;
@@ -107,7 +73,7 @@ gobj_unset_flags(VALUE self, VALUE flags)
 
 /* Move from Bindings */
 static VALUE
-gobj_bindings_activate(VALUE self, VALUE keyval, VALUE modifiers)
+rg_bindings_activate(VALUE self, VALUE keyval, VALUE modifiers)
 {
      return CBOOL2RVAL(gtk_bindings_activate(GTK_OBJECT(RVAL2GOBJ(self)), 
                                              NUM2UINT(keyval),
@@ -116,7 +82,7 @@ gobj_bindings_activate(VALUE self, VALUE keyval, VALUE modifiers)
 
 /* Move from Bindings */
 static VALUE
-gobj_s_binding_set(VALUE self)
+rg_s_binding_set(VALUE self)
 {
     GType gtype;
     gpointer gclass;
@@ -151,29 +117,28 @@ gobj_s_binding_set(VALUE self)
     return BOXED2RVAL(binding_set, GTK_TYPE_BINDING_SET);
 }
 
-
 void 
-Init_gtk_object()
+Init_gtk_object(VALUE mGtk)
 {
-    VALUE gObject = G_DEF_CLASS(GTK_TYPE_OBJECT, "Object", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_OBJECT, "Object", mGtk);
 
-    rb_define_singleton_method(gObject, "binding_set", gobj_s_binding_set, 0);
+    RG_DEF_SMETHOD(binding_set, 0);
 
-    rb_define_method(gObject, "type_name", gobj_get_type_name, 0);
-    rb_define_method(gObject, "flags", gobj_get_flags, 0);
-    rb_define_method(gObject, "set_flags", gobj_set_flags, 1);
-    rb_define_method(gObject, "unset_flags", gobj_unset_flags, 1);
-    rb_define_method(gObject, "destroy", gobj_destroy, 0);
-    rb_define_method(gObject, "bindings_activate", gobj_bindings_activate, 2);
+    RG_DEF_METHOD(type_name, 0);
+    RG_DEF_METHOD(flags, 0);
+    RG_DEF_METHOD(set_flags, 1);
+    RG_DEF_METHOD(unset_flags, 1);
+    RG_DEF_METHOD(destroy, 0);
+    RG_DEF_METHOD(bindings_activate, 2);
 
     /* GtkObjectFlags */
-    G_DEF_CLASS(GTK_TYPE_OBJECT_FLAGS, "Flags", gObject);
-    G_DEF_CONSTANTS(gObject, GTK_TYPE_OBJECT_FLAGS, "GTK_");
+    G_DEF_CLASS(GTK_TYPE_OBJECT_FLAGS, "Flags", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_OBJECT_FLAGS, "GTK_");
 
     /* undef deprecated properties */
-    rb_undef_method(gObject, "user_data");
-    rb_undef_method(gObject, "user_data=");
-    rb_undef_method(gObject, "set_user_data");
+    rb_undef_method(RG_TARGET_NAMESPACE, "user_data");
+    rb_undef_method(RG_TARGET_NAMESPACE, "user_data=");
+    rb_undef_method(RG_TARGET_NAMESPACE, "set_user_data");
 
-    G_DEF_SETTERS(gObject);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }

data/ext/gtk2/rbgtkoptionmenu.c

@@ -1,44 +1,56 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkoptionmenu.c -
-
-  $Author: mutoh $
-  $Date: 2004/05/30 16:41:13 $
-
-  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"
 
 #ifndef GTK_DISABLE_DEPRECATED  /* Since 2.4 */
 
+#define RG_TARGET_NAMESPACE cOptionMenu
+
 static VALUE
-omenu_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_option_menu_new());
     return Qnil;
 }
 
 static VALUE
-omenu_remove_menu(VALUE self)
+rg_remove_menu(VALUE self)
 {
     gtk_option_menu_remove_menu(GTK_OPTION_MENU(RVAL2GOBJ(self)));
     return self;
 }
 
 static VALUE
-omenu_set_history(VALUE self, VALUE index)
+rg_set_history(VALUE self, VALUE index)
 {
     gtk_option_menu_set_history(GTK_OPTION_MENU(RVAL2GOBJ(self)), NUM2INT(index));
     return self;
 }
 
 static VALUE
-omenu_get_history(VALUE self)
+rg_history(VALUE self)
 {
     return INT2NUM(gtk_option_menu_get_history(GTK_OPTION_MENU(RVAL2GOBJ(self))));
 }
@@ -46,15 +58,15 @@ omenu_get_history(VALUE self)
 #endif
 
 void 
-Init_gtk_option_menu()
+Init_gtk_option_menu(VALUE mGtk)
 {
 #ifndef GTK_DISABLE_DEPRECATED  /* Since 2.4 */
-    VALUE gOptionMenu = G_DEF_CLASS(GTK_TYPE_OPTION_MENU, "OptionMenu", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_OPTION_MENU, "OptionMenu", mGtk);
 
-    rb_define_method(gOptionMenu, "initialize", omenu_initialize, 0);
-    rb_define_method(gOptionMenu, "remove_menu", omenu_remove_menu, 0);
-    rb_define_method(gOptionMenu, "set_history", omenu_set_history, 1);
-    G_DEF_SETTER(gOptionMenu, "history");
-    rb_define_method(gOptionMenu, "history", omenu_get_history, 0);
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(remove_menu, 0);
+    RG_DEF_METHOD(set_history, 1);
+    G_DEF_SETTER(RG_TARGET_NAMESPACE, "history");
+    RG_DEF_METHOD(history, 0);
 #endif
 }

data/ext/gtk2/rbgtkpagesetup.c

@@ -1,45 +1,56 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkpagesetup.c -
-
-  $Author: mutoh $
-  $Date: 2006/11/15 23:46:13 $
-
-  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 cPageSetup
 #define _SELF(s) (GTK_PAGE_SETUP(RVAL2GOBJ(s)))
 
 #define RVAL2SIZE(o) (RVAL2BOXED(o, GTK_TYPE_PAPER_SIZE))
 #define RVAL2UNIT(o) (RVAL2GENUM(o, GTK_TYPE_UNIT))
 
 static VALUE
-ps_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     G_INITIALIZE(self, gtk_page_setup_new());
     return Qnil;
 }
 
 static VALUE
-ps_copy(VALUE self)
+rg_dup(VALUE self)
 {
     return GOBJ2RVALU(gtk_page_setup_copy(_SELF(self)));
 }
 
 static VALUE
-ps_get_orientation(VALUE self)
+rg_orientation(VALUE self)
 {
     return GENUM2RVAL(gtk_page_setup_get_orientation(_SELF(self)), 
                       GTK_TYPE_PAGE_ORIENTATION);
 }
 
 static VALUE
-ps_set_orientation(VALUE self, VALUE orientation)
+rg_set_orientation(VALUE self, VALUE orientation)
 {
     gtk_page_setup_set_orientation(_SELF(self), 
                                    RVAL2GENUM(orientation, GTK_TYPE_PAGE_ORIENTATION));
@@ -47,27 +58,27 @@ ps_set_orientation(VALUE self, VALUE orientation)
 }
 
 static VALUE
-ps_get_paper_size(VALUE self)
+rg_paper_size(VALUE self)
 {
     return BOXED2RVAL(gtk_page_setup_get_paper_size(_SELF(self)), GTK_TYPE_PAPER_SIZE);
 }
 
 static VALUE
-ps_set_paper_size(VALUE self, VALUE paper_size)
+rg_set_paper_size(VALUE self, VALUE paper_size)
 {
     gtk_page_setup_set_paper_size(_SELF(self), RVAL2SIZE(paper_size));
     return self;
 }
 
 static VALUE
-ps_get_top_margin(VALUE self, VALUE unit)
+rg_get_top_margin(VALUE self, VALUE unit)
 {
     return rb_float_new(gtk_page_setup_get_top_margin(_SELF(self),
                                                       RVAL2UNIT(unit)));
 }
 
 static VALUE
-ps_set_top_margin(VALUE self, VALUE margin, VALUE unit)
+rg_set_top_margin(VALUE self, VALUE margin, VALUE unit)
 {
     gtk_page_setup_set_top_margin(_SELF(self), NUM2DBL(margin),
                                   RVAL2UNIT(unit));
@@ -75,14 +86,14 @@ ps_set_top_margin(VALUE self, VALUE margin, VALUE unit)
 }
 
 static VALUE
-ps_get_bottom_margin(VALUE self, VALUE unit)
+rg_get_bottom_margin(VALUE self, VALUE unit)
 {
     return rb_float_new(gtk_page_setup_get_bottom_margin(_SELF(self),
                                                          RVAL2UNIT(unit)));
 }
 
 static VALUE
-ps_set_bottom_margin(VALUE self, VALUE margin, VALUE unit)
+rg_set_bottom_margin(VALUE self, VALUE margin, VALUE unit)
 {
     gtk_page_setup_set_bottom_margin(_SELF(self), NUM2DBL(margin),
                                      RVAL2UNIT(unit));
@@ -90,14 +101,14 @@ ps_set_bottom_margin(VALUE self, VALUE margin, VALUE unit)
 }
 
 static VALUE
-ps_get_left_margin(VALUE self, VALUE unit)
+rg_get_left_margin(VALUE self, VALUE unit)
 {
     return rb_float_new(gtk_page_setup_get_left_margin(_SELF(self),
                                                        RVAL2UNIT(unit)));
 }
 
 static VALUE
-ps_set_left_margin(VALUE self, VALUE margin, VALUE unit)
+rg_set_left_margin(VALUE self, VALUE margin, VALUE unit)
 {
     gtk_page_setup_set_left_margin(_SELF(self), NUM2DBL(margin),
                                    RVAL2UNIT(unit));
@@ -105,14 +116,14 @@ ps_set_left_margin(VALUE self, VALUE margin, VALUE unit)
 }
 
 static VALUE
-ps_get_right_margin(VALUE self, VALUE unit)
+rg_get_right_margin(VALUE self, VALUE unit)
 {
     return rb_float_new(gtk_page_setup_get_right_margin(_SELF(self),
                                                         RVAL2UNIT(unit)));
 }
 
 static VALUE
-ps_set_right_margin(VALUE self, VALUE margin, VALUE unit)
+rg_set_right_margin(VALUE self, VALUE margin, VALUE unit)
 {
     gtk_page_setup_set_right_margin(_SELF(self), NUM2DBL(margin),
                                     RVAL2UNIT(unit));
@@ -120,7 +131,7 @@ ps_set_right_margin(VALUE self, VALUE margin, VALUE unit)
 }
 
 static VALUE
-ps_set_paper_size_and_default_margins(VALUE self, VALUE size)
+rg_set_paper_size_and_default_margins(VALUE self, VALUE size)
 {
     gtk_page_setup_set_paper_size_and_default_margins(_SELF(self),
                                                       RVAL2SIZE(size));
@@ -129,14 +140,14 @@ ps_set_paper_size_and_default_margins(VALUE self, VALUE size)
 
 /* These take orientation, but not margins into consideration */
 static VALUE
-ps_get_paper_width(VALUE self, VALUE unit)
+rg_get_paper_width(VALUE self, VALUE unit)
 {
     return rb_float_new(gtk_page_setup_get_paper_width(_SELF(self),
                                                        RVAL2UNIT(unit)));
 }
 
 static VALUE
-ps_get_paper_height(VALUE self, VALUE unit)
+rg_get_paper_height(VALUE self, VALUE unit)
 {
     return rb_float_new(gtk_page_setup_get_paper_height(_SELF(self),
                                                         RVAL2UNIT(unit)));
@@ -144,14 +155,14 @@ ps_get_paper_height(VALUE self, VALUE unit)
 
 /* These take orientation, and margins into consideration */
 static VALUE
-ps_get_page_width(VALUE self, VALUE unit)
+rg_get_page_width(VALUE self, VALUE unit)
 {
     return rb_float_new(gtk_page_setup_get_page_width(_SELF(self),
                                                       RVAL2UNIT(unit)));
 }
 
 static VALUE
-ps_get_page_height(VALUE self, VALUE unit)
+rg_get_page_height(VALUE self, VALUE unit)
 {
     return rb_float_new(gtk_page_setup_get_page_height(_SELF(self),
                                                         RVAL2UNIT(unit)));
@@ -159,38 +170,37 @@ ps_get_page_height(VALUE self, VALUE unit)
 #endif
 
 void
-Init_gtk_page_setup()
+Init_gtk_page_setup(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,10,0)
-    VALUE gPageSetup = G_DEF_CLASS(GTK_TYPE_PAGE_SETUP, "PageSetup", mGtk);
-
-    rb_define_method(gPageSetup, "initialize", ps_initialize, 0);
-    rb_define_method(gPageSetup, "dup", ps_copy, 0);
-
-    rb_define_method(gPageSetup, "orientation", ps_get_orientation, 0);
-    rb_define_method(gPageSetup, "set_orientation", ps_set_orientation, 1);
-    rb_define_method(gPageSetup, "paper_size", ps_get_paper_size, 0);
-    rb_define_method(gPageSetup, "set_paper_size", ps_set_paper_size, 1);
-    rb_define_method(gPageSetup, "get_top_margin", ps_get_top_margin, 1);
-    rb_define_method(gPageSetup, "set_top_margin", ps_set_top_margin, 2);
-    rb_define_method(gPageSetup, "get_bottom_margin", ps_get_bottom_margin, 1);
-    rb_define_method(gPageSetup, "set_bottom_margin", ps_set_bottom_margin, 2);
-    rb_define_method(gPageSetup, "get_left_margin", ps_get_left_margin, 1);
-    rb_define_method(gPageSetup, "set_left_margin", ps_set_left_margin, 2);
-    rb_define_method(gPageSetup, "get_right_margin", ps_get_right_margin, 1);
-    rb_define_method(gPageSetup, "set_right_margin", ps_set_right_margin, 2);
-
-    rb_define_method(gPageSetup, "set_paper_size_and_default_margins",
-                     ps_set_paper_size_and_default_margins, 1);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_PAGE_SETUP, "PageSetup", mGtk);
+
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(dup, 0);
+
+    RG_DEF_METHOD(orientation, 0);
+    RG_DEF_METHOD(set_orientation, 1);
+    RG_DEF_METHOD(paper_size, 0);
+    RG_DEF_METHOD(set_paper_size, 1);
+    RG_DEF_METHOD(get_top_margin, 1);
+    RG_DEF_METHOD(set_top_margin, 2);
+    RG_DEF_METHOD(get_bottom_margin, 1);
+    RG_DEF_METHOD(set_bottom_margin, 2);
+    RG_DEF_METHOD(get_left_margin, 1);
+    RG_DEF_METHOD(set_left_margin, 2);
+    RG_DEF_METHOD(get_right_margin, 1);
+    RG_DEF_METHOD(set_right_margin, 2);
+
+    RG_DEF_METHOD(set_paper_size_and_default_margins, 1);
 
     /* These take orientation, but not margins into consideration */
-    rb_define_method(gPageSetup, "get_paper_width", ps_get_paper_width, 1);
-    rb_define_method(gPageSetup, "get_paper_height", ps_get_paper_height, 1);
+    RG_DEF_METHOD(get_paper_width, 1);
+    RG_DEF_METHOD(get_paper_height, 1);
 
     /* These take orientation, and margins into consideration */
-    rb_define_method(gPageSetup, "get_page_width", ps_get_page_width, 1);
-    rb_define_method(gPageSetup, "get_page_height", ps_get_page_height, 1);
+    RG_DEF_METHOD(get_page_width, 1);
+    RG_DEF_METHOD(get_page_height, 1);
 
-    G_DEF_SETTERS(gPageSetup);
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 #endif
 }