gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtkaspectframe.c

@@ -1,21 +1,33 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkaspectframe.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 cAspectFrame
+
 static VALUE
-aframe_initialize(VALUE self, VALUE label, VALUE xalign, VALUE yalign, VALUE ratio, VALUE obey_child)
+rg_initialize(VALUE self, VALUE label, VALUE xalign, VALUE yalign, VALUE ratio, VALUE obey_child)
 {
     RBGTK_INITIALIZE(self, gtk_aspect_frame_new(NIL_P(label)?NULL:RVAL2CSTR(label),
                                                 NUM2DBL(xalign),
@@ -26,19 +38,19 @@ aframe_initialize(VALUE self, VALUE label, VALUE xalign, VALUE yalign, VALUE rat
 }
 
 static VALUE
-aframe_set(VALUE self, VALUE xalign, VALUE yalign, VALUE ratio, VALUE obey_child)
+rg_set(VALUE self, VALUE xalign, VALUE yalign, VALUE ratio, VALUE obey_child)
 {
     gtk_aspect_frame_set(GTK_ASPECT_FRAME(RVAL2GOBJ(self)),
-			 NUM2DBL(xalign), NUM2DBL(yalign),
-			 NUM2DBL(ratio), RVAL2CBOOL(obey_child));
+                         NUM2DBL(xalign), NUM2DBL(yalign),
+                         NUM2DBL(ratio), RVAL2CBOOL(obey_child));
     return self;
 }
 
 void 
-Init_gtk_aspect_frame()
+Init_gtk_aspect_frame(VALUE mGtk)
 {
-    VALUE gAspectFrame = G_DEF_CLASS(GTK_TYPE_ASPECT_FRAME, "AspectFrame", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ASPECT_FRAME, "AspectFrame", mGtk);
 
-    rb_define_method(gAspectFrame, "initialize", aframe_initialize, 5);
-    rb_define_method(gAspectFrame, "set", aframe_set, 4);
+    RG_DEF_METHOD(initialize, 5);
+    RG_DEF_METHOD(set, 4);
 }

data/ext/gtk2/rbgtkassistant.c

@@ -1,66 +1,77 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkassistant.c -
-
-  $Author: sakai $
-  $Date: 2007/07/08 03:00:49 $
-
-  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 cAssistant
 #define _SELF(s) (GTK_ASSISTANT(RVAL2GOBJ(s)))
 
 static VALUE
-ass_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_assistant_new());
     return Qnil;
 }
 
 static VALUE
-ass_get_current_page(VALUE self)
+rg_current_page(VALUE self)
 {
     return INT2NUM(gtk_assistant_get_current_page(_SELF(self)));
 }
 
 static VALUE
-ass_set_current_page(VALUE self, VALUE page_num)
+rg_set_current_page(VALUE self, VALUE page_num)
 {
     gtk_assistant_set_current_page(_SELF(self), NUM2INT(page_num));
     return self;
 }
 
 static VALUE
-ass_get_n_pages(VALUE self)
+rg_n_pages(VALUE self)
 {
     return INT2NUM(gtk_assistant_get_n_pages(_SELF(self)));
 }
 
 static VALUE
-ass_get_nth_page(VALUE self, VALUE page_num)
+rg_get_nth_page(VALUE self, VALUE page_num)
 {
     return GOBJ2RVAL(gtk_assistant_get_nth_page(_SELF(self), NUM2INT(page_num)));
 }
 
 static VALUE
-ass_prepend_page(VALUE self, VALUE page)
+rg_prepend_page(VALUE self, VALUE page)
 {
     return INT2NUM(gtk_assistant_prepend_page(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page))));
 }
 
 static VALUE
-ass_append_page(VALUE self, VALUE page)
+rg_append_page(VALUE self, VALUE page)
 {
     return INT2NUM(gtk_assistant_append_page(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page))));
 }
 
 static VALUE
