gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtktreeviewcolumn.c

@@ -1,21 +1,32 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtktreeviewcolumn.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:32 $
-
-  Copyright (C) 2002-2004 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-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"
 
+#define RG_TARGET_NAMESPACE cTreeViewColumn
 #define _SELF(s) (GTK_TREE_VIEW_COLUMN(RVAL2GOBJ(s)))
 #define RVAL2CELLRENDERER(c) (GTK_CELL_RENDERER(RVAL2GOBJ(c)))
 
 static VALUE
-tvc_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     int i;
     int col;
@@ -54,7 +65,7 @@ tvc_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-tvc_pack_start(VALUE self, VALUE cell, VALUE expand)
+rg_pack_start(VALUE self, VALUE cell, VALUE expand)
 {
     G_CHILD_ADD(self, cell);
     gtk_tree_view_column_pack_start(_SELF(self), RVAL2CELLRENDERER(cell), RVAL2CBOOL(expand));
@@ -62,7 +73,7 @@ tvc_pack_start(VALUE self, VALUE cell, VALUE expand)
 }
 
 static VALUE
-tvc_pack_end(VALUE self, VALUE cell, VALUE expand)
+rg_pack_end(VALUE self, VALUE cell, VALUE expand)
 {
     G_CHILD_ADD(self, cell);
     gtk_tree_view_column_pack_end(_SELF(self), RVAL2CELLRENDERER(cell), RVAL2CBOOL(expand));
@@ -70,7 +81,7 @@ tvc_pack_end(VALUE self, VALUE cell, VALUE expand)
 }
 
 static VALUE
-tvc_clear(VALUE self)
+rg_clear(VALUE self)
 {
     G_CHILD_REMOVE_ALL(self);
     gtk_tree_view_column_clear(_SELF(self));
@@ -78,13 +89,13 @@ tvc_clear(VALUE self)
 }
 
 static VALUE
-tvc_get_cell_renderers(VALUE self)
+rg_cell_renderers(VALUE self)
 {
     return GLIST2ARYF(gtk_tree_view_column_get_cell_renderers(_SELF(self)));
 }
 
 static VALUE
