gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtkbuilder.c

@@ -1,15 +1,30 @@
-/* -*- c-file-style: "ruby" -*- */
-/************************************************
-
-  rbgtkbuilder.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"
 #include <glib-enum-types.h> /* From Ruby/GLib2 */
 
 #if GTK_CHECK_VERSION(2, 12, 0)
+
+#define RG_TARGET_NAMESPACE cBuilder
 #define _SELF(self) (GTK_BUILDER(RVAL2GOBJ(self)))
 
 static ID id___connect_signals__;
@@ -26,7 +41,7 @@ builder_mark(gpointer object)
 }
 
 static VALUE
-builder_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     GtkBuilder *builder;
 
@@ -37,7 +52,7 @@ builder_initialize(VALUE self)
 }
 
 static VALUE
-builder_add_from_file(VALUE self, VALUE filename)
+rg_add_from_file(VALUE self, VALUE filename)
 {
     GError *error = NULL;
 
@@ -50,7 +65,7 @@ builder_add_from_file(VALUE self, VALUE filename)
 }
 
 static VALUE
-builder_add_from_string(VALUE self, VALUE string)
+rg_add_from_string(VALUE self, VALUE string)
 {
     GError *error = NULL;
 
@@ -65,91 +80,91 @@ builder_add_from_string(VALUE self, VALUE string)
 }
 
 static VALUE
-builder_add(VALUE self, VALUE filename_or_xml)
+rg_add(VALUE self, VALUE filename_or_xml)
 {
     const char xml_detect_re_str[] = "(?:\\A<|[\\r\\n])";
     VALUE xml_detect_re;
 
     xml_detect_re = rb_reg_new(xml_detect_re_str, strlen(xml_detect_re_str), 0);
     if (NIL_P(rb_reg_match(xml_detect_re, filename_or_xml)))
-        return builder_add_from_file(self, filename_or_xml);
+        return rg_add_from_file(self, filename_or_xml);
     else
-        return builder_add_from_string(self, filename_or_xml);
+        return rg_add_from_string(self, filename_or_xml);
 }
 
 static VALUE
-builder_get_object(VALUE self, VALUE name)
+rg_get_object(VALUE self, VALUE name)
 {
     return GOBJ2RVAL(gtk_builder_get_object(_SELF(self), RVAL2CSTR(name)));
 }
 
 static VALUE
-builder_get_objects(VALUE self)
+rg_objects(VALUE self)
 {
     return GSLIST2ARY_FREE(gtk_builder_get_objects(_SELF(self)));
 }
 
 static void
 connect_signals(GtkBuilder *builder, GObject *object, const gchar *signal_name,
-		const gchar *handler_name, GObject *connect_object,
-		GConnectFlags flags, gpointer user_data)
+                const gchar *handler_name, GObject *connect_object,
+                GConnectFlags flags, gpointer user_data)
 {
     VALUE signal_connector = (VALUE)user_data;
 
     rb_funcall(GOBJ2RVAL(builder), id___connect_signals__, 6,
-	       signal_connector, GOBJ2RVAL(object), CSTR2RVAL(signal_name),
-	       CSTR2RVAL(handler_name), GOBJ2RVAL(connect_object),
-	       GFLAGS2RVAL(flags, G_TYPE_CONNECT_FLAGS));
+               signal_connector, GOBJ2RVAL(object), CSTR2RVAL(signal_name),
+               CSTR2RVAL(handler_name), GOBJ2RVAL(connect_object),
+               GFLAGS2RVAL(flags, G_TYPE_CONNECT_FLAGS));
 }
 
 static VALUE
-builder_connect_signals(VALUE self)
+rg_connect_signals(VALUE self)
 {
     VALUE signal_connector;
 
     signal_connector = rb_block_proc();
     G_CHILD_ADD(self, signal_connector);
     gtk_builder_connect_signals_full(_SELF(self), connect_signals,
-				     (gpointer)signal_connector);
+                                     (gpointer)signal_connector);
     G_CHILD_REMOVE(self, signal_connector);
 
     return self;
 }
 
 static VALUE