-ass_insert_page(VALUE self, VALUE page, VALUE position)
+rg_insert_page(VALUE self, VALUE page, VALUE position)
 {
     return INT2NUM(gtk_assistant_insert_page(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page)), NUM2INT(position)));
 }
@@ -72,7 +83,7 @@ ass_page_func(gint current_page, gpointer func)
 }
 
 static VALUE
-ass_set_forward_page_func(VALUE self)
+rg_set_forward_page_func(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -81,126 +92,135 @@ ass_set_forward_page_func(VALUE self)
 }
 
 static VALUE
-ass_set_page_type(VALUE self, VALUE page, VALUE type)
+rg_set_page_type(VALUE self, VALUE page, VALUE type)
 {
     gtk_assistant_set_page_type(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page)), RVAL2GENUM(type, GTK_TYPE_ASSISTANT_PAGE_TYPE));
     return self;
 }
 
 static VALUE
-ass_get_page_type(VALUE self, VALUE page)
+rg_get_page_type(VALUE self, VALUE page)
 {
     return GENUM2RVAL(gtk_assistant_get_page_type(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page))), GTK_TYPE_ASSISTANT_PAGE_TYPE);
 }
 
 static VALUE
-ass_set_page_title(VALUE self, VALUE page, VALUE title)
+rg_set_page_title(VALUE self, VALUE page, VALUE title)
 {
     gtk_assistant_set_page_title(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page)), RVAL2CSTR(title));
     return self;
 }
 
 static VALUE
-ass_get_page_title(VALUE self, VALUE page)
+rg_get_page_title(VALUE self, VALUE page)
 {
     return CSTR2RVAL(gtk_assistant_get_page_title(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page))));
 }
 
 static VALUE
-ass_set_page_header_image(VALUE self, VALUE page, VALUE header_image)
+rg_set_page_header_image(VALUE self, VALUE page, VALUE header_image)
 {
     gtk_assistant_set_page_header_image(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page)), GDK_PIXBUF(RVAL2GOBJ(header_image)));
     return self;
 }
 
 static VALUE
-ass_get_page_header_image(VALUE self, VALUE page)
+rg_get_page_header_image(VALUE self, VALUE page)
 {
     return GOBJ2RVAL(gtk_assistant_get_page_header_image(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page))));
 }
 
 static VALUE
-ass_set_page_side_image(VALUE self, VALUE page, VALUE side_image)
+rg_set_page_side_image(VALUE self, VALUE page, VALUE side_image)
 {
     gtk_assistant_set_page_side_image(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page)), GDK_PIXBUF(RVAL2GOBJ(side_image)));
     return self;
 }
 
 static VALUE
-ass_get_page_side_image(VALUE self, VALUE page)
+rg_get_page_side_image(VALUE self, VALUE page)
 {
     return GOBJ2RVAL(gtk_assistant_get_page_side_image(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page))));
 }
 
 static VALUE
-ass_set_page_complete(VALUE self, VALUE page, VALUE complete)
+rg_set_page_complete(VALUE self, VALUE page, VALUE complete)
 {
     gtk_assistant_set_page_complete(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page)), RVAL2CBOOL(complete));
     return self;
 }
 
 static VALUE
-ass_get_page_complete(VALUE self, VALUE page)
+rg_get_page_complete(VALUE self, VALUE page)
 {
     return CBOOL2RVAL(gtk_assistant_get_page_complete(_SELF(self), GTK_WIDGET(RVAL2GOBJ(page))));
 }
 
 static VALUE
-ass_add_action_widget(VALUE self, VALUE child)
+rg_add_action_widget(VALUE self, VALUE child)
 {
     gtk_assistant_add_action_widget(_SELF(self), GTK_WIDGET(RVAL2GOBJ(child)));
     return self;
 }
 
 static VALUE
-ass_remove_action_widget(VALUE self, VALUE child)
+rg_remove_action_widget(VALUE self, VALUE child)
 {
     gtk_assistant_remove_action_widget(_SELF(self), GTK_WIDGET(RVAL2GOBJ(child)));
     return self;
 }
 
 static VALUE
