gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtkcelleditable.c

@@ -1,20 +1,31 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkcelleditable.c -
-
-  $Author: mutoh $
-  $Date: 2003/05/23 18:47:57 $
-
-  Copyright (C) 2002,2003 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 Masao Mutoh
+ *
+ *  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 mCellEditable
 #define _SELF(s) (GTK_CELL_EDITABLE(RVAL2GOBJ(s)))
 
 static VALUE
-celledit_start_editing(VALUE self, VALUE event)
+rg_start_editing(VALUE self, VALUE event)
 {
     gtk_cell_editable_start_editing(_SELF(self), 
                                     NIL_P(event) ? NULL : RVAL2GEV(event));
@@ -22,25 +33,25 @@ celledit_start_editing(VALUE self, VALUE event)
 }
 
 static VALUE
-celledit_editing_done(VALUE self)
+rg_editing_done(VALUE self)
 {
     gtk_cell_editable_editing_done(_SELF(self));
     return self;
 }
 
 static VALUE
-celledit_remove_widget(VALUE self)
+rg_remove_widget(VALUE self)
 {
     gtk_cell_editable_remove_widget(_SELF(self));
     return self;
 }
 
 void
-Init_gtk_celleditable()
+Init_gtk_celleditable(VALUE mGtk)
 {
-    VALUE celledit = G_DEF_INTERFACE(GTK_TYPE_CELL_EDITABLE, "CellEditable", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_INTERFACE(GTK_TYPE_CELL_EDITABLE, "CellEditable", mGtk);
 
-    rb_define_method(celledit, "start_editing", celledit_start_editing, 1);
-    rb_define_method(celledit, "editing_done", celledit_editing_done, 0);
-    rb_define_method(celledit, "remove_widget", celledit_remove_widget, 0);
+    RG_DEF_METHOD(start_editing, 1);
+    RG_DEF_METHOD(editing_done, 0);
+    RG_DEF_METHOD(remove_widget, 0);
 }

data/ext/gtk2/rbgtkcelllayout.c

@@ -1,23 +1,34 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkcelllayout.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  Copyright (C) 2004 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2004  Masao Mutoh
+ *
+ *  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,4,0)
 
+#define RG_TARGET_NAMESPACE mCellLayout
 #define _SELF(s) (GTK_CELL_LAYOUT(RVAL2GOBJ(s)))
 #define RVAL2RENDERER(s) (GTK_CELL_RENDERER(RVAL2GOBJ(s)))
 
 static VALUE
-layout_pack_start(VALUE self, VALUE cell, VALUE expand)
+rg_pack_start(VALUE self, VALUE cell, VALUE expand)
 {
     gtk_cell_layout_pack_start(_SELF(self), RVAL2RENDERER(cell),
                                RVAL2CBOOL(expand));
@@ -25,7 +36,7 @@ layout_pack_start(VALUE self, VALUE cell, VALUE expand)
 }
 
 static VALUE
-layout_pack_end(VALUE self, VALUE cell, VALUE expand)
+rg_pack_end(VALUE self, VALUE cell, VALUE expand)
 {
     gtk_cell_layout_pack_end(_SELF(self), RVAL2RENDERER(cell),
                              RVAL2CBOOL(expand));
@@ -33,7 +44,7 @@ layout_pack_end(VALUE self, VALUE cell, VALUE expand)
 }
 
 static VALUE
-layout_reorder(VALUE self, VALUE cell, VALUE position)
+rg_reorder(VALUE self, VALUE cell, VALUE position)
 {
     gtk_cell_layout_reorder(_SELF(self), RVAL2RENDERER(cell),
                             NUM2INT(position));
@@ -41,14 +52,14 @@ layout_reorder(VALUE self, VALUE cell, VALUE position)
 }
 
 static VALUE
-layout_clear(VALUE self)
+rg_clear(VALUE self)
 {
     gtk_cell_layout_clear(_SELF(self));
     return self;
 }
 
 static VALUE