-builder_get_type_from_name(VALUE self, VALUE name)
+rg_get_type(VALUE self, VALUE name)
 {
     return GTYPE2CLASS(gtk_builder_get_type_from_name(_SELF(self),
-						      RVAL2CSTR(name)));
+                                                      RVAL2CSTR(name)));
 }
 #endif
 
 void
-Init_gtk_builder()
+Init_gtk_builder(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2, 12, 0)
-    VALUE gBuilder;
+    VALUE RG_TARGET_NAMESPACE;
 
     id___connect_signals__ = rb_intern("__connect_signals__");
 
-    gBuilder = G_DEF_CLASS_WITH_GC_FUNC(GTK_TYPE_BUILDER, "Builder", mGtk,
-					builder_mark, NULL);
+    RG_TARGET_NAMESPACE = G_DEF_CLASS_WITH_GC_FUNC(GTK_TYPE_BUILDER, "Builder", mGtk,
+                                                    builder_mark, NULL);
 
     G_DEF_CLASS(GTK_TYPE_BUILDER_ERROR, "BuilderError", mGtk);
 
-    rb_define_method(gBuilder, "initialize", builder_initialize, 0);
+    RG_DEF_METHOD(initialize, 0);
 
-    rb_define_method(gBuilder, "add_from_file", builder_add_from_file, 1);
-    rb_define_method(gBuilder, "add_from_string", builder_add_from_string, 1);
-    rb_define_method(gBuilder, "add", builder_add, 1);
-    rb_define_alias(gBuilder, "<<", "add");
+    RG_DEF_METHOD(add_from_file, 1);
+    RG_DEF_METHOD(add_from_string, 1);
+    RG_DEF_METHOD(add, 1);
+    RG_DEF_ALIAS("<<", "add");
 
-    rb_define_method(gBuilder, "get_object", builder_get_object, 1);
-    rb_define_alias(gBuilder, "[]", "get_object");
-    rb_define_method(gBuilder, "objects", builder_get_objects, 0);
+    RG_DEF_METHOD(get_object, 1);
+    RG_DEF_ALIAS("[]", "get_object");
+    RG_DEF_METHOD(objects, 0);
 
-    rb_define_method(gBuilder, "connect_signals", builder_connect_signals, 0);
+    RG_DEF_METHOD(connect_signals, 0);
 
-    rb_define_method(gBuilder, "get_type", builder_get_type_from_name, 1);
+    RG_DEF_METHOD(get_type, 1);
 #endif
 }

data/ext/gtk2/rbgtkbutton.c

@@ -1,23 +1,34 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkbutton.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  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 cButton
 #define _SELF(self) (GTK_BUTTON(RVAL2GOBJ(self)))
 
 static VALUE
-button_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE label, use_underline;
     GtkWidget *widget = NULL;
@@ -36,7 +47,7 @@ button_initialize(int argc, VALUE *argv, VALUE self)
                      rb_class2name(CLASS_OF(label)));
         }
     } else {
-	widget = gtk_button_new();
+        widget = gtk_button_new();
     }
 
     RBGTK_INITIALIZE(self, widget); 
@@ -44,28 +55,28 @@ button_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-button_pressed(VALUE self)
+rg_pressed(VALUE self)
 {
     gtk_button_pressed(GTK_BUTTON(RVAL2GOBJ(self)));
     return self;
 }
 
 static VALUE
-button_released(VALUE self)
+rg_released(VALUE self)
 {
     gtk_button_released(_SELF(self));
     return self;
 }
 
 static VALUE
-button_enter(VALUE self)
+rg_enter(VALUE self)
 {
     gtk_button_enter(_SELF(self));
     return self;
 }
 
 static VALUE