-ass_update_buttons_state(VALUE self)
+rg_update_buttons_state(VALUE self)
 {
     gtk_assistant_update_buttons_state(_SELF(self));
     return self;
 }
 
+static VALUE
+rg_commit(VALUE self)
+{
+    gtk_assistant_commit(_SELF(self));
+
+    return self;
+}
+
 #endif
 
-void 
-Init_gtk_assistant()
+void
+Init_gtk_assistant(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,10,0)
-    VALUE ass = G_DEF_CLASS(GTK_TYPE_ASSISTANT, "Assistant", mGtk);
-    rb_define_method(ass, "initialize", ass_initialize, 0);
-
-    rb_define_method(ass, "current_page", ass_get_current_page, 0);
-    rb_define_method(ass, "set_current_page", ass_set_current_page, 1);
-    rb_define_method(ass, "n_pages", ass_get_n_pages, 0);
-    rb_define_method(ass, "get_nth_page", ass_get_nth_page, 1);
-    rb_define_method(ass, "prepend_page", ass_prepend_page, 1);
-    rb_define_method(ass, "append_page", ass_append_page, 1);
-    rb_define_method(ass, "insert_page", ass_insert_page, 2);
-    rb_define_method(ass, "set_forward_page_func", ass_set_forward_page_func, 0);
-    rb_define_method(ass, "set_page_type", ass_set_page_type, 2);
-    rb_define_method(ass, "get_page_type", ass_get_page_type, 1);
-    rb_define_method(ass, "set_page_title", ass_set_page_title, 2);
-    rb_define_method(ass, "get_page_title", ass_get_page_title, 1);
-    rb_define_method(ass, "set_page_header_image", ass_set_page_header_image, 2);
-    rb_define_method(ass, "get_page_header_image", ass_get_page_header_image, 1);
-    rb_define_method(ass, "set_page_side_image", ass_set_page_side_image, 2);
-    rb_define_method(ass, "get_page_side_image", ass_get_page_side_image, 1);
-    rb_define_method(ass, "set_page_complete", ass_set_page_complete, 2);
-    rb_define_method(ass, "get_page_complete", ass_get_page_complete, 1);
-    rb_define_method(ass, "add_action_widget", ass_add_action_widget, 1);
-    rb_define_method(ass, "remove_action_widget", ass_remove_action_widget, 1);
-    rb_define_method(ass, "update_buttons_state", ass_update_buttons_state, 0);
-
-    G_DEF_SETTERS(ass);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ASSISTANT, "Assistant", mGtk);
+    RG_DEF_METHOD(initialize, 0);
+
+    RG_DEF_METHOD(current_page, 0);
+    RG_DEF_METHOD(set_current_page, 1);
+    RG_DEF_METHOD(n_pages, 0);
+    RG_DEF_METHOD(get_nth_page, 1);
+    RG_DEF_METHOD(prepend_page, 1);
+    RG_DEF_METHOD(append_page, 1);
+    RG_DEF_METHOD(insert_page, 2);
+    RG_DEF_METHOD(set_forward_page_func, 0);
+    RG_DEF_METHOD(set_page_type, 2);
+    RG_DEF_METHOD(get_page_type, 1);
+    RG_DEF_METHOD(set_page_title, 2);
+    RG_DEF_METHOD(get_page_title, 1);
+    RG_DEF_METHOD(set_page_header_image, 2);
+    RG_DEF_METHOD(get_page_header_image, 1);
+    RG_DEF_METHOD(set_page_side_image, 2);
+    RG_DEF_METHOD(get_page_side_image, 1);
+    RG_DEF_METHOD(set_page_complete, 2);
+    RG_DEF_METHOD(get_page_complete, 1);
+    RG_DEF_METHOD(add_action_widget, 1);
+    RG_DEF_METHOD(remove_action_widget, 1);
+    RG_DEF_METHOD(update_buttons_state, 0);
+    RG_DEF_METHOD(commit, 0);
+
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 
     /* GtkAssistantPageType */