-tvc_add_attribute(VALUE self, VALUE cell, VALUE attribute, VALUE column)
+rg_add_attribute(VALUE self, VALUE cell, VALUE attribute, VALUE column)
 {
     const gchar *name;
     if (SYMBOL_P(attribute)) {
@@ -98,7 +109,7 @@ tvc_add_attribute(VALUE self, VALUE cell, VALUE attribute, VALUE column)
 }
 
 static VALUE
-tvc_set_attributes(VALUE self, VALUE renderer, VALUE attributes)
+rg_set_attributes(VALUE self, VALUE renderer, VALUE attributes)
 {
     GtkTreeViewColumn *tvc;
     GtkCellRenderer *grenderer;
@@ -135,9 +146,8 @@ cell_data_func(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeMod
                GTKTREEITER2RVAL(iter));
 }
 
-
 static VALUE
-tvc_set_cell_data_func(VALUE self, VALUE renderer)
+rg_set_cell_data_func(VALUE self, VALUE renderer)
 {
     volatile VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -148,35 +158,21 @@ tvc_set_cell_data_func(VALUE self, VALUE renderer)
 }
 
 static VALUE
-tvc_clear_attributes(VALUE self, VALUE cell)
+rg_clear_attributes(VALUE self, VALUE cell)
 {
     gtk_tree_view_column_clear_attributes(_SELF(self), RVAL2CELLRENDERER(cell));
     return self;
 }
 
-/* Defined as Properties:
-void                gtk_tree_view_column_set_spacing    (GtkTreeViewColumn *tree_column,
-                                                         gint spacing);
-gint                gtk_tree_view_column_get_spacing    (GtkTreeViewColumn *tree_column);
-*/
-
 static VALUE
-tvc_clicked(VALUE self)
+rg_clicked(VALUE self)
 {
     gtk_tree_view_column_clicked(_SELF(self));
     return self;
 }
 
-/* Defined as Properties:
-void                gtk_tree_view_column_set_sort_column_id
-                                                        (GtkTreeViewColumn *tree_column,
-                                                         gint sort_column_id);
-gint                gtk_tree_view_column_get_sort_column_id
-                                                        (GtkTreeViewColumn *tree_column);
-*/
-
 static VALUE
-tvc_cell_set_cell_data(VALUE self, VALUE model, VALUE iter, VALUE is_expander, VALUE is_expanded)
+rg_cell_set_cell_data(VALUE self, VALUE model, VALUE iter, VALUE is_expander, VALUE is_expanded)
 {
     gtk_tree_view_column_cell_set_cell_data(_SELF(self), 
                                             GTK_TREE_MODEL(RVAL2GOBJ(model)),
@@ -187,7 +183,7 @@ tvc_cell_set_cell_data(VALUE self, VALUE model, VALUE iter, VALUE is_expander, V
 }
 
 static VALUE
-tvc_cell_get_size(VALUE self)
+rg_cell_size(VALUE self)
 {
     GdkRectangle cell_area;
     gint x_offset, y_offset, width, height;
@@ -216,7 +212,7 @@ tvc_cell_get_size(VALUE self)
 }
 
 static VALUE
-tvc_cell_is_visible(VALUE self)
+rg_cell_is_visible_p(VALUE self)
 {
     return CBOOL2RVAL(gtk_tree_view_column_cell_is_visible(_SELF(self)));
 }
@@ -224,7 +220,7 @@ tvc_cell_is_visible(VALUE self)
 #if GTK_CHECK_VERSION(2,2,0)
 
 static VALUE
-tvc_focus_cell(VALUE self, VALUE renderer)
+rg_focus_cell(VALUE self, VALUE renderer)
 {
     gtk_tree_view_column_focus_cell(_SELF(self), RVAL2CELLRENDERER(renderer));
 
@@ -235,7 +231,7 @@ tvc_focus_cell(VALUE self, VALUE renderer)
 
 #if GTK_CHECK_VERSION(2,8,0)
 static VALUE
-tvc_queue_resize(VALUE self)
+rg_queue_resize(VALUE self)
 {
     gtk_tree_view_column_queue_resize(_SELF(self));
     return self;
@@ -244,41 +240,40 @@ tvc_queue_resize(VALUE self)
 
 #if GTK_CHECK_VERSION(2,12,0)
 static VALUE
-tvc_get_tree_view(VALUE self)
+rg_tree_view(VALUE self)
 {
     return GOBJ2RVAL(gtk_tree_view_column_get_tree_view(_SELF(self)));
 }
 #endif
 
-
 void
-Init_gtk_treeviewcolumn()
+Init_gtk_treeviewcolumn(VALUE mGtk)
 {
-    VALUE tvc = G_DEF_CLASS(GTK_TYPE_TREE_VIEW_COLUMN, "TreeViewColumn", mGtk);
-
-    rb_define_method(tvc, "initialize", tvc_initialize, -1);
-    rb_define_method(tvc, "pack_start", tvc_pack_start, 2);
-    rb_define_method(tvc, "pack_end", tvc_pack_end, 2);
-    rb_define_method(tvc, "clear", tvc_clear, 0);
-    rb_define_method(tvc, "cell_renderers", tvc_get_cell_renderers, 0);
-    rb_define_method(tvc, "add_attribute", tvc_add_attribute, 3);
-    rb_define_method(tvc, "set_attributes", tvc_set_attributes, 2);
-    rb_define_method(tvc, "set_cell_data_func", tvc_set_cell_data_func, 1);
-    rb_define_method(tvc, "clear_attributes", tvc_clear_attributes, 1);
-    rb_define_method(tvc, "clicked", tvc_clicked, 0);
-    rb_define_method(tvc, "cell_set_cell_data", tvc_cell_set_cell_data, 4);
-    rb_define_method(tvc, "cell_size", tvc_cell_get_size, 0);
-    rb_define_method(tvc, "cell_is_visible?", tvc_cell_is_visible, 0);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_TREE_VIEW_COLUMN, "TreeViewColumn", mGtk);
+
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD(pack_start, 2);
+    RG_DEF_METHOD(pack_end, 2);
+    RG_DEF_METHOD(clear, 0);
+    RG_DEF_METHOD(cell_renderers, 0);
+    RG_DEF_METHOD(add_attribute, 3);
+    RG_DEF_METHOD(set_attributes, 2);
+    RG_DEF_METHOD(set_cell_data_func, 1);
+    RG_DEF_METHOD(clear_attributes, 1);
+    RG_DEF_METHOD(clicked, 0);
+    RG_DEF_METHOD(cell_set_cell_data, 4);
+    RG_DEF_METHOD(cell_size, 0);
+    RG_DEF_METHOD_P(cell_is_visible, 0);
 #if GTK_CHECK_VERSION(2,2,0)
-    rb_define_method(tvc, "focus_cell", tvc_focus_cell, 1);
+    RG_DEF_METHOD(focus_cell, 1);
 #endif
 #if GTK_CHECK_VERSION(2,8,0)
-    rb_define_method(tvc, "queue_resize", tvc_queue_resize, 0);
+    RG_DEF_METHOD(queue_resize, 0);
 #endif
 #if GTK_CHECK_VERSION(2,12,0)
-    rb_define_method(tvc, "tree_view", tvc_get_tree_view, 0);
+    RG_DEF_METHOD(tree_view, 0);
 #endif
     /* GtkTreeViewColumnSizing */
-    G_DEF_CLASS(GTK_TYPE_TREE_VIEW_COLUMN_SIZING, "Sizing", tvc);
-    G_DEF_CONSTANTS(tvc, GTK_TYPE_TREE_VIEW_COLUMN_SIZING, "GTK_TREE_VIEW_COLUMN_");
+    G_DEF_CLASS(GTK_TYPE_TREE_VIEW_COLUMN_SIZING, "Sizing", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_TREE_VIEW_COLUMN_SIZING, "GTK_TREE_VIEW_COLUMN_");
 }

data/ext/gtk2/rbgtkuimanager.c

@@ -1,36 +1,40 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkuimanager.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:32 $
-
-  Copyright (C) 2004-2006 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2004-2006 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 cUIManager
 #define _SELF(self) (GTK_UI_MANAGER(RVAL2GOBJ(self)))
 
 static VALUE
-rbuimanager_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     G_INITIALIZE(self, gtk_ui_manager_new());
     return Qnil;
 }
 
-/* Defined as Properties.
-void        gtk_ui_manager_set_add_tearoffs (GtkUIManager *self,
-                                             gboolean add_tearoffs);
-gboolean    gtk_ui_manager_get_add_tearoffs (GtkUIManager *self);
-*/
-
 static VALUE
-rbuimanager_insert_action_group(VALUE self, VALUE action_group, VALUE pos)
+rg_insert_action_group(VALUE self, VALUE action_group, VALUE pos)
 {
     gtk_ui_manager_insert_action_group(_SELF(self), RVAL2GOBJ(action_group), NUM2INT(pos));
     G_CHILD_ADD(self, action_group);
@@ -38,7 +42,7 @@ rbuimanager_insert_action_group(VALUE self, VALUE action_group, VALUE pos)
 }
 
 static VALUE
-rbuimanager_remove_action_group(VALUE self, VALUE action_group)
+rg_remove_action_group(VALUE self, VALUE action_group)
 {
     gtk_ui_manager_remove_action_group(_SELF(self), RVAL2GOBJ(action_group));
     G_CHILD_REMOVE(self, action_group);
@@ -46,20 +50,20 @@ rbuimanager_remove_action_group(VALUE self, VALUE action_group)
 }
 
 static VALUE
-rbuimanager_get_action_groups(VALUE self)
+rg_action_groups(VALUE self)
 {
     /* Owned by GTK+ */
     return GLIST2ARY(gtk_ui_manager_get_action_groups(_SELF(self)));
 }
 
 static VALUE
-rbuimanager_get_accel_group(VALUE self)
+rg_accel_group(VALUE self)
 {
     return GOBJ2RVAL(gtk_ui_manager_get_accel_group(_SELF(self)));
 }
 
 static VALUE
-rbuimanager_get_widget(VALUE self, VALUE path)
+rg_get_widget(VALUE self, VALUE path)
 {
     GtkWidget* widget = gtk_ui_manager_get_widget(_SELF(self), RVAL2CSTR(path));
     if (! widget)
@@ -69,20 +73,20 @@ rbuimanager_get_widget(VALUE self, VALUE path)
 }
 
 static VALUE
-rbuimanager_get_toplevels(VALUE self, VALUE types)
+rg_get_toplevels(VALUE self, VALUE types)
 {
     return GSLIST2ARYF(gtk_ui_manager_get_toplevels(_SELF(self), 
                                                     RVAL2GFLAGS(types, GTK_TYPE_UI_MANAGER_ITEM_TYPE)));
 }
-    
+
 static VALUE
-rbuimanager_get_action(VALUE self, VALUE path)
+rg_get_action(VALUE self, VALUE path)
 {
     return GOBJ2RVAL(gtk_ui_manager_get_action(_SELF(self), RVAL2CSTR(path)));
 }
 
 static VALUE
-rbuimanager_add_ui(int argc, VALUE *argv, VALUE self)
+rg_add_ui(int argc, VALUE *argv, VALUE self)
 {
     GError* error = NULL;
     guint ret;
@@ -91,8 +95,8 @@ rbuimanager_add_ui(int argc, VALUE *argv, VALUE self)
     if (argc == 1) {
         VALUE buffer_or_filename;
         rb_scan_args(argc, argv, "10", &buffer_or_filename);
-    
-        Check_Type(buffer_or_filename, T_STRING);
+
+        StringValue(buffer_or_filename);
         buffer = rb_funcall(buffer_or_filename, rb_intern("include?"), 1, CSTR2RVAL("<ui>"));
 
         if (RVAL2CBOOL(buffer)){
@@ -123,24 +127,20 @@ rbuimanager_add_ui(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-rbuimanager_new_merge_id(VALUE self)
+rg_new_merge_id(VALUE self)
 {
     return UINT2NUM(gtk_ui_manager_new_merge_id(_SELF(self)));
 }
 
 static VALUE
-rbuimanager_remove_ui(VALUE self, VALUE merge_id)
+rg_remove_ui(VALUE self, VALUE merge_id)
 {
     gtk_ui_manager_remove_ui(_SELF(self), NUM2UINT(merge_id));
     return self;
 }
 
-/* Defined as Properties
-gchar*      gtk_ui_manager_get_ui           (GtkUIManager *self);
-*/
-
 static VALUE
-rbuimanager_ensure_update(VALUE self)
+rg_ensure_update(VALUE self)
 {
     gtk_ui_manager_ensure_update(_SELF(self));
     return self;
@@ -154,10 +154,10 @@ rbuimanager_mark(void *p)
 
     manager = GTK_UI_MANAGER(p);
     for (node = gtk_ui_manager_get_action_groups(manager);
-	 node;
-	 node = g_list_next(node)) {
-	GtkWidget *action_group = node->data;
-	rbgobj_gc_mark_instance(action_group);
+         node;
+         node = g_list_next(node)) {
+        GtkWidget *action_group = node->data;
+        rbgobj_gc_mark_instance(action_group);
     }
 
     rbgobj_gc_mark_instance(gtk_ui_manager_get_accel_group(manager));
@@ -165,31 +165,31 @@ rbuimanager_mark(void *p)
 #endif
 
 void
-Init_gtk_uimanager()
+Init_gtk_uimanager(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,4,0)
-    VALUE gUI;
-
-    gUI = G_DEF_CLASS_WITH_GC_FUNC(GTK_TYPE_UI_MANAGER, "UIManager", mGtk,
-				   rbuimanager_mark, NULL);
-
-    rb_define_method(gUI, "initialize", rbuimanager_initialize, 0);
-    rb_define_method(gUI, "insert_action_group", rbuimanager_insert_action_group, 2);
-    rb_define_method(gUI, "remove_action_group", rbuimanager_remove_action_group, 1);
-    rb_define_method(gUI, "action_groups", rbuimanager_get_action_groups, 0);
-    rb_define_method(gUI, "accel_group", rbuimanager_get_accel_group, 0);
-    rb_define_method(gUI, "get_widget", rbuimanager_get_widget, 1);
-    rb_define_alias(gUI, "[]", "get_widget");
-    rb_define_method(gUI, "get_toplevels", rbuimanager_get_toplevels, 1);
-    rb_define_method(gUI, "get_action", rbuimanager_get_action, 1);
-    rb_define_method(gUI, "add_ui", rbuimanager_add_ui, -1);
-    rb_define_method(gUI, "new_merge_id", rbuimanager_new_merge_id, 0);
-    rb_define_method(gUI, "remove_ui", rbuimanager_remove_ui, 1);
-    rb_define_method(gUI, "ensure_update", rbuimanager_ensure_update, 0);
+    VALUE RG_TARGET_NAMESPACE;
+
+    RG_TARGET_NAMESPACE = G_DEF_CLASS_WITH_GC_FUNC(GTK_TYPE_UI_MANAGER, "UIManager", mGtk,
+                                                   rbuimanager_mark, NULL);
+
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(insert_action_group, 2);
+    RG_DEF_METHOD(remove_action_group, 1);
+    RG_DEF_METHOD(action_groups, 0);
+    RG_DEF_METHOD(accel_group, 0);
+    RG_DEF_METHOD(get_widget, 1);
+    RG_DEF_ALIAS("[]", "get_widget");
+    RG_DEF_METHOD(get_toplevels, 1);
+    RG_DEF_METHOD(get_action, 1);
+    RG_DEF_METHOD(add_ui, -1);
+    RG_DEF_METHOD(new_merge_id, 0);
+    RG_DEF_METHOD(remove_ui, 1);
+    RG_DEF_METHOD(ensure_update, 0);
 
     /* GtkUIManagerItemType */
-    G_DEF_CLASS(GTK_TYPE_UI_MANAGER_ITEM_TYPE, "ItemType", gUI);
-    G_DEF_CONSTANTS(gUI, GTK_TYPE_UI_MANAGER_ITEM_TYPE, "GTK_UI_MANAGER_");
-                                                                                
+    G_DEF_CLASS(GTK_TYPE_UI_MANAGER_ITEM_TYPE, "ItemType", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_UI_MANAGER_ITEM_TYPE, "GTK_UI_MANAGER_");
+
 #endif
 }