-button_leave(VALUE self)
+rg_leave(VALUE self)
 {
     gtk_button_leave(_SELF(self));
     return self;
@@ -73,14 +84,14 @@ button_leave(VALUE self)
 
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-button_set_alignment(VALUE self, VALUE xalign, VALUE yalign)
+rg_set_alignment(VALUE self, VALUE xalign, VALUE yalign)
 {
     gtk_button_set_alignment(_SELF(self), NUM2DBL(xalign), NUM2DBL(yalign));
     return self;
 }
 
 static VALUE
-button_get_alignment(VALUE self)
+rg_alignment(VALUE self)
 {
     gfloat xalign, yalign;
     gtk_button_get_alignment(_SELF(self), &xalign, &yalign);
@@ -89,45 +100,20 @@ button_get_alignment(VALUE self)
 }
 #endif
 
-/* Defined as properties.
-void        gtk_button_set_relief           (GtkButton *button,
-                                             GtkReliefStyle newstyle);
-GtkReliefStyle gtk_button_get_relief        (GtkButton *button);
-const gchar* gtk_button_get_label           (GtkButton *button);
-void        gtk_button_set_label            (GtkButton *button,
-                                             const gchar *label);
-gboolean    gtk_button_get_use_stock        (GtkButton *button);
-void        gtk_button_set_use_stock        (GtkButton *button,
-                                             gboolean use_stock);
-gboolean    gtk_button_get_use_underline    (GtkButton *button);
-void        gtk_button_set_use_underline    (GtkButton *button,
-                                             gboolean use_underline);
-void        gtk_button_set_focus_on_click   (GtkButton *button,
-                                             gboolean focus_on_click);
-gboolean    gtk_button_get_focus_on_click   (GtkButton *button);
-void        gtk_button_set_image            (GtkButton *button,
-                                             GtkWidget *image);
-GtkWidget*  gtk_button_get_image            (GtkButton *button);
-void        gtk_button_set_image_position   (GtkButton *button,
-                                             GtkPositionType position);
-GtkPositionType gtk_button_get_image_position
-                                            (GtkButton *button);
-*/
-
 void 
-Init_gtk_button()
+Init_gtk_button(VALUE mGtk)
 {
-    VALUE gButton = G_DEF_CLASS(GTK_TYPE_BUTTON, "Button", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_BUTTON, "Button", mGtk);
 
-    rb_define_method(gButton, "initialize", button_initialize, -1);
-    rb_define_method(gButton, "pressed", button_pressed, 0);
-    rb_define_method(gButton, "released", button_released, 0);
-    rb_define_method(gButton, "enter", button_enter, 0);
-    rb_define_method(gButton, "leave", button_leave, 0);
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD(pressed, 0);
+    RG_DEF_METHOD(released, 0);
+    RG_DEF_METHOD(enter, 0);
+    RG_DEF_METHOD(leave, 0);
 
 #if GTK_CHECK_VERSION(2,4,0)
-    rb_define_method(gButton, "set_alignment", button_set_alignment, 2);
-    G_DEF_SETTER(gButton, "alignment");
-    rb_define_method(gButton, "alignment", button_get_alignment, 0);
+    RG_DEF_METHOD(set_alignment, 2);
+    G_DEF_SETTER(RG_TARGET_NAMESPACE, "alignment");
+    RG_DEF_METHOD(alignment, 0);
 #endif
 }

data/ext/gtk2/rbgtkcalendar.c

@@ -1,30 +1,41 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkcalendar.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 cCalendar
 #define _SELF(self) (GTK_CALENDAR(RVAL2GOBJ(self)))
 
 static VALUE
-cal_init(VALUE self)
+rg_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_calendar_new());
     return Qnil;
 }
 
 static VALUE