-    G_DEF_CLASS(GTK_TYPE_ASSISTANT_PAGE_TYPE, "PageType", ass);
-    G_DEF_CONSTANTS(ass, GTK_TYPE_ASSISTANT_PAGE_TYPE, "GTK_ASSISTANT_");
+    G_DEF_CLASS(GTK_TYPE_ASSISTANT_PAGE_TYPE, "PageType", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_ASSISTANT_PAGE_TYPE, "GTK_ASSISTANT_");
 #endif
 }

data/ext/gtk2/rbgtkbbox.c

@@ -1,21 +1,33 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkbbox.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 cButtonBox
+
 static VALUE
-bbox_set_child_secondary(VALUE self, VALUE child, VALUE is_secondary)
+rg_set_child_secondary(VALUE self, VALUE child, VALUE is_secondary)
 {
     gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(RVAL2GOBJ(self)), 
                                        GTK_WIDGET(RVAL2GOBJ(child)),
@@ -24,7 +36,7 @@ bbox_set_child_secondary(VALUE self, VALUE child, VALUE is_secondary)
 }
 #if GTK_CHECK_VERSION(2,4,0)
 static VALUE
-bbox_get_child_secondary(VALUE self, VALUE child)
+rg_get_child_secondary(VALUE self, VALUE child)
 {
     return CBOOL2RVAL(gtk_button_box_get_child_secondary(GTK_BUTTON_BOX(RVAL2GOBJ(self)), 
                                                          GTK_WIDGET(RVAL2GOBJ(child))));
@@ -32,14 +44,14 @@ bbox_get_child_secondary(VALUE self, VALUE child)
 #endif
 
 void 
-Init_gtk_button_box()
+Init_gtk_button_box(VALUE mGtk)
 {
-    VALUE gBBox = G_DEF_CLASS(GTK_TYPE_BUTTON_BOX, "ButtonBox", mGtk);
-    rb_define_method(gBBox, "set_child_secondary", bbox_set_child_secondary, 2);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_BUTTON_BOX, "ButtonBox", mGtk);
+    RG_DEF_METHOD(set_child_secondary, 2);
 #if GTK_CHECK_VERSION(2,4,0)
-    rb_define_method(gBBox, "get_child_secondary", bbox_get_child_secondary, 1);
+    RG_DEF_METHOD(get_child_secondary, 1);
 #endif
     /* GtkButtonBoxStyle(General constants) */
-    G_DEF_CLASS(GTK_TYPE_BUTTON_BOX_STYLE, "Style", gBBox);
-    G_DEF_CONSTANTS(gBBox, GTK_TYPE_BUTTON_BOX_STYLE, "GTK_BUTTONBOX_");
+    G_DEF_CLASS(GTK_TYPE_BUTTON_BOX_STYLE, "Style", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_BUTTON_BOX_STYLE, "GTK_BUTTONBOX_");
 }

data/ext/gtk2/rbgtkbin.c

@@ -1,30 +1,42 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkbin.c -
-
-  $Author: mutoh $
-  $Date: 2003/02/01 16:46:23 $
-
-  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 cBin
+
 static VALUE
-bin_child(VALUE self)
+rg_child(VALUE self)
 {
     GtkWidget *child = gtk_bin_get_child(RVAL2GOBJ(self));
     return child ? GOBJ2RVAL(child) : Qnil;
 }
 
 void 
-Init_gtk_bin()
+Init_gtk_bin(VALUE mGtk)
 {
-    VALUE gBin = G_DEF_CLASS(GTK_TYPE_BIN, "Bin", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_BIN, "Bin", mGtk);
 
-    rb_define_method(gBin, "child", bin_child, 0);
+    RG_DEF_METHOD(child, 0);
 }