-layout_add_attribute(VALUE self, VALUE cell, VALUE attribute, VALUE column)
+rg_add_attribute(VALUE self, VALUE cell, VALUE attribute, VALUE column)
 {
     const gchar *name;
 
@@ -72,7 +83,7 @@ layout_data_func(GtkCellLayout *layout, GtkCellRenderer *cell, GtkTreeModel *tre
 }
 
 static VALUE
-layout_set_cell_data_func(VALUE self, VALUE cell)
+rg_set_cell_data_func(VALUE self, VALUE cell)
 {
     if (rb_block_given_p()) {
         VALUE func = rb_block_proc();
@@ -88,24 +99,24 @@ layout_set_cell_data_func(VALUE self, VALUE cell)
 }
 
 static VALUE
-layout_clear_attributes(VALUE self, VALUE cell)
+rg_clear_attributes(VALUE self, VALUE cell)
 {
     gtk_cell_layout_clear_attributes(_SELF(self), RVAL2RENDERER(cell));
     return self;
 }
 
 static VALUE
-layout_set_attributes(VALUE self, VALUE cell, VALUE attrs)
+rg_set_attributes(VALUE self, VALUE cell, VALUE attrs)
 {
     gint i;
     VALUE ary;
     Check_Type(attrs, T_HASH);
 
-    layout_clear_attributes(self, cell);
+    rg_clear_attributes(self, cell);
 
     ary = rb_funcall(attrs, rb_intern("to_a"), 0);
     for (i = 0; i < RARRAY_LEN(ary); i++){
-        layout_add_attribute(self, cell, 
+        rg_add_attribute(self, cell, 
                              RARRAY_PTR(RARRAY_PTR(ary)[i])[0],
                              RARRAY_PTR(RARRAY_PTR(ary)[i])[1]);
     }
@@ -114,18 +125,18 @@ layout_set_attributes(VALUE self, VALUE cell, VALUE attrs)
 #endif
 
 void
-Init_gtk_celllayout()
+Init_gtk_celllayout(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,4,0)
-    VALUE layout = G_DEF_INTERFACE(GTK_TYPE_CELL_LAYOUT, "CellLayout", mGtk);
-
-    rb_define_method(layout, "pack_start", layout_pack_start, 2);
-    rb_define_method(layout, "pack_end", layout_pack_end, 2);
-    rb_define_method(layout, "reorder", layout_reorder, 2);
-    rb_define_method(layout, "clear", layout_clear, 0);
-    rb_define_method(layout, "add_attribute", layout_add_attribute, 3);
-    rb_define_method(layout, "set_cell_data_func", layout_set_cell_data_func, 1);
-    rb_define_method(layout, "clear_attributes", layout_clear_attributes, 1);
-    rb_define_method(layout, "set_attributes", layout_set_attributes, 2);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_INTERFACE(GTK_TYPE_CELL_LAYOUT, "CellLayout", mGtk);
+
+    RG_DEF_METHOD(pack_start, 2);
+    RG_DEF_METHOD(pack_end, 2);
+    RG_DEF_METHOD(reorder, 2);
+    RG_DEF_METHOD(clear, 0);
+    RG_DEF_METHOD(add_attribute, 3);
+    RG_DEF_METHOD(set_cell_data_func, 1);
+    RG_DEF_METHOD(clear_attributes, 1);
+    RG_DEF_METHOD(set_attributes, 2);
 #endif
 }

data/ext/gtk2/rbgtkcellrenderer.c

@@ -1,22 +1,33 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkcellrenderer.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  Copyright (C) 2002-2005 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2005 Masao Mutoh
+ *
+ *  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 cCellRenderer
 #define _SELF(s) (GTK_CELL_RENDERER(RVAL2GOBJ(s)))
 #define RVAL2RECT(r) ((GdkRectangle*)RVAL2BOXED(r, GDK_TYPE_RECTANGLE))
 #define RECT2RVAL(r) (BOXED2RVAL(r, GDK_TYPE_RECTANGLE))
 
 static VALUE
-cellrenderer_get_size(VALUE self, VALUE widget, VALUE cell_area)
+rg_get_size(VALUE self, VALUE widget, VALUE cell_area)
 {
     GdkRectangle ret;
 
@@ -27,7 +38,7 @@ cellrenderer_get_size(VALUE self, VALUE widget, VALUE cell_area)
 }
 
 static VALUE
-cellrenderer_render(VALUE self, VALUE window, VALUE widget, VALUE background_area, VALUE cell_area, VALUE expose_area, VALUE flags)
+rg_render(VALUE self, VALUE window, VALUE widget, VALUE background_area, VALUE cell_area, VALUE expose_area, VALUE flags)
 {
     gtk_cell_renderer_render(_SELF(self), GDK_WINDOW(RVAL2GOBJ(window)),
                              GTK_WIDGET(RVAL2GOBJ(widget)),
@@ -39,7 +50,7 @@ cellrenderer_render(VALUE self, VALUE window, VALUE widget, VALUE background_are
 }
 
 static VALUE
-cellrenderer_activate(VALUE self, VALUE event, VALUE widget, VALUE path, VALUE background_area, VALUE cell_area, VALUE flags)
+rg_activate(VALUE self, VALUE event, VALUE widget, VALUE path, VALUE background_area, VALUE cell_area, VALUE flags)
 {
     gboolean ret =
     gtk_cell_renderer_activate(_SELF(self), (GdkEvent*)RVAL2GEV(event),
@@ -51,7 +62,7 @@ cellrenderer_activate(VALUE self, VALUE event, VALUE widget, VALUE path, VALUE b
 }
 
 static VALUE
-cellrenderer_start_editing(VALUE self, VALUE event, VALUE widget, VALUE path, VALUE background_area, VALUE cell_area, VALUE flags)
+rg_start_editing(VALUE self, VALUE event, VALUE widget, VALUE path, VALUE background_area, VALUE cell_area, VALUE flags)
 {
     GtkCellEditable* edit =
     gtk_cell_renderer_start_editing(_SELF(self), (GdkEvent*)RVAL2GEV(event),
@@ -65,7 +76,7 @@ cellrenderer_start_editing(VALUE self, VALUE event, VALUE widget, VALUE path, VA
 #if GTK_CHECK_VERSION(2,4,0)
 #ifndef GTK_DISABLE_DEPRECATED
 static VALUE
-cellrenderer_editing_canceled(VALUE self)
+rg_editing_canceled(VALUE self)
 {
     gtk_cell_renderer_editing_canceled(_SELF(self));
     return self;
@@ -75,7 +86,7 @@ cellrenderer_editing_canceled(VALUE self)
 
 #if GTK_CHECK_VERSION(2,6,0)
 static VALUE
-cellrenderer_stop_editing(VALUE self, VALUE canceled)
+rg_stop_editing(VALUE self, VALUE canceled)
 {
     gtk_cell_renderer_stop_editing(_SELF(self), RVAL2CBOOL(canceled));
     return self;
@@ -83,7 +94,7 @@ cellrenderer_stop_editing(VALUE self, VALUE canceled)
 #endif
 
 static VALUE
-cellrenderer_get_fixed_size(VALUE self)
+rg_fixed_size(VALUE self)
 {
     int width, height;
     gtk_cell_renderer_get_fixed_size(_SELF(self), &width, &height);
@@ -91,7 +102,7 @@ cellrenderer_get_fixed_size(VALUE self)
 }
 
 static VALUE
-cellrenderer_set_fixed_size(VALUE self, VALUE width, VALUE height)
+rg_set_fixed_size(VALUE self, VALUE width, VALUE height)
 {
     gtk_cell_renderer_set_fixed_size(_SELF(self), NUM2INT(width), 
                                      NUM2INT(height));
@@ -99,30 +110,30 @@ cellrenderer_set_fixed_size(VALUE self, VALUE width, VALUE height)
 }
 
 void
-Init_gtk_cellrenderer()
+Init_gtk_cellrenderer(VALUE mGtk)
 {
-    VALUE renderer = G_DEF_CLASS(GTK_TYPE_CELL_RENDERER, "CellRenderer", mGtk);
-    
-    rb_define_method(renderer, "get_size", cellrenderer_get_size, 2);
-    rb_define_method(renderer, "render", cellrenderer_render, 6);
-    rb_define_method(renderer, "activate", cellrenderer_activate, 6);
-    rb_define_method(renderer, "start_editing", cellrenderer_start_editing, 6);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_CELL_RENDERER, "CellRenderer", mGtk);
+
+    RG_DEF_METHOD(get_size, 2);
+    RG_DEF_METHOD(render, 6);
+    RG_DEF_METHOD(activate, 6);
+    RG_DEF_METHOD(start_editing, 6);
 #if GTK_CHECK_VERSION(2,4,0)
 #ifndef GTK_DISABLE_DEPRECATED
-    rb_define_method(renderer, "editing_canceled", cellrenderer_editing_canceled, 0);
+    RG_DEF_METHOD(editing_canceled, 0);
 #endif
 #endif
 #if GTK_CHECK_VERSION(2,6,0)
-    rb_define_method(renderer, "stop_editing", cellrenderer_stop_editing, 1);
+    RG_DEF_METHOD(stop_editing, 1);
 #endif
-    rb_define_method(renderer, "fixed_size", cellrenderer_get_fixed_size, 0);
-    rb_define_method(renderer, "set_fixed_size", cellrenderer_set_fixed_size, 2);
+    RG_DEF_METHOD(fixed_size, 0);
+    RG_DEF_METHOD(set_fixed_size, 2);
 
     /* GtkCellRendererState */
-    G_DEF_CLASS(GTK_TYPE_CELL_RENDERER_STATE, "State", renderer);
-    G_DEF_CONSTANTS(renderer, GTK_TYPE_CELL_RENDERER_STATE, "GTK_CELL_RENDERER_");
+    G_DEF_CLASS(GTK_TYPE_CELL_RENDERER_STATE, "State", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_CELL_RENDERER_STATE, "GTK_CELL_RENDERER_");
 
     /* GtkCellRendererMode */
-    G_DEF_CLASS(GTK_TYPE_CELL_RENDERER_MODE, "Mode", renderer);
-    G_DEF_CONSTANTS(renderer, GTK_TYPE_CELL_RENDERER_MODE, "GTK_CELL_RENDERER_");
+    G_DEF_CLASS(GTK_TYPE_CELL_RENDERER_MODE, "Mode", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_CELL_RENDERER_MODE, "GTK_CELL_RENDERER_");
 }

data/ext/gtk2/rbgtkcellrendereraccel.c

@@ -1,22 +1,33 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkcellrendereraccel.c -
-
-  $Author: mutoh $
-  $Date: 2007/02/02 19:19:59 $
-
-  Copyright (C) 2006 Ruby-GNOME2 Team
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2006  Ruby-GNOME2 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 cCellRendererAccel
 #define _SELF(s) (GTK_CELL_RENDERER_ACCEL(RVAL2GOBJ(s)))
 
 static VALUE
-craccel_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_cell_renderer_accel_new());
     return Qnil;
@@ -25,17 +36,14 @@ craccel_initialize(VALUE self)
 #endif
 
 void
-Init_gtk_cellrendereraccel()
+Init_gtk_cellrendereraccel(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,10,0)
-    VALUE renderer = G_DEF_CLASS(GTK_TYPE_CELL_RENDERER_ACCEL, "CellRendererAccel", mGtk);
-    rb_define_method(renderer, "initialize", craccel_initialize, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_CELL_RENDERER_ACCEL, "CellRendererAccel", mGtk);
+    RG_DEF_METHOD(initialize, 0);
 
     /* GtkCellRendererAccelMode */
-    G_DEF_CLASS(GTK_TYPE_CELL_RENDERER_ACCEL_MODE, "Mode", renderer);
-    G_DEF_CONSTANTS(renderer, GTK_TYPE_CELL_RENDERER_ACCEL_MODE, "GTK_CELL_RENDERER_ACCEL_");
+    G_DEF_CLASS(GTK_TYPE_CELL_RENDERER_ACCEL_MODE, "Mode", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_CELL_RENDERER_ACCEL_MODE, "GTK_CELL_RENDERER_ACCEL_");
 #endif
 }
-
-
- 

data/ext/gtk2/rbgtkcellrenderercombo.c

@@ -1,20 +1,32 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkcellrenderercombo.c -
-
-  $Author: mutoh $
-  $Date: 2005/01/03 18:55:03 $
-
-  Copyright (C) 2004 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2004  Masao Mutoh
+ *
+ *  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,6,0)
 
+#define RG_TARGET_NAMESPACE cCellRendererCombo
+
 static VALUE
-crcombo_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_cell_renderer_combo_new());
     return Qnil;
@@ -23,14 +35,10 @@ crcombo_initialize(VALUE self)
 #endif
 
 void
-Init_gtk_cellrenderercombo()
+Init_gtk_cellrenderercombo(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,6,0)
-    VALUE renderer = G_DEF_CLASS(GTK_TYPE_CELL_RENDERER_COMBO, "CellRendererCombo", mGtk);
-    rb_define_method(renderer, "initialize", crcombo_initialize, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_CELL_RENDERER_COMBO, "CellRendererCombo", mGtk);
+    RG_DEF_METHOD(initialize, 0);
 #endif
 }
-
-
- 
-