-cal_select_month(VALUE self, VALUE month, VALUE year)
+rg_select_month(VALUE self, VALUE month, VALUE year)
 {
     gint ret = gtk_calendar_select_month(_SELF(self),
                                          NUM2INT(month)-1,
@@ -33,35 +44,35 @@ cal_select_month(VALUE self, VALUE month, VALUE year)
 }
 
 static VALUE
-cal_select_day(VALUE self, VALUE day)
+rg_select_day(VALUE self, VALUE day)
 {
     gtk_calendar_select_day(_SELF(self), NUM2INT(day));
     return self;
 }
 
 static VALUE
-cal_mark_day(VALUE self, VALUE day)
+rg_mark_day(VALUE self, VALUE day)
 {
     gtk_calendar_mark_day(_SELF(self), NUM2INT(day));
     return self;
 }
 
 static VALUE
-cal_unmark_day(VALUE self, VALUE day)
+rg_unmark_day(VALUE self, VALUE day)
 {
     gtk_calendar_unmark_day(_SELF(self), NUM2INT(day));
     return self;
 }
 
 static VALUE
-cal_clear_marks(VALUE self)
+rg_clear_marks(VALUE self)
 {
     gtk_calendar_clear_marks(_SELF(self));
     return self;
 }
 
 static VALUE
-cal_get_date(VALUE self)
+rg_date(VALUE self)
 {
     VALUE ret;
     guint year, month, day;
@@ -75,21 +86,21 @@ cal_get_date(VALUE self)
 }
 
 static VALUE
-cal_freeze(VALUE self)
+rg_freeze(VALUE self)
 {
     gtk_calendar_freeze(_SELF(self));
     return self;
 }
 
 static VALUE
-cal_thaw(VALUE self)
+rg_thaw(VALUE self)
 {
     gtk_calendar_thaw(_SELF(self));
     return self;
 }
 
 static VALUE
-cal_get_display_options(int argc, VALUE *argv, VALUE self)
+rg_display_options(int argc, VALUE *argv, VALUE self)
 {
     VALUE flags;
     rb_scan_args(argc, argv, "01", &flags);
@@ -112,7 +123,7 @@ cal_get_display_options(int argc, VALUE *argv, VALUE self)
 
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-cal_set_display_options(VALUE self, VALUE flags)
+rg_set_display_options(VALUE self, VALUE flags)
 {
     gtk_calendar_set_display_options(_SELF(self), 
                                      RVAL2GFLAGS(flags, 
@@ -122,25 +133,25 @@ cal_set_display_options(VALUE self, VALUE flags)
 #endif
 
 void 
-Init_gtk_calendar()
+Init_gtk_calendar(VALUE mGtk)
 {
-    VALUE gCalendar = G_DEF_CLASS(GTK_TYPE_CALENDAR, "Calendar", mGtk);
-
-    rb_define_method(gCalendar, "initialize", cal_init, 0);
-    rb_define_method(gCalendar, "select_month", cal_select_month, 2);
-    rb_define_method(gCalendar, "select_day", cal_select_day, 1);
-    rb_define_method(gCalendar, "mark_day", cal_mark_day, 1);
-    rb_define_method(gCalendar, "unmark_day", cal_unmark_day, 1);
-    rb_define_method(gCalendar, "clear_marks", cal_clear_marks, 0);
-    rb_define_method(gCalendar, "date", cal_get_date, 0);
-    rb_define_method(gCalendar, "freeze", cal_freeze, 0);
-    rb_define_method(gCalendar, "thaw", cal_thaw, 0);
-    rb_define_method(gCalendar, "display_options", cal_get_display_options, -1);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_CALENDAR, "Calendar", mGtk);
+
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(select_month, 2);
+    RG_DEF_METHOD(select_day, 1);
+    RG_DEF_METHOD(mark_day, 1);
+    RG_DEF_METHOD(unmark_day, 1);
+    RG_DEF_METHOD(clear_marks, 0);
+    RG_DEF_METHOD(date, 0);
+    RG_DEF_METHOD(freeze, 0);
+    RG_DEF_METHOD(thaw, 0);
+    RG_DEF_METHOD(display_options, -1);
 #if GTK_CHECK_VERSION(2,4,0)
-    rb_define_method(gCalendar, "set_display_options", cal_set_display_options, 1);
-    G_DEF_SETTER(gCalendar, "display_options");
+    RG_DEF_METHOD(set_display_options, 1);
+    G_DEF_SETTER(RG_TARGET_NAMESPACE, "display_options");
 #endif
 
-    G_DEF_CLASS(GTK_TYPE_CALENDAR_DISPLAY_OPTIONS, "DisplayOptions", gCalendar);
-    G_DEF_CONSTANTS(gCalendar, GTK_TYPE_CALENDAR_DISPLAY_OPTIONS, "GTK_CALENDAR_");
+    G_DEF_CLASS(GTK_TYPE_CALENDAR_DISPLAY_OPTIONS, "DisplayOptions", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_CALENDAR_DISPLAY_OPTIONS, "GTK_CALENDAR_");
 }