Ruby-GNOME 2

Revision: 3271
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3271&view=rev
Author:   ktou
Date:     2008-08-09 06:03:38 +0000 (Sat, 09 Aug 2008)

Log Message:
-----------
* sample/gtk-demo/printing.rb: add.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog

Added Paths:
-----------
    ruby-gnome2/trunk/gtk/sample/gtk-demo/printing.rb

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-08-09 06:01:48 UTC (rev 3270)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-08-09 06:03:38 UTC (rev 3271)
@@ -1,3 +1,7 @@
+2008-08-09  Kouhei Sutou  <kou@...>
+
+	* sample/gtk-demo/printing.rb: add.
+
 2008-07-24  Kouhei Sutou  <kou@...>
 
 	* extconf.rb, src/rbgtkfilechooser.c: check GTK_FILE_SYSTEM_ERROR

Added: ruby-gnome2/trunk/gtk/sample/gtk-demo/printing.rb
===================================================================
--- ruby-gnome2/trunk/gtk/sample/gtk-demo/printing.rb	                        (rev 0)
+++ ruby-gnome2/trunk/gtk/sample/gtk-demo/printing.rb	2008-08-09 06:03:38 UTC (rev 3271)
@@ -0,0 +1,119 @@
+# Copyright (c) 2008 Ruby-GNOME2 Project Team
+# This program is licenced under the same licence as Ruby-GNOME2.
+=begin
+= Printing
+
+Gtk::PrintOperation offers a simple API to support printing
+in a cross-platform way.
+=end
+
+require 'common'
+
+module Demo
+  class Printing < BasicWindow
+    Data = Struct.new(:font_size, :lines_per_page, :lines, :n_pages)
+    HEADER_HEIGHT = 10 * 72 / 25.4
+    HEADER_GAP = 3 * 72 / 25.4
+
+    def initialize
+      super('Printing')
+
+      button = Gtk::Button.new("Print...")
+      button.signal_connect("clicked") do
+        begin
+          run_print_operation
+        rescue
+          dialog = Gtk::MessageDialog.new(self, :destroy_with_parent, :error,
+                                          :close, $!.message)
+          dialog.signal_connect("response") do
+            dialog.destroy
+            true
+          end
+          dialog.show
+        end
+        true
+      end
+      add(button)
+    end
+
+    private
+    def run_print_operation
+      operation = Gtk::PrintOperation.new
+
+      data = Data.new
+      data.font_size = 12.0
+      operation.signal_connect("begin-print") do |_operation, context|
+        on_begin_print(_operation, context, data)
+      end
+      operation.signal_connect("draw-page") do |_operation, context, page_number|
+        on_draw_page(_operation, context, page_number, data)
+      end
+      operation.signal_connect("end-print") do |_operation, context|
+        on_end_print(_operation, context, data)
+      end
+
+      operation.use_full_page = false
+      operation.unit = :points
+
+      operation.run(:print_dialog, self)
+    end
+
+    def on_begin_print(operation, context, data)
+      height = context.height - HEADER_HEIGHT - HEADER_GAP
+      data.lines_per_page = (height / data.font_size).floor
+      data.lines = File.readlines(__FILE__)
+      data.n_pages = (data.lines.size - 1) / data.lines_per_page + 1
+      operation.set_n_pages(data.n_pages)
+    end
+
+    def on_draw_page(operation, context, page_number, data)
+      cr = context.cairo_context
+      width = context.width
+
+      cr.rectangle(0, 0, width, HEADER_HEIGHT)
+      cr.set_source_rgb(0.8, 0.8, 0.8)
+      cr.fill_preserve
+
+      cr.set_source_rgb(0, 0, 0)
+      cr.line_width = 1
+      cr.stroke
+
+      layout = context.create_pango_layout
+      layout.font_description = "sans 14"
+
+      layout.text = File.basename(__FILE__)
+      text_width, text_height = layout.pixel_size
+
+      if (text_width > width)
+        layout.width = width
+        layout.ellipsize = :start
+        text_width, text_height = layout.pixel_size
+      end
+
+      cr.move_to((width - text_width) / 2, (HEADER_HEIGHT - text_height) / 2)
+      cr.show_pango_layout(layout)
+
+      layout.text = "#{page_number + 1}/#{data.n_pages}"
+      layout.width = -1
+      text_width, text_height = layout.pixel_size
+      cr.move_to(width - text_width - 4, (HEADER_HEIGHT - text_height) / 2)
+      cr.show_pango_layout(layout)
+
+      layout = context.create_pango_layout
+      description = Pango::FontDescription.new("monosapce")
+      description.size = data.font_size * Pango::SCALE
+      layout.font_description = description
+
+      cr.move_to(0, HEADER_HEIGHT + HEADER_GAP)
+      start_line = page_number * data.lines_per_page
+      data.lines[start_line, data.lines_per_page].each do |line|
+        layout.text = line
+        cr.show_pango_layout(layout)
+        cr.rel_move_to(0, data.font_size)
+      end
+    end
+
+    def on_end_print(operation, context, data)
+    end
+  end
+end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3273
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3273&view=rev
Author:   ktou
Date:     2008-08-10 01:25:36 +0000 (Sun, 10 Aug 2008)

Log Message:
-----------
* src/rbgdkwindowattr.c (attr_initialize), src/rbgtkwidget.c
(widget_set_window): add missing type declarations. [#2043970]
Reported by Neil Roberts. Thanks!!!

* test/test_gdk_window_attribute.rb, test/test_gtk_widget.rb: add.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgdkwindowattr.c
    ruby-gnome2/trunk/gtk/src/rbgtkwidget.c

Added Paths:
-----------
    ruby-gnome2/trunk/gtk/test/test_gdk_window_attribute.rb
    ruby-gnome2/trunk/gtk/test/test_gtk_widget.rb

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-08-09 06:09:43 UTC (rev 3272)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-08-10 01:25:36 UTC (rev 3273)
@@ -1,3 +1,11 @@
+2008-08-10  Kouhei Sutou  <kou@...>
+
+	* src/rbgdkwindowattr.c (attr_initialize), src/rbgtkwidget.c
+	(widget_set_window): add missing type declarations. [#2043970]
+	Reported by Neil Roberts. Thanks!!!
+
+	* test/test_gdk_window_attribute.rb, test/test_gtk_widget.rb: add.
+
 2008-08-09  Kouhei Sutou  <kou@...>
 
 	* sample/gtk-demo/printing.rb: add.

Modified: ruby-gnome2/trunk/gtk/src/rbgdkwindowattr.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgdkwindowattr.c	2008-08-09 06:09:43 UTC (rev 3272)
+++ ruby-gnome2/trunk/gtk/src/rbgdkwindowattr.c	2008-08-10 01:25:36 UTC (rev 3273)
@@ -37,8 +37,8 @@
 #define _SELF(w) ((GdkWindowAttr*)RVAL2BOXED(w, GDK_TYPE_WINDOW_ATTR))
 
 static VALUE
-attr_initialize(self, width, height, wclass, window_type)
-    VALUE self;
+attr_initialize(VALUE self, VALUE width, VALUE height, VALUE wclass,
+		VALUE window_type)
 {
     GdkWindowAttr w;
     w.width = NUM2INT(width);

Modified: ruby-gnome2/trunk/gtk/src/rbgtkwidget.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkwidget.c	2008-08-09 06:09:43 UTC (rev 3272)
+++ ruby-gnome2/trunk/gtk/src/rbgtkwidget.c	2008-08-10 01:25:36 UTC (rev 3273)
@@ -1123,8 +1123,7 @@
 }
 
 static VALUE
-widget_set_window(self, window)
-    VALUE self;
+widget_set_window(VALUE self, VALUE window)
 {
     _SELF(self)->window = RVAL2GOBJ(window);
     return self;

Added: ruby-gnome2/trunk/gtk/test/test_gdk_window_attribute.rb
===================================================================
--- ruby-gnome2/trunk/gtk/test/test_gdk_window_attribute.rb	                        (rev 0)
+++ ruby-gnome2/trunk/gtk/test/test_gdk_window_attribute.rb	2008-08-10 01:25:36 UTC (rev 3273)
@@ -0,0 +1,9 @@
+class TestGtkWindowAttribute < Test::Unit::TestCase
+  include GtkTestUtils
+
+  def test_initialize
+    attrs = Gdk::WindowAttr.new(100, 100, :only, :temp)
+    assert_equal([100, 100, Gdk::Window::INPUT_ONLY, Gdk::Window::TEMP],
+                 [attrs.width, attrs.height, attrs.wclass, attrs.window_type])
+  end
+end

Added: ruby-gnome2/trunk/gtk/test/test_gtk_widget.rb
===================================================================
--- ruby-gnome2/trunk/gtk/test/test_gtk_widget.rb	                        (rev 0)
+++ ruby-gnome2/trunk/gtk/test/test_gtk_widget.rb	2008-08-10 01:25:36 UTC (rev 3273)
@@ -0,0 +1,14 @@
+class TestGtkWidget < Test::Unit::TestCase
+  include GtkTestUtils
+
+  def setup
+    @widget = Gtk::Invisible.new
+  end
+
+  def test_set_window
+    attrs = Gdk::WindowAttr.new(100, 100, :only, :temp)
+    window = Gdk::Window.new(nil, attrs, 0)
+    @widget.window = window
+    assert_equal(window, @widget.window)
+  end
+end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3277
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3277&view=rev
Author:   ktou
Date:     2008-08-24 05:37:42 +0000 (Sun, 24 Aug 2008)

Log Message:
-----------
* sample/misc/aboutdialog.rb, sample/misc/aboutdialog2.rb: use
  Gtk::AboutDialog#prgoram_name= not Gtk::AboutDialog#name= because
  Gtk::AboutDialog is deprecated.
  Pointed out by Mathieu Blondel. Thanks!!!

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/sample/misc/aboutdialog.rb
    ruby-gnome2/trunk/gtk/sample/misc/aboutdialog2.rb

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-08-20 10:16:13 UTC (rev 3276)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-08-24 05:37:42 UTC (rev 3277)
@@ -1,3 +1,10 @@
+2008-08-24  Kouhei Sutou  <kou@...>
+
+	* sample/misc/aboutdialog.rb, sample/misc/aboutdialog2.rb: use
+	Gtk::AboutDialog#prgoram_name= not Gtk::AboutDialog#name= because
+	Gtk::AboutDialog is deprecated.
+	Pointed out by Mathieu Blondel. Thanks!!!
+
 2008-08-10  Kouhei Sutou  <kou@...>
 
 	* src/rbgdkwindowattr.c (attr_initialize), src/rbgtkwidget.c

Modified: ruby-gnome2/trunk/gtk/sample/misc/aboutdialog.rb
===================================================================
--- ruby-gnome2/trunk/gtk/sample/misc/aboutdialog.rb	2008-08-20 10:16:13 UTC (rev 3276)
+++ ruby-gnome2/trunk/gtk/sample/misc/aboutdialog.rb	2008-08-24 05:37:42 UTC (rev 3277)
@@ -32,7 +32,7 @@
 a.documenters = ["Documenter 1 <no1@...>", "Documenter 2 <no2@...>"]
 a.license   = "This program is licenced under the same licence as Ruby-GNOME2."
 a.logo      = Gdk::Pixbuf.new("gnome-logo-icon.png")
-a.name      = "Gtk::AboutDialog sample"
+a.program_name = "Gtk::AboutDialog sample"
 a.translator_credits = "Translator 1\nTranslator 2\n"
 a.version   = "1.0.0"
 a.website   = "http://ruby-gnome2.sourceforge.jp"

Modified: ruby-gnome2/trunk/gtk/sample/misc/aboutdialog2.rb
===================================================================
--- ruby-gnome2/trunk/gtk/sample/misc/aboutdialog2.rb	2008-08-20 10:16:13 UTC (rev 3276)
+++ ruby-gnome2/trunk/gtk/sample/misc/aboutdialog2.rb	2008-08-24 05:37:42 UTC (rev 3277)
@@ -32,7 +32,7 @@
 		      "documenters" => ["Documenter 1 <no1@...>", "Documenter 2 <no2@...>"],
 		      "license" => "This program is licenced under the same licence as Ruby-GNOME2.",
 		      "logo_icon_name" => "gtk-home",
-		      "name" => "Gtk::AboutDialog sample",
+		      "program_name" => "Gtk::AboutDialog sample",
 		      "translator_credits" => "Translator 1 <no1@... 2 <no2@...",
 		      "version" => "1.0.0",
 		      "website" => "http://ruby-gnome2.sourceforge.jp",


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3286
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3286&view=rev
Author:   ktou
Date:     2008-09-07 09:10:23 +0000 (Sun, 07 Sep 2008)

Log Message:
-----------
* test/test_gtk_icon_theme.rb: use "MimeTypes" not "Apps".

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/test/test_gtk_icon_theme.rb

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-09-07 08:20:31 UTC (rev 3285)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-09-07 09:10:23 UTC (rev 3286)
@@ -1,3 +1,7 @@
+2008-09-07  Kouhei Sutou  <kou@...>
+
+	* test/test_gtk_icon_theme.rb: use "MimeTypes" not "Apps".
+
 2008-08-24  Kouhei Sutou  <kou@...>
 
 	* sample/misc/aboutdialog.rb, sample/misc/aboutdialog2.rb: use

Modified: ruby-gnome2/trunk/gtk/test/test_gtk_icon_theme.rb
===================================================================
--- ruby-gnome2/trunk/gtk/test/test_gtk_icon_theme.rb	2008-09-07 08:20:31 UTC (rev 3285)
+++ ruby-gnome2/trunk/gtk/test/test_gtk_icon_theme.rb	2008-09-07 09:10:23 UTC (rev 3286)
@@ -20,7 +20,7 @@
   def test_contexts
     only_gtk_version(2, 12)
 
-    assert_operator(@theme.contexts, :include?, "Apps")
+    assert_operator(@theme.contexts, :include?, "MimeTypes")
   end
 
   def test_icons


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3323
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3323&view=rev
Author:   ktou
Date:     2008-09-30 13:14:58 +0000 (Tue, 30 Sep 2008)

Log Message:
-----------
* gtk/src/rbgtkconversions.h: add.

* gtk/src/depend: install rbgtkconversions.h.

* gtk/src/: use conversion macros defined in rbgtkconversions.h.
Patch by Guillaume Cottenceau. Thanks!!!

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/depend
    ruby-gnome2/trunk/gtk/src/rbgtk.h
    ruby-gnome2/trunk/gtk/src/rbgtkcelllayout.c
    ruby-gnome2/trunk/gtk/src/rbgtkcellview.c
    ruby-gnome2/trunk/gtk/src/rbgtkcombobox.c
    ruby-gnome2/trunk/gtk/src/rbgtkentrycompletion.c
    ruby-gnome2/trunk/gtk/src/rbgtkiconview.c
    ruby-gnome2/trunk/gtk/src/rbgtkliststore.c
    ruby-gnome2/trunk/gtk/src/rbgtktreeiter.c
    ruby-gnome2/trunk/gtk/src/rbgtktreemodel.c
    ruby-gnome2/trunk/gtk/src/rbgtktreemodelfilter.c
    ruby-gnome2/trunk/gtk/src/rbgtktreemodelsort.c
    ruby-gnome2/trunk/gtk/src/rbgtktreerowreference.c
    ruby-gnome2/trunk/gtk/src/rbgtktreeselection.c
    ruby-gnome2/trunk/gtk/src/rbgtktreesortable.c
    ruby-gnome2/trunk/gtk/src/rbgtktreestore.c
    ruby-gnome2/trunk/gtk/src/rbgtktreeview.c
    ruby-gnome2/trunk/gtk/src/rbgtktreeviewcolumn.c

Added Paths:
-----------
    ruby-gnome2/trunk/gtk/src/rbgtkconversions.h

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-09-30 13:05:25 UTC (rev 3322)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-09-30 13:14:58 UTC (rev 3323)
@@ -1,3 +1,12 @@
+2008-09-30  Kouhei Sutou  <kou@...>
+
+	* gtk/src/rbgtkconversions.h: add.
+
+	* gtk/src/depend: install rbgtkconversions.h.
+
+	* gtk/src/: use conversion macros defined in rbgtkconversions.h.
+	Patch by Guillaume Cottenceau. Thanks!!!
+
 2008-09-13  Kouhei Sutou  <kou@...>
 
 	* extconf.rb: use check_cairo.

Modified: ruby-gnome2/trunk/gtk/src/depend
===================================================================
--- ruby-gnome2/trunk/gtk/src/depend	2008-09-30 13:05:25 UTC (rev 3322)
+++ ruby-gnome2/trunk/gtk/src/depend	2008-09-30 13:14:58 UTC (rev 3323)
@@ -1,2 +1,3 @@
 install:
 	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgtk.h $(sitearchdir)$(target_prefix)
+	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgtkconversions.h $(sitearchdir)$(target_prefix)

Modified: ruby-gnome2/trunk/gtk/src/rbgtk.h
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtk.h	2008-09-30 13:05:25 UTC (rev 3322)
+++ ruby-gnome2/trunk/gtk/src/rbgtk.h	2008-09-30 13:14:58 UTC (rev 3323)
@@ -19,6 +19,7 @@
 #include "rubysig.h"
 #include "rbgobject.h"
 #include <gtk/gtk.h>
+#include "rbgtkconversions.h"
 
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>

Modified: ruby-gnome2/trunk/gtk/src/rbgtkcelllayout.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkcelllayout.c	2008-09-30 13:05:25 UTC (rev 3322)
+++ ruby-gnome2/trunk/gtk/src/rbgtkcelllayout.c	2008-09-30 13:14:58 UTC (rev 3323)
@@ -78,7 +78,7 @@
 {
     iter->user_data3 = tree_model;
     rb_funcall((VALUE)func, id_call, 4, GOBJ2RVAL(layout), GOBJ2RVAL(cell),
-               GOBJ2RVAL(tree_model), BOXED2RVAL(iter, GTK_TYPE_TREE_ITER));
+               GOBJ2RVAL(tree_model), GTKTREEITER2RVAL(iter));
 }
 
 static VALUE

Modified: ruby-gnome2/trunk/gtk/src/rbgtkcellview.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkcellview.c	2008-09-30 13:05:25 UTC (rev 3322)
+++ ruby-gnome2/trunk/gtk/src/rbgtkcellview.c	2008-09-30 13:14:58 UTC (rev 3323)
@@ -70,7 +70,7 @@
 {
     gtk_cell_view_set_displayed_row(_SELF(self),  
                                     NIL_P(path) ? (GtkTreePath*)NULL :
-                                    (GtkTreePath*)RVAL2BOXED(path, GTK_TYPE_TREE_PATH));
+                                    RVAL2GTKTREEPATH(path));
     return self;
 }
 
@@ -78,8 +78,7 @@
 cview_get_displayed_row(self)
     VALUE self;
 {
-    return BOXED2RVAL(gtk_cell_view_get_displayed_row(_SELF(self)), 
-                      GTK_TYPE_TREE_PATH);
+    return GTKTREEPATH2RVAL(gtk_cell_view_get_displayed_row(_SELF(self)));
 }
 
 static VALUE
@@ -88,7 +87,7 @@
 {
     GtkRequisition req;
     gboolean ret = gtk_cell_view_get_size_of_row(_SELF(self),  
-                                                 RVAL2BOXED(path, GTK_TYPE_TREE_PATH),
+                                                 RVAL2GTKTREEPATH(path),
                                                  &req);
     if (! ret)
         rb_raise(rb_eRuntimeError, "Can't get the value");

Modified: ruby-gnome2/trunk/gtk/src/rbgtkcombobox.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkcombobox.c	2008-09-30 13:05:25 UTC (rev 3322)
+++ ruby-gnome2/trunk/gtk/src/rbgtkcombobox.c	2008-09-30 13:14:58 UTC (rev 3323)
@@ -74,7 +74,7 @@
 combobox_set_active_iter(self, iter)
     VALUE self, iter;
 {
-    gtk_combo_box_set_active_iter(_SELF(self), RVAL2BOXED(iter, GTK_TYPE_TREE_ITER));
+    gtk_combo_box_set_active_iter(_SELF(self), RVAL2GTKTREEITER(iter));
     return self;
 }
 
@@ -176,7 +176,7 @@
 {  
     iter->user_data3 = model;
     return RVAL2CBOOL(rb_funcall((VALUE)func, id_call, 2, GOBJ2RVAL(model),
-                            BOXED2RVAL(iter, GTK_TYPE_TREE_ITER)));
+                      GTKTREEITER2RVAL(iter)));
 }
 
 static VALUE

Added: ruby-gnome2/trunk/gtk/src/rbgtkconversions.h
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkconversions.h	                        (rev 0)
+++ ruby-gnome2/trunk/gtk/src/rbgtkconversions.h	2008-09-30 13:14:58 UTC (rev 3323)
@@ -0,0 +1,20 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/************************************************
+
+  rbgtkconversions.h -
+
+  Copyright (C) 2008 Ruby-GNOME2 Project Team
+************************************************/
+
+#ifndef _RBGTKCONVERSIONS_H
+#define _RBGTKCONVERSIONS_H
+
+#include <rbgobject.h>
+#include <gtk/gtk.h>
+
+#define GTKTREEPATH2RVAL(t) (BOXED2RVAL(t, GTK_TYPE_TREE_PATH))
+#define RVAL2GTKTREEPATH(t) ((GtkTreePath *)RVAL2BOXED(t, GTK_TYPE_TREE_PATH))
+#define GTKTREEITER2RVAL(i) (BOXED2RVAL(i, GTK_TYPE_TREE_ITER))
+#define RVAL2GTKTREEITER(i) ((GtkTreeIter *)RVAL2BOXED(i, GTK_TYPE_TREE_ITER))
+
+#endif /* _RBGTKCONVERSIONS_H */


Property changes on: ruby-gnome2/trunk/gtk/src/rbgtkconversions.h
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: ruby-gnome2/trunk/gtk/src/rbgtkentrycompletion.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkentrycompletion.c	2008-09-30 13:05:25 UTC (rev 3322)
+++ ruby-gnome2/trunk/gtk/src/rbgtkentrycompletion.c	2008-09-30 13:14:58 UTC (rev 3323)
@@ -38,7 +38,7 @@
 {
     iter->user_data3 = gtk_entry_completion_get_model(completion);
     return RVAL2CBOOL(rb_funcall((VALUE)func, id_call, 3, GOBJ2RVAL(completion),
-                            CSTR2RVAL(key), BOXED2RVAL(iter, GTK_TYPE_TREE_ITER)));
+                            CSTR2RVAL(key), GTKTREEITER2RVAL(iter)));
 }
 
 static VALUE

Modified: ruby-gnome2/trunk/gtk/src/rbgtkiconview.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkiconview.c	2008-09-30 13:05:25 UTC (rev 3322)
+++ ruby-gnome2/trunk/gtk/src/rbgtkiconview.c	2008-09-30 13:14:58 UTC (rev 3323)
@@ -54,9 +54,7 @@
 static VALUE
 iview_get_path_at_pos(VALUE self, VALUE x, VALUE y)
 {
-    GtkTreePath* path = gtk_icon_view_get_path_at_pos(_SELF(self),
-                                                      NUM2INT(x), NUM2INT(y));
-    return BOXED2RVAL(path, GTK_TYPE_TREE_PATH);
+    return GTKTREEPATH2RVAL(gtk_icon_view_get_path_at_pos(_SELF(self), NUM2INT(x), NUM2INT(y)));
 }
 
 static void
@@ -65,8 +63,7 @@
     GtkTreePath* path;
     gpointer* func;
 {
-    rb_funcall((VALUE)func, id_call, 2, GOBJ2RVAL(iview),
-               BOXED2RVAL(path, GTK_TYPE_TREE_PATH)); 
+    rb_funcall((VALUE)func, id_call, 2, GOBJ2RVAL(iview), GTKTREEPATH2RVAL(path));
 }
 
 static VALUE
@@ -121,7 +118,7 @@
     VALUE self, path;
 {
     G_CHILD_SET(self, id_select_path, path);
-    gtk_icon_view_select_path(_SELF(self), RVAL2BOXED(path, GTK_TYPE_TREE_PATH));
+    gtk_icon_view_select_path(_SELF(self), RVAL2GTKTREEPATH(path));
     return self;
 }
 
@@ -130,7 +127,7 @@
        VALUE self, path;
 {
     G_CHILD_UNSET(self, id_select_path);
-    gtk_icon_view_unselect_path(_SELF(self), RVAL2BOXED(path, GTK_TYPE_TREE_PATH));
+    gtk_icon_view_unselect_path(_SELF(self), RVAL2GTKTREEPATH(path));
     return self;
 }
  
@@ -138,9 +135,7 @@
 iview_path_is_selected(self, path)
        VALUE self, path;
 {
-    return CBOOL2RVAL(gtk_icon_view_path_is_selected(_SELF(self), 
-                                                     RVAL2BOXED(path, GTK_TYPE_TREE_PATH)));
-    return self;
+    return CBOOL2RVAL(gtk_icon_view_path_is_selected(_SELF(self), RVAL2GTKTREEPATH(path)));
 }
 
 static VALUE
@@ -174,8 +169,7 @@
 iview_item_activated(self, path)
        VALUE self, path;
 {
-    gtk_icon_view_item_activated(_SELF(self), 
-                                 RVAL2BOXED(path, GTK_TYPE_TREE_PATH));
+    gtk_icon_view_item_activated(_SELF(self), RVAL2GTKTREEPATH(path));
     return self;
 }
 #endif
@@ -185,7 +179,7 @@
 iview_create_drag_icon(self, path)
        VALUE self, path;
 {
-    return GOBJ2RVAL(gtk_icon_view_create_drag_icon(_SELF(self), RVAL2BOXED(path, GTK_TYPE_TREE_PATH)));
+    return GOBJ2RVAL(gtk_icon_view_create_drag_icon(_SELF(self), RVAL2GTKTREEPATH(path)));
 }
 
 static VALUE
@@ -218,7 +212,7 @@
     GtkTreePath* path;
     GtkCellRenderer* cell;
     gboolean cursor_set = gtk_icon_view_get_cursor(_SELF(self), &path, &cell);
-    return cursor_set ? rb_assoc_new(BOXED2RVAL(path, GTK_TYPE_TREE_PATH), GOBJ2RVAL(cell)) : Qnil;
+    return cursor_set ? rb_assoc_new(GTKTREEPATH2RVAL(path), GOBJ2RVAL(cell)) : Qnil;
 }
 
 static VALUE
@@ -228,7 +222,7 @@
     GtkTreePath* path;
     GtkIconViewDropPosition pos;
     gboolean item_at_pos = gtk_icon_view_get_dest_item_at_pos(_SELF(self), NUM2INT(drag_x), NUM2INT(drag_y), &path, &pos);
-    return item_at_pos ? rb_assoc_new(BOXED2RVAL(path, GTK_TYPE_TREE_PATH),
+    return item_at_pos ? rb_assoc_new(GTKTREEPATH2RVAL(path),
                                       GENUM2RVAL(pos, GTK_TYPE_ICON_VIEW_DROP_POSITION)) : Qnil;
 }
 
@@ -239,7 +233,7 @@
     GtkTreePath* path;
     GtkIconViewDropPosition pos;
     gtk_icon_view_get_drag_dest_item(_SELF(self), &path, &pos);
-    return rb_assoc_new(BOXED2RVAL(path, GTK_TYPE_TREE_PATH),
+    return rb_assoc_new(GTKTREEPATH2RVAL(path),
                         GENUM2RVAL(pos, GTK_TYPE_ICON_VIEW_DROP_POSITION));
 }
 
@@ -250,7 +244,7 @@
     GtkTreePath* path;
     GtkCellRenderer* cell;
     gboolean item_at_pos = gtk_icon_view_get_item_at_pos(_SELF(self), NUM2INT(x), NUM2INT(y), &path, &cell);
-    return item_at_pos ? rb_assoc_new(BOXED2RVAL(path, GTK_TYPE_TREE_PATH), GOBJ2RVAL(cell)) : Qnil;
+    return item_at_pos ? rb_assoc_new(GTKTREEPATH2RVAL(path), GOBJ2RVAL(cell)) : Qnil;
 }
 
 static VALUE
@@ -262,8 +256,8 @@
 
     gboolean valid_paths = gtk_icon_view_get_visible_range(_SELF(self), &start_path, &end_path);
 
-    return valid_paths ? rb_assoc_new(BOXED2RVAL(start_path, GTK_TYPE_TREE_PATH),
-                                      BOXED2RVAL(end_path, GTK_TYPE_TREE_PATH)) : Qnil;
+    return valid_paths ? rb_assoc_new(GTKTREEPATH2RVAL(start_path),
+                                      GTKTREEPATH2RVAL(end_path)) : Qnil;
 }
 
 static VALUE
@@ -271,7 +265,7 @@
     VALUE self, path, use_align, row_align, col_align;
 {
     gtk_icon_view_scroll_to_path(_SELF(self),
-                                 RVAL2BOXED(path, GTK_TYPE_TREE_PATH),
+                                 RVAL2GTKTREEPATH(path),
                                  RVAL2CBOOL(use_align),
                                  NUM2DBL(row_align),
                                  NUM2DBL(col_align));
@@ -282,7 +276,7 @@
 iview_set_cursor(self, path, cell, start_editing)
     VALUE self, path, cell, start_editing;
 {
-    gtk_icon_view_set_cursor(_SELF(self), RVAL2BOXED(path, GTK_TYPE_TREE_PATH), 
+    gtk_icon_view_set_cursor(_SELF(self), RVAL2GTKTREEPATH(path),
                              NIL_P(cell) ? NULL : RVAL2GOBJ(cell), RVAL2CBOOL(start_editing));
     return self;
 }
@@ -292,7 +286,7 @@
     VALUE self, path, pos;
 {
     gtk_icon_view_set_drag_dest_item(_SELF(self),
-                                     NIL_P(path) ? NULL : RVAL2BOXED(path, GTK_TYPE_TREE_PATH),
+                                     NIL_P(path) ? NULL : RVAL2GTKTREEPATH(path),
                                      RVAL2GENUM(pos, GTK_TYPE_ICON_VIEW_DROP_POSITION));
     return self;
 }

Modified: ruby-gnome2/trunk/gtk/src/rbgtkliststore.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkliststore.c	2008-09-30 13:05:25 UTC (rev 3322)
+++ ruby-gnome2/trunk/gtk/src/rbgtkliststore.c	2008-09-30 13:14:58 UTC (rev 3323)
@@ -12,8 +12,6 @@
 #include "global.h"
 
 #define _SELF(s) (GTK_LIST_STORE(RVAL2GOBJ(s)))
-#define ITR2RVAL(i) (BOXED2RVAL(i, GTK_TYPE_TREE_ITER))
-#define RVAL2ITR(i) ((GtkTreeIter*)RVAL2BOXED(i, GTK_TYPE_TREE_ITER))
 
 static ID id_to_a, id_size;
 
@@ -74,7 +72,7 @@
     G_CHILD_ADD(self, iter);
     G_CHILD_ADD(iter, value);
     
-    gtk_list_store_set_value(_SELF(self), RVAL2ITR(iter), NUM2INT(column), &gval);
+    gtk_list_store_set_value(_SELF(self), RVAL2GTKTREEITER(iter), NUM2INT(column), &gval);
 
     g_value_unset(&gval);
     return self;
@@ -169,7 +167,7 @@
 	rb_raise(rb_eArgError, "must be array or hash of values");
     }
 
-    gtk_list_store_set_valuesv(store, RVAL2ITR(iter),
+    gtk_list_store_set_valuesv(store, RVAL2GTKTREEITER(iter),
 			       g_columns, g_values, length);
 
     for (i = 0; i < length; i++)
@@ -195,9 +193,9 @@
 {
     G_CHILD_REMOVE(self, iter);
 #if GTK_CHECK_VERSION(2,2,0)
-    return CBOOL2RVAL(gtk_list_store_remove(_SELF(self), RVAL2ITR(iter)));
+    return CBOOL2RVAL(gtk_list_store_remove(_SELF(self), RVAL2GTKTREEITER(iter)));
 #else
-    gtk_list_store_remove(_SELF(self), RVAL2ITR(iter));
+    gtk_list_store_remove(_SELF(self), RVAL2GTKTREEITER(iter));
     return Qtrue;
 #endif
 }
@@ -256,7 +254,7 @@
     }
     iter.user_data3 = store;
 
-    ret = ITR2RVAL(&iter);
+    ret = GTKTREEITER2RVAL(&iter);
     G_CHILD_ADD(self, ret);
     return ret;
 }
@@ -268,10 +266,10 @@
     VALUE ret;
     GtkTreeIter iter;
     GtkListStore* model = _SELF(self);
-    gtk_list_store_insert_before(model, &iter, NIL_P(sibling) ? NULL : RVAL2ITR(sibling));
+    gtk_list_store_insert_before(model, &iter, NIL_P(sibling) ? NULL : RVAL2GTKTREEITER(sibling));
     iter.user_data3 = model;
 
-    ret = ITR2RVAL(&iter);
+    ret = GTKTREEITER2RVAL(&iter);
     G_CHILD_ADD(self, ret);
     return ret;
 }
@@ -283,10 +281,10 @@
     VALUE ret;
     GtkTreeIter iter;
     GtkListStore* model = _SELF(self);
-    gtk_list_store_insert_after(model, &iter, NIL_P(sibling) ? NULL : RVAL2ITR(sibling));
+    gtk_list_store_insert_after(model, &iter, NIL_P(sibling) ? NULL : RVAL2GTKTREEITER(sibling));
     iter.user_data3 = model;
 
-    ret = ITR2RVAL(&iter);
+    ret = GTKTREEITER2RVAL(&iter);
     G_CHILD_ADD(self, ret);
     return ret;
 }
@@ -301,7 +299,7 @@
     gtk_list_store_prepend(model, &iter);
     iter.user_data3 = model;
 
-    ret = ITR2RVAL(&iter);
+    ret = GTKTREEITER2RVAL(&iter);
     G_CHILD_ADD(self, ret);
     return ret;
 }
@@ -316,7 +314,7 @@
     gtk_list_store_append(model, &iter);
     iter.user_data3 = model;
     
-    ret = ITR2RVAL(&iter);
+    ret = GTKTREEITER2RVAL(&iter);
     G_CHILD_ADD(self, ret);
     return ret;
 }
@@ -336,7 +334,7 @@
     VALUE self, iter;
 {
     return (NIL_P(iter)) ? Qfalse :
-        CBOOL2RVAL(gtk_list_store_iter_is_valid(_SELF(self), RVAL2ITR(iter)));
+        CBOOL2RVAL(gtk_list_store_iter_is_valid(_SELF(self), RVAL2GTKTREEITER(iter)));
 }
 
 static VALUE
@@ -359,23 +357,23 @@
 lstore_swap(self, iter1, iter2)
     VALUE self, iter1, iter2;
 {
-    gtk_list_store_swap(_SELF(self), RVAL2ITR(iter1), RVAL2ITR(iter2));
+    gtk_list_store_swap(_SELF(self), RVAL2GTKTREEITER(iter1), RVAL2GTKTREEITER(iter2));
     return self;
 }
 static VALUE
 lstore_move_before(self, iter, position)
     VALUE self, iter, position;
 {
-    gtk_list_store_move_before(_SELF(self), RVAL2ITR(iter), 
-                               NIL_P(position) ? NULL : RVAL2ITR(position));
+    gtk_list_store_move_before(_SELF(self), RVAL2GTKTREEITER(iter), 
+                               NIL_P(position) ? NULL : RVAL2GTKTREEITER(position));
     return self;
 }
 static VALUE
 lstore_move_after(self, iter, position)
     VALUE self, iter, position;
 {
-    gtk_list_store_move_after(_SELF(self), RVAL2ITR(iter), 
-                               NIL_P(position) ? NULL : RVAL2ITR(position));
+    gtk_list_store_move_after(_SELF(self), RVAL2GTKTREEITER(iter), 
+                               NIL_P(position) ? NULL : RVAL2GTKTREEITER(position));
     return self;
 }
 #endif

Modified: ruby-gnome2/trunk/gtk/src/rbgtktreeiter.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtktreeiter.c	2008-09-30 13:05:25 UTC (rev 3322)
+++ ruby-gnome2/trunk/gtk/src/rbgtktreeiter.c	2008-09-30 13:14:58 UTC (rev 3323)
@@ -13,8 +13,6 @@
 #include "global.h"
 
 #define _SELF(i) ((GtkTreeIter*)RVAL2BOXED(i, GTK_TYPE_TREE_ITER))
-#define ITR2RVAL(i) (BOXED2RVAL(i, GTK_TYPE_TREE_ITER))
-#define TREEPATH2RVAL(t) (BOXED2RVAL(t, GTK_TYPE_TREE_PATH))
 
 void
 rbgtk_register_treeiter_set_value_func(gtype, func)
@@ -77,7 +75,7 @@
     GtkTreeModel* model = (GtkTreeModel*)iter->user_data3;
     gboolean ret = gtk_tree_model_iter_children(model, &child, iter);
     child.user_data3 = model;
-    return ret ? ITR2RVAL(&child) : Qnil;
+    return ret ? GTKTREEITER2RVAL(&child) : Qnil;
 }
 
 static VALUE
@@ -88,7 +86,7 @@
     GtkTreeIter* iter = _SELF(self);
     GtkTreeModel* model = (GtkTreeModel*)iter->user_data3;
     GtkTreePath* path = gtk_tree_model_get_path(model, iter);
-    retval= TREEPATH2RVAL(path);
+    retval= GTKTREEPATH2RVAL(path);
     gtk_tree_path_free(path);
     return retval;
 }
@@ -120,7 +118,7 @@
     GtkTreeModel* model = (GtkTreeModel*)iter->user_data3;
     gboolean ret = gtk_tree_model_iter_nth_child(model, &child, iter, NUM2INT(n));
     child.user_data3 = model;
-    return ret ? ITR2RVAL(&child) : Qnil;
+    return ret ? GTKTREEITER2RVAL(&child) : Qnil;
 }
 
 static VALUE
@@ -132,7 +130,7 @@
     GtkTreeModel* model = (GtkTreeModel*)iter->user_data3;
     gboolean ret = gtk_tree_model_iter_parent(model, &parent, iter);
     parent.user_data3 = model;
-    return ret ? ITR2RVAL(&parent) : Qnil;
+    return ret ? GTKTREEITER2RVAL(&parent) : Qnil;
 }
 
 static VALUE

Modified: ruby-gnome2/trunk/gtk/src/rbgtktreemodel.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtktreemodel.c	2008-09-30 13:05:25 UTC (rev 3322)
+++ ruby-gnome2/trunk/gtk/src/rbgtktreemodel.c	2008-09-30 13:14:58 UTC (rev 3323)
@@ -12,10 +12,6 @@
 #include "global.h"
 
 #define _SELF(s) (GTK_TREE_MODEL(RVAL2GOBJ(s)))
-#define TREEPATH2RVAL(t) (BOXED2RVAL(t, GTK_TYPE_TREE_PATH))
-#define RVAL2TREEPATH(p) ((GtkTreePath*)RVAL2BOXED(p, GTK_TYPE_TREE_PATH))
-#define ITR2RVAL(i) (BOXED2RVAL(i, GTK_TYPE_TREE_ITER))
-#define RVAL2ITR(i) ((GtkTreeIter*)RVAL2BOXED(i, GTK_TYPE_TREE_ITER))
 
 static VALUE
 treemodel_get_flags(self)
@@ -50,7 +46,7 @@
     iter.user_data3 = model;
 
     if (ret) {
-        val = ITR2RVAL(&iter);
+        val = GTKTREEITER2RVAL(&iter);
         G_CHILD_ADD(self, val);
     }
     
@@ -71,12 +67,12 @@
                                                   RVAL2CSTR(path));
     } else {
         ret = gtk_tree_model_get_iter(model, &iter, 
-                                      RVAL2TREEPATH(path));
+                                      RVAL2GTKTREEPATH(path));
     } 
     iter.user_data3 = model;
 
     if (ret) {
-        val = ITR2RVAL(&iter);
+        val = GTKTREEITER2RVAL(&iter);
         G_CHILD_ADD(self, val);
     }
     
@@ -89,7 +85,7 @@
 {
     GValue value = {0, };
     VALUE ret = Qnil;
-    gtk_tree_model_get_value(_SELF(self), RVAL2ITR(iter), NUM2INT(column), &value);
+    gtk_tree_model_get_value(_SELF(self), RVAL2GTKTREEITER(iter), NUM2INT(column), &value);
     if (G_VALUE_TYPE(&value) != G_TYPE_INVALID){
         ret = GVAL2RVAL(&value);
         g_value_unset(&value);
@@ -118,7 +114,7 @@
     gpointer func;
 {
     iter->user_data3 = model;
-    rb_yield(rb_ary_new3(3, GOBJ2RVAL(model), TREEPATH2RVAL(path), ITR2RVAL(iter)));
+    rb_yield(rb_ary_new3(3, GOBJ2RVAL(model), GTKTREEPATH2RVAL(path), GTKTREEITER2RVAL(iter)));
     return FALSE;
 }
 
@@ -136,7 +132,7 @@
 treemodel_row_changed(self, path, iter)
     VALUE self, path, iter;
 {
-    gtk_tree_model_row_changed(_SELF(self), RVAL2TREEPATH(path), RVAL2ITR(iter));
+    gtk_tree_model_row_changed(_SELF(self), RVAL2GTKTREEPATH(path), RVAL2GTKTREEITER(iter));
     return self;
 }
 
@@ -144,7 +140,7 @@
 treemodel_row_inserted(self, path, iter)
     VALUE self, path, iter;
 {
-    gtk_tree_model_row_inserted(_SELF(self), RVAL2TREEPATH(path), RVAL2ITR(iter));
+    gtk_tree_model_row_inserted(_SELF(self), RVAL2GTKTREEPATH(path), RVAL2GTKTREEITER(iter));
     return self;
 }
 
@@ -152,7 +148,7 @@
 treemodel_row_has_child_toggled(self, path, iter)
     VALUE self, path, iter;
 {
-    gtk_tree_model_row_has_child_toggled(_SELF(self), RVAL2TREEPATH(path), RVAL2ITR(iter));
+    gtk_tree_model_row_has_child_toggled(_SELF(self), RVAL2GTKTREEPATH(path), RVAL2GTKTREEITER(iter));
     return self;
 }
 
@@ -160,7 +156,7 @@
 treemodel_row_deleted(self, path)
     VALUE self, path;
 {
-    gtk_tree_model_row_deleted(_SELF(self), RVAL2TREEPATH(path));
+    gtk_tree_model_row_deleted(_SELF(self), RVAL2GTKTREEPATH(path));
     return self;
 }
 
@@ -180,7 +176,7 @@
         orders[i] = RARRAY(new_orders)->ptr[i];
     }
   
-    gtk_tree_model_rows_reordered(_SELF(self), RVAL2TREEPATH(path), RVAL2ITR(iter), orders);
+    gtk_tree_model_rows_reordered(_SELF(self), RVAL2GTKTREEPATH(path), RVAL2GTKTREEITER(iter), orders);
     return self;
 }
 
@@ -201,7 +197,7 @@
     GtkTreeIter* iter = g_value_get_boxed(&values[2]);
     iter->user_data3 = model;
     
-    return rb_ary_new3(3, GOBJ2RVAL(model), TREEPATH2RVAL(path), ITR2RVAL(iter));
+    return rb_ary_new3(3, GOBJ2RVAL(model), GTKTREEPATH2RVAL(path), GTKTREEITER2RVAL(iter));
 }
 
 static VALUE
@@ -223,7 +219,7 @@
     for (i = 0; i < len; i++, new_orders++) {
         rb_ary_push(orders, INT2NUM(*new_orders));
     }
-    return rb_ary_new3(4, GOBJ2RVAL(model), TREEPATH2RVAL(path), ITR2RVAL(iter), orders);
+    return rb_ary_new3(4, GOBJ2RVAL(model), GTKTREEPATH2RVAL(path), GTKTREEITER2RVAL(iter), orders);
 }
 
 void 

Modified: ruby-gnome2/trunk/gtk/src/rbgtktreemodelfilter.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtktreemodelfilter.c	2008-09-30 13:05:25 UTC (rev 3322)
+++ ruby-gnome2/trunk/gtk/src/rbgtktreemodelfilter.c	2008-09-30 13:14:58 UTC (rev 3323)
@@ -13,10 +13,6 @@
                                                                                 
 #if GTK_CHECK_VERSION(2,4,0)
 #define _SELF(s) (GTK_TREE_MODEL_FILTER(RVAL2GOBJ(s)))
-#define RVAL2TREEPATH(s) ((GtkTreePath*)RVAL2BOXED(s, GTK_TYPE_TREE_PATH))
-#define TREEPATH2RVAL(s) (BOXED2RVAL(s, GTK_TYPE_TREE_PATH))
-#define RVAL2ITR(i) ((GtkTreeIter*)RVAL2BOXED(i, GTK_TYPE_TREE_ITER))
-#define ITR2RVAL(i) (BOXED2RVAL(i, GTK_TYPE_TREE_ITER))
 
 static ID id_child_model;
 static ID id_root;
@@ -39,7 +35,7 @@
     } else {
         G_CHILD_SET(self, id_root, root);
         widget = gtk_tree_model_filter_new(GTK_TREE_MODEL(RVAL2GOBJ(child_model)), 
-                                           (GtkTreePath*)RVAL2TREEPATH(root));
+                                           (GtkTreePath*)RVAL2GTKTREEPATH(root));
     }
 
     G_INITIALIZE(self, widget);
@@ -55,7 +51,7 @@
     VALUE ret;
 
     iter->user_data3 = model;
-    ret = rb_funcall((VALUE)func, id_call, 2, GOBJ2RVAL(model), ITR2RVAL(iter));
+    ret = rb_funcall((VALUE)func, id_call, 2, GOBJ2RVAL(model), GTKTREEITER2RVAL(iter));
     return RVAL2CBOOL(ret);
 }
 
@@ -81,7 +77,7 @@
 {
     VALUE ret;
     iter->user_data3 = model;
-    ret = rb_funcall((VALUE)func, id_call, 3, GOBJ2RVAL(model), ITR2RVAL(iter),
+    ret = rb_funcall((VALUE)func, id_call, 3, GOBJ2RVAL(model), GTKTREEITER2RVAL(iter),
                      INT2NUM(column));
     rbgobj_rvalue_to_gvalue(ret, value);
 }
@@ -142,9 +138,9 @@
     GtkTreeIter filter_iter;
     GtkTreeModelFilter* modelfilter = _SELF(self);
     gtk_tree_model_filter_convert_child_iter_to_iter(modelfilter, &filter_iter,
-                                                   RVAL2ITR(child_iter));
+                                                     RVAL2GTKTREEITER(child_iter));
     filter_iter.user_data3 = gtk_tree_model_filter_get_model(modelfilter);
-    return ITR2RVAL(&filter_iter);
+    return GTKTREEITER2RVAL(&filter_iter);
 }
 
 static VALUE
@@ -154,26 +150,26 @@
     GtkTreeIter child_iter;
     GtkTreeModelFilter* modelfilter = _SELF(self);
     gtk_tree_model_filter_convert_iter_to_child_iter(modelfilter, &child_iter,
-                                                   RVAL2ITR(filtered_iter));
+                                                     RVAL2GTKTREEITER(filtered_iter));
     child_iter.user_data3 = gtk_tree_model_filter_get_model(modelfilter);
-    return ITR2RVAL(&child_iter);
+    return GTKTREEITER2RVAL(&child_iter);
 } 
 
 static VALUE
 treemodelfilter_convert_child_path_to_path(self, child_path)
     VALUE self, child_path;
 {
-    return TREEPATH2RVAL(gtk_tree_model_filter_convert_child_path_to_path(
+    return GTKTREEPATH2RVAL(gtk_tree_model_filter_convert_child_path_to_path(
                              _SELF(self),
-                             RVAL2TREEPATH(child_path)));
+                             RVAL2GTKTREEPATH(child_path)));
 }
 static VALUE
 treemodelfilter_convert_path_to_child_path(self, filter_path)
     VALUE self, filter_path;
 {
-    return TREEPATH2RVAL(gtk_tree_model_filter_convert_path_to_child_path(
+    return GTKTREEPATH2RVAL(gtk_tree_model_filter_convert_path_to_child_path(
                              _SELF(self),
-                             RVAL2TREEPATH(filter_path)));
+                             RVAL2GTKTREEPATH(filter_path)));
 }
 
 static VALUE

Modified: ruby-gnome2/trunk/gtk/src/rbgtktreemodelsort.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtktreemodelsort.c	2008-09-30 13:05:25 UTC (rev 3322)
+++ ruby-gnome2/trunk/gtk/src/rbgtktreemodelsort.c	2008-09-30 13:14:58 UTC (rev 3323)
@@ -12,10 +12,6 @@
 #include "global.h"
 
 #define _SELF(s) (GTK_TREE_MODEL_SORT(RVAL2GOBJ(s)))
-#define RVAL2TREEPATH(s) ((GtkTreePath*)RVAL2BOXED(s, GTK_TYPE_TREE_PATH))
-#define TREEPATH2RVAL(s) (BOXED2RVAL(s, GTK_TYPE_TREE_PATH))
-#define RVAL2ITR(i) ((GtkTreeIter*)RVAL2BOXED(i, GTK_TYPE_TREE_ITER))
-#define ITR2RVAL(i) (BOXED2RVAL(i, GTK_TYPE_TREE_ITER))
 
 static ID id_model;
 
@@ -33,9 +29,9 @@
 tmodelsort_convert_child_path_to_path(self, child_path)
     VALUE self, child_path;
 {
-    return TREEPATH2RVAL(gtk_tree_model_sort_convert_child_path_to_path(
+    return GTKTREEPATH2RVAL(gtk_tree_model_sort_convert_child_path_to_path(
                              _SELF(self),
-                             RVAL2TREEPATH(child_path)));
+                             RVAL2GTKTREEPATH(child_path)));
 }
 
 static VALUE
@@ -45,18 +41,18 @@
     GtkTreeIter sort_iter;
     GtkTreeModelSort* modelsort = _SELF(self);
     gtk_tree_model_sort_convert_child_iter_to_iter(modelsort, &sort_iter,
-                                                   RVAL2ITR(child_iter));
+                                                   RVAL2GTKTREEITER(child_iter));
     sort_iter.user_data3 = gtk_tree_model_sort_get_model(modelsort);
-    return ITR2RVAL(&sort_iter);
+    return GTKTREEITER2RVAL(&sort_iter);
 }
 
 static VALUE
 tmodelsort_convert_path_to_child_path(self, sorted_path)
     VALUE self, sorted_path;
 {
-    return TREEPATH2RVAL(gtk_tree_model_sort_convert_path_to_child_path(
+    return GTKTREEPATH2RVAL(gtk_tree_model_sort_convert_path_to_child_path(
                              _SELF(self),
-                             RVAL2TREEPATH(sorted_path)));
+                             RVAL2GTKTREEPATH(sorted_path)));
 }
 
 static VALUE
@@ -66,9 +62,9 @@
     GtkTreeIter child_iter;
     GtkTreeModelSort* modelsort = _SELF(self);
     gtk_tree_model_sort_convert_iter_to_child_iter(modelsort, &child_iter,
-                                                   RVAL2ITR(sorted_iter));
+                                                   RVAL2GTKTREEITER(sorted_iter));
     child_iter.user_data3 = gtk_tree_model_sort_get_model(modelsort);
-    return ITR2RVAL(&child_iter);
+    return GTKTREEITER2RVAL(&child_iter);
 } 
 
 static VALUE
@@ -92,7 +88,7 @@
 tmodelsort_iter_is_valid(self, iter)
     VALUE self, iter;
 {
-    return CBOOL2RVAL(gtk_tree_model_sort_iter_is_valid(_SELF(self), RVAL2ITR(iter)));
+    return CBOOL2RVAL(gtk_tree_model_sort_iter_is_valid(_SELF(self), RVAL2GTKTREEITER(iter)));
 }
 #endif
 

Modified: ruby-gnome2/trunk/gtk/src/rbgtktreerowreference.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtktreerowreference.c	2008-09-30 13:05:25 UTC (rev 3322)
+++ ruby-gnome2/trunk/gtk/src/rbgtktreerowreference.c	2008-09-30 13:14:58 UTC (rev 3323)
@@ -43,9 +43,6 @@
 /*****************************************/
 
 #define _SELF(s) RVAL2TREEROWREFERENCE(s)
-#define TREEPATH2RVAL(t) (BOXED2RVAL(t, GTK_TYPE_TREE_PATH))
-#define RVAL2TREEPATH(p) ((GtkTreePath*)RVAL2BOXED(p, GTK_TYPE_TREE_PATH))
-#define RVAL2ITR(i) ((GtkTreeIter*)RVAL2BOXED(i, GTK_TYPE_TREE_ITER))
 
 /*****************************************/
 
@@ -67,11 +64,11 @@
     G_CHILD_SET(self, id_proxy, proxy);
     ref = gtk_tree_row_reference_new_proxy(RVAL2GOBJ(proxy),
                                            GTK_TREE_MODEL(RVAL2GOBJ(model)), 
-                                           RVAL2TREEPATH(path));
+                                           RVAL2GTKTREEPATH(path));
   } else {
     rb_scan_args(argc, argv, "2", &model, &path);
     ref = gtk_tree_row_reference_new(GTK_TREE_MODEL(RVAL2GOBJ(model)), 
-                                     RVAL2TREEPATH(path));
+                                     RVAL2GTKTREEPATH(path));
   }
   if (ref == NULL)
       rb_raise(rb_eArgError, "Invalid arguments were passed.");
@@ -88,7 +85,7 @@
 treerowref_get_path(self)
     VALUE self;
 {
-    VALUE ret = TREEPATH2RVAL(gtk_tree_row_reference_get_path(_SELF(self)));
+    VALUE ret = GTKTREEPATH2RVAL(gtk_tree_row_reference_get_path(_SELF(self)));
     G_CHILD_SET(self, id_path, ret);
     return ret;
 }
@@ -115,7 +112,7 @@
 treerowref_s_inserted(self, proxy, path)
     VALUE self, proxy, path;
 {
-    gtk_tree_row_reference_inserted(RVAL2GOBJ(proxy), RVAL2TREEPATH(path));
+    gtk_tree_row_reference_inserted(RVAL2GOBJ(proxy), RVAL2GTKTREEPATH(path));
     return self;
 }
 
@@ -123,7 +120,7 @@
 treerowref_s_deleted(self, proxy, path)
     VALUE self, proxy, path;
 {
-    gtk_tree_row_reference_deleted(RVAL2GOBJ(proxy), RVAL2TREEPATH(path));
+    gtk_tree_row_reference_deleted(RVAL2GOBJ(proxy), RVAL2GTKTREEPATH(path));
     return self;
 }
 
@@ -143,8 +140,8 @@
         orders[i] = RARRAY(new_orders)->ptr[i];
     }
   
-    gtk_tree_row_reference_reordered(RVAL2GOBJ(proxy), RVAL2TREEPATH(path), 
-                                     RVAL2ITR(iter), orders);
+    gtk_tree_row_reference_reordered(RVAL2GOBJ(proxy), RVAL2GTKTREEPATH(path), 
+                                     RVAL2GTKTREEITER(iter), orders);
     return self;
 }
 

Modified: ruby-gnome2/trunk/gtk/src/rbgtktreeselection.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtktreeselection.c	2008-09-30 13:05:25 UTC (rev 3322)
+++ ruby-gnome2/trunk/gtk/src/rbgtktreeselection.c	2008-09-30 13:14:58 UTC (rev 3323)
@@ -13,10 +13,6 @@
 
 #define _SELF(s) (GTK_TREE_SELECTION(RVAL2GOBJ(s)))
 #define RVAL2TREEMODEL(s) (GTK_TREE_MODEL(RVAL2GOBJ(s)))
-#define RVAL2TREEPATH(p) ((GtkTreePath*)RVAL2BOXED(p, GTK_TYPE_TREE_PATH))
-#define TREEPATH2RVAL(t) (BOXED2RVAL(t, GTK_TYPE_TREE_PATH))
-#define ITR2RVAL(i) (BOXED2RVAL(i, GTK_TYPE_TREE_ITER))
-#define RVAL2ITR(i) ((GtkTreeIter*)RVAL2BOXED(i, GTK_TYPE_TREE_ITER))
 
 static VALUE
 treeselection_set_mode(self, type)
@@ -44,7 +40,7 @@
     return RVAL2CBOOL(rb_funcall((VALUE)func, id_call, 4, 
                             GOBJ2RVAL(selection),
                             GOBJ2RVAL(model),
-                            TREEPATH2RVAL(path),
+                            GTKTREEPATH2RVAL(path),
                             CBOOL2RVAL(path_currently_selected)));
 }
 
@@ -80,7 +76,7 @@
     GtkTreeModel* model;
     gboolean ret = gtk_tree_selection_get_selected(_SELF(self), &model, &iter);
     iter.user_data3 = model;
-    return ret ? ITR2RVAL(&iter) : Qnil;
+    return ret ? GTKTREEITER2RVAL(&iter) : Qnil;
 }
 
 static void
@@ -92,7 +88,7 @@
 {
     iter->user_data3 = model;
     rb_funcall((VALUE)data, id_call, 3, GOBJ2RVAL(model), 
-               TREEPATH2RVAL(path), ITR2RVAL(iter));
+               GTKTREEPATH2RVAL(path), GTKTREEITER2RVAL(iter));
 }
 
 static VALUE
@@ -110,7 +106,7 @@
 treeselection_select_path(self, path)
     VALUE self, path;
 {
-    gtk_tree_selection_select_path(_SELF(self), RVAL2TREEPATH(path));
+    gtk_tree_selection_select_path(_SELF(self), RVAL2GTKTREEPATH(path));
     return self;
 }
 
@@ -118,7 +114,7 @@
 treeselection_unselect_path(self, path)
     VALUE self, path;
 {
-    gtk_tree_selection_unselect_path(_SELF(self), RVAL2TREEPATH(path));
+    gtk_tree_selection_unselect_path(_SELF(self), RVAL2GTKTREEPATH(path));
     return self;
 }
 
@@ -126,14 +122,14 @@
 treeselection_path_is_selected(self, path)
     VALUE self, path;
 {
-    return CBOOL2RVAL(gtk_tree_selection_path_is_selected(_SELF(self), RVAL2TREEPATH(path)));
+    return CBOOL2RVAL(gtk_tree_selection_path_is_selected(_SELF(self), RVAL2GTKTREEPATH(path)));
 }
 
 static VALUE
 treeselection_select_iter(self, iter)
     VALUE self, iter;
 {
-    gtk_tree_selection_select_iter(_SELF(self), RVAL2ITR(iter));
+    gtk_tree_selection_select_iter(_SELF(self), RVAL2GTKTREEITER(iter));
     return self;
 }
 
@@ -141,7 +137,7 @@
 treeselection_unselect_iter(self, iter)
     VALUE self, iter;
 {
-    gtk_tree_selection_unselect_iter(_SELF(self), RVAL2ITR(iter));
+    gtk_tree_selection_unselect_iter(_SELF(self), RVAL2GTKTREEITER(iter));
     return self;
 }
 
@@ -149,7 +145,7 @@
 treeselection_iter_is_selected(self, iter)
     VALUE self, iter;
 {
-    return CBOOL2RVAL(gtk_tree_selection_iter_is_selected(_SELF(self), RVAL2ITR(iter)));
+    return CBOOL2RVAL(gtk_tree_selection_iter_is_selected(_SELF(self), RVAL2GTKTREEITER(iter)));
 }
 
 static VALUE
@@ -172,8 +168,8 @@
 treeselection_select_range(self, start_path, end_path)
     VALUE self, start_path, end_path;
 {
-    gtk_tree_selection_select_range(_SELF(self), RVAL2TREEPATH(start_path), 
-                                    RVAL2TREEPATH(end_path));
+    gtk_tree_selection_select_range(_SELF(self), RVAL2GTKTREEPATH(start_path), 
+                                    RVAL2GTKTREEPATH(end_path));
     return self;
 }
 
@@ -201,8 +197,8 @@
 treeselection_unselect_range(self, start_path, end_path)
     VALUE self, start_path, end_path;
 {
-    gtk_tree_selection_unselect_range(_SELF(self), RVAL2TREEPATH(start_path), 
-                                      RVAL2TREEPATH(end_path));
+    gtk_tree_selection_unselect_range(_SELF(self), RVAL2GTKTREEPATH(start_path), 
+                                      RVAL2GTKTREEPATH(end_path));
     return self;
 }
 #endif

Modified: ruby-gnome2/trunk/gtk/src/rbgtktreesortable.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtktreesortable.c	2008-09-30 13:05:25 UTC (rev 3322)
+++ ruby-gnome2/trunk/gtk/src/rbgtktreesortable.c	2008-09-30 13:14:58 UTC (rev 3323)
@@ -13,7 +13,6 @@
 #include "global.h"
 
 #define _SELF(s)	(GTK_TREE_SORTABLE(RVAL2GOBJ(s)))
-#define ITR2RVAL(i) 	(BOXED2RVAL(i, GTK_TYPE_TREE_ITER))
 
 static VALUE
 treesortable_sort_column_changed(self)
@@ -72,8 +71,8 @@
 {
     a->user_data3 = model;
     b->user_data3 = model;
-    return NUM2INT(rb_funcall((VALUE)func, id_call, 2, ITR2RVAL(a),
-			      ITR2RVAL(b)));
+    return NUM2INT(rb_funcall((VALUE)func, id_call, 2, GTKTREEITER2RVAL(a),
+			      GTKTREEITER2RVAL(b)));
 }
 
 static VALUE

Modified: ruby-gnome2/trunk/gtk/src/rbgtktreestore.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtktreestore.c	2008-09-30 13:05:25 UTC (rev 3322)
+++ ruby-gnome2/trunk/gtk/src/rbgtktreestore.c	2008-09-30 13:14:58 UTC (rev 3323)
@@ -12,8 +12,6 @@
 #include "global.h"
 
 #define _SELF(s) (GTK_TREE_STORE(RVAL2GOBJ(s)))
-#define ITR2RVAL(i) (BOXED2RVAL(i, GTK_TYPE_TREE_ITER))
-#define RVAL2ITR(i) ((GtkTreeIter*)RVAL2BOXED(i, GTK_TYPE_TREE_ITER))
 
 static VALUE
 tstore_initialize(argc, argv, self)
@@ -72,7 +70,7 @@
     G_CHILD_ADD(self, iter);
     G_CHILD_ADD(iter, value);
 
-    gtk_tree_store_set_value(_SELF(self), RVAL2ITR(iter), NUM2INT(column), &gval);
+    gtk_tree_store_set_value(_SELF(self), RVAL2GTKTREEITER(iter), NUM2INT(column), &gval);
 
     g_value_unset(&gval);
     return self;
@@ -94,9 +92,9 @@
 {
     G_CHILD_REMOVE(self, iter);
 #if GTK_CHECK_VERSION(2,2,0)
-    return CBOOL2RVAL(gtk_tree_store_remove(_SELF(self), RVAL2ITR(iter)));
+    return CBOOL2RVAL(gtk_tree_store_remove(_SELF(self), RVAL2GTKTREEITER(iter)));
 #else
-    gtk_tree_store_remove(_SELF(self), RVAL2ITR(iter));
+    gtk_tree_store_remove(_SELF(self), RVAL2GTKTREEITER(iter));
     return Qtrue;
 #endif
 }
@@ -115,10 +113,10 @@
 
     if (NIL_P(values)){
         gtk_tree_store_insert(model, &iter, 
-                              NIL_P(parent) ? NULL : RVAL2ITR(parent), 
+                              NIL_P(parent) ? NULL : RVAL2GTKTREEITER(parent), 
                               NUM2INT(position));
         iter.user_data3 = model;
-        ret = ITR2RVAL(&iter);
+        ret = GTKTREEITER2RVAL(&iter);
         G_CHILD_ADD(self, ret);
     } else {
 #if GTK_CHECK_VERSION(2,10,0)
@@ -161,14 +159,14 @@
         }
 
         gtk_tree_store_insert_with_valuesv(model, &iter,
-                                           NIL_P(parent) ? NULL : RVAL2ITR(parent),
+                                           NIL_P(parent) ? NULL : RVAL2GTKTREEITER(parent),
                                            NUM2INT(position),
                                            c_columns,
                                            c_values,
                                            size);
         iter.user_data3 = model;
 
-        ret = ITR2RVAL(&iter);
+        ret = GTKTREEITER2RVAL(&iter);
         G_CHILD_ADD(self, ret);
 
         for(i=0; i<size; i++) {
@@ -178,10 +176,10 @@
 #else
         rb_warn("Gtk::TreeStore#insert(parent, position, values) requires GTK+-2.10.0 or later");
         gtk_tree_store_insert(model, &iter, 
-                              NIL_P(parent) ? NULL : RVAL2ITR(parent), 
+                              NIL_P(parent) ? NULL : RVAL2GTKTREEITER(parent), 
                               NUM2INT(position));
         iter.user_data3 = model;
-        ret = ITR2RVAL(&iter);
+        ret = GTKTREEITER2RVAL(&iter);
         G_CHILD_ADD(self, ret);
 #endif
     }
@@ -198,10 +196,10 @@
     GtkTreeIter iter;
     GtkTreeStore* model = _SELF(self);
     gtk_tree_store_insert_before(model, &iter, 
-                                 NIL_P(parent) ? NULL : RVAL2ITR(parent), 
-                                 NIL_P(sibling) ? NULL : RVAL2ITR(sibling));
+                                 NIL_P(parent) ? NULL : RVAL2GTKTREEITER(parent), 
+                                 NIL_P(sibling) ? NULL : RVAL2GTKTREEITER(sibling));
     iter.user_data3 = model;
-    ret = ITR2RVAL(&iter);
+    ret = GTKTREEITER2RVAL(&iter);
     G_CHILD_ADD(self, ret);
     return ret;
 }
@@ -214,11 +212,11 @@
     GtkTreeIter iter;
     GtkTreeStore* model = _SELF(self);
     gtk_tree_store_insert_after(model, &iter, 
-                                NIL_P(parent) ? NULL : RVAL2ITR(parent), 
-                                NIL_P(sibling) ? NULL : RVAL2ITR(sibling));
+                                NIL_P(parent) ? NULL : RVAL2GTKTREEITER(parent), 
+                                NIL_P(sibling) ? NULL : RVAL2GTKTREEITER(sibling));
     iter.user_data3 = model;
 
-    ret = ITR2RVAL(&iter);
+    ret = GTKTREEITER2RVAL(&iter);
     G_CHILD_ADD(self, ret);
     return ret;
 }
@@ -252,10 +250,10 @@
     GtkTreeIter iter;
     GtkTreeStore* model = _SELF(self);
     gtk_tree_store_prepend(model, &iter, 
-                           NIL_P(parent)?NULL:RVAL2ITR(parent));
+                           NIL_P(parent)?NULL:RVAL2GTKTREEITER(parent));
     iter.user_data3 = model;
 
-    ret = ITR2RVAL(&iter);
+    ret = GTKTREEITER2RVAL(&iter);
     G_CHILD_ADD(self, ret);
     return ret;
 }
@@ -268,10 +266,10 @@
     GtkTreeIter iter;
     GtkTreeStore* model = _SELF(self);
     gtk_tree_store_append(model, &iter, 
-                          NIL_P(parent)?NULL:RVAL2ITR(parent));
+                          NIL_P(parent)?NULL:RVAL2GTKTREEITER(parent));
     iter.user_data3 = model;
 
-    ret = ITR2RVAL(&iter);
+    ret = GTKTREEITER2RVAL(&iter);
     G_CHILD_ADD(self, ret);
     return ret;
 }
@@ -280,15 +278,15 @@
 tstore_is_ancestor(self, iter, descendant)
     VALUE self, iter, descendant;
 {
-    return gtk_tree_store_is_ancestor(_SELF(self), RVAL2ITR(iter), 
-                                      RVAL2ITR(descendant));
+    return gtk_tree_store_is_ancestor(_SELF(self), RVAL2GTKTREEITER(iter), 
+                                      RVAL2GTKTREEITER(descendant));
 }
 
 static VALUE
 tstore_iter_depth(self, iter)
     VALUE self, iter;
 {
-    return INT2NUM(gtk_tree_store_iter_depth(_SELF(self), RVAL2ITR(iter)));
+    return INT2NUM(gtk_tree_store_iter_depth(_SELF(self), RVAL2GTKTREEITER(iter)));
 }
 
 static VALUE
@@ -305,7 +303,7 @@
     VALUE self, iter;
 {
     return (NIL_P(iter)) ? Qfalse : 
-        CBOOL2RVAL(gtk_tree_store_iter_is_valid(_SELF(self), RVAL2ITR(iter)));
+        CBOOL2RVAL(gtk_tree_store_iter_is_valid(_SELF(self), RVAL2GTKTREEITER(iter)));
 }
 static VALUE
 tstore_reorder(self, parent, new_order)
@@ -319,7 +317,7 @@
         gnew_order[i] = NUM2INT(RARRAY(new_order)->ptr[i]);
     }
 
-    gtk_tree_store_reorder(_SELF(self), RVAL2ITR(parent), gnew_order);
+    gtk_tree_store_reorder(_SELF(self), RVAL2GTKTREEITER(parent), gnew_order);
     g_free(gnew_order);
     return self;
 }
@@ -327,23 +325,23 @@
 tstore_swap(self, iter1, iter2)
     VALUE self, iter1, iter2;
 {
-    gtk_tree_store_swap(_SELF(self), RVAL2ITR(iter1), RVAL2ITR(iter2));
+    gtk_tree_store_swap(_SELF(self), RVAL2GTKTREEITER(iter1), RVAL2GTKTREEITER(iter2));
     return self;
 }
 static VALUE
 tstore_move_before(self, iter, position)
     VALUE self, iter, position;
 {
-    gtk_tree_store_move_before(_SELF(self), RVAL2ITR(iter), 
-                               NIL_P(position) ? NULL : RVAL2ITR(position));
+    gtk_tree_store_move_before(_SELF(self), RVAL2GTKTREEITER(iter), 
+                               NIL_P(position) ? NULL : RVAL2GTKTREEITER(position));
     return self;
 }
 static VALUE
 tstore_move_after(self, iter, position)
     VALUE self, iter, position;
 {
-    gtk_tree_store_move_after(_SELF(self), RVAL2ITR(iter), 
-                               NIL_P(position) ? NULL : RVAL2ITR(position));
+    gtk_tree_store_move_after(_SELF(self), RVAL2GTKTREEITER(iter), 
+                               NIL_P(position) ? NULL : RVAL2GTKTREEITER(position));
     return self;
 }
 #endif

Modified: ruby-gnome2/trunk/gtk/src/rbgtktreeview.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtktreeview.c	2008-09-30 13:05:25 UTC (rev 3322)
+++ ruby-gnome2/trunk/gtk/src/rbgtktreeview.c	2008-09-30 13:14:58 UTC (rev 3323)
@@ -13,10 +13,6 @@
 
 #define _SELF(s) (GTK_TREE_VIEW(RVAL2GOBJ(s)))
 #define TREEVIEW_COL(c) (GTK_TREE_VIEW_COLUMN(RVAL2GOBJ(c)))
-#define TREEPATH2RVAL(t) (BOXED2RVAL(t, GTK_TYPE_TREE_PATH))
-#define RVAL2TREEPATH(p) ((GtkTreePath*)RVAL2BOXED(p, GTK_TYPE_TREE_PATH))
-#define ITR2RVAL(i) (BOXED2RVAL(i, GTK_TYPE_TREE_ITER))
-#define RVAL2ITR(i) ((GtkTreeIter*)RVAL2BOXED(i, GTK_TYPE_TREE_ITER))
 #define RVAL2CELLRENDERER(c) (GTK_CELL_RENDERER(RVAL2GOBJ(c)))
 
 static ID id_model;
@@ -89,7 +85,7 @@
     iter->user_data3 = model;
     rb_funcall((VALUE)func, id_call, 4, GOBJ2RVAL(column),
                GOBJ2RVAL(cell), GOBJ2RVAL(model), 
-               BOXED2RVAL(iter, GTK_TYPE_TREE_ITER));
+               GTKTREEITER2RVAL(iter));
 }
 
 static VALUE
@@ -225,7 +221,7 @@
     VALUE self, path, column, use_align, row_align, col_align;
 {
     gtk_tree_view_scroll_to_cell(_SELF(self),
-                                 NIL_P(path) ? NULL : RVAL2TREEPATH(path),
+                                 NIL_P(path) ? NULL : RVAL2GTKTREEPATH(path),
                                  NIL_P(column) ? NULL : TREEVIEW_COL(column), 
                                  RVAL2CBOOL(use_align),
                                  NUM2DBL(row_align), NUM2DBL(col_align));
@@ -236,7 +232,7 @@
 treeview_set_cursor(self, path, focus_column, start_editing)
     VALUE self, path, focus_column, start_editing;
 {
-    gtk_tree_view_set_cursor(_SELF(self), RVAL2TREEPATH(path),
+    gtk_tree_view_set_cursor(_SELF(self), RVAL2GTKTREEPATH(path),
                              NIL_P(focus_column) ? NULL : TREEVIEW_COL(focus_column), 
                              RVAL2CBOOL(start_editing));
     return self;
@@ -250,7 +246,7 @@
     GtkTreeViewColumn* focus_column;
 
     gtk_tree_view_get_cursor(_SELF(self), &path, &focus_column);
-    return rb_ary_new3(2, path ? TREEPATH2RVAL(path) : Qnil,
+    return rb_ary_new3(2, path ? GTKTREEPATH2RVAL(path) : Qnil,
                        GOBJ2RVAL(focus_column));
 }
 
@@ -258,7 +254,7 @@
 treeview_row_activated(self, path, column)
     VALUE self, path, column;
 {
-    gtk_tree_view_row_activated(_SELF(self), RVAL2TREEPATH(path),
+    gtk_tree_view_row_activated(_SELF(self), RVAL2GTKTREEPATH(path),
                                 TREEVIEW_COL(column));
     return self;
 }
@@ -284,7 +280,7 @@
     VALUE self, path, open_all;
 {
     return CBOOL2RVAL(gtk_tree_view_expand_row(_SELF(self), 
-                                               RVAL2TREEPATH(path),
+                                               RVAL2GTKTREEPATH(path),
                                                RVAL2CBOOL(open_all)));
 }
 
@@ -293,7 +289,7 @@
 treeview_expand_to_path(self, path)
     VALUE self, path;
 {
-    gtk_tree_view_expand_to_path(_SELF(self), RVAL2TREEPATH(path));
+    gtk_tree_view_expand_to_path(_SELF(self), RVAL2GTKTREEPATH(path));
     return self;
 }
 #endif
@@ -303,7 +299,7 @@
     VALUE self, path;
 {
     return CBOOL2RVAL(gtk_tree_view_collapse_row(_SELF(self), 
-                                                 RVAL2TREEPATH(path)));
+                                                 RVAL2GTKTREEPATH(path)));
 }
 
 static void
@@ -313,7 +309,7 @@
     gpointer func;
 {
     rb_funcall((VALUE)func, id_call, 2, GOBJ2RVAL(treeview),
-               TREEPATH2RVAL(path));
+               GTKTREEPATH2RVAL(path));
 }
 
 static VALUE
@@ -333,7 +329,7 @@
     VALUE self, path;
 {
     return CBOOL2RVAL(gtk_tree_view_row_expanded(_SELF(self), 
-                                                 RVAL2TREEPATH(path)));
+                                                 RVAL2GTKTREEPATH(path)));
 }
 
 static VALUE
@@ -349,7 +345,7 @@
                                         NUM2INT(x), NUM2INT(y),
                                         &path, &column, &cell_x, &cell_y);
     return ret ? rb_ary_new3(4, 
-                             path ? TREEPATH2RVAL(path) : Qnil,
+                             path ? GTKTREEPATH2RVAL(path) : Qnil,
                              column ? GOBJ2RVAL(column) : Qnil,
                              INT2NUM(cell_x), INT2NUM(cell_y)) : Qnil;
 }
@@ -360,7 +356,7 @@
 {
     GdkRectangle rect;
     gtk_tree_view_get_cell_area(_SELF(self), 
-                                NIL_P(path) ? NULL : RVAL2TREEPATH(path),
+                                NIL_P(path) ? NULL : RVAL2GTKTREEPATH(path),
                                 NIL_P(column) ? NULL : TREEVIEW_COL(column), 
                                 &rect);
     return BOXED2RVAL(&rect, GDK_TYPE_RECTANGLE);
@@ -372,7 +368,7 @@
 {
     GdkRectangle rect;
     gtk_tree_view_get_background_area(_SELF(self), 
-                                      NIL_P(path) ? NULL : RVAL2TREEPATH(path),
+                                      NIL_P(path) ? NULL : RVAL2GTKTREEPATH(path),
                                       NIL_P(column) ? NULL : TREEVIEW_COL(column), 
                                       &rect);
     return BOXED2RVAL(&rect, GDK_TYPE_RECTANGLE);
@@ -397,8 +393,8 @@
 
     gboolean valid_paths = gtk_tree_view_get_visible_range(_SELF(self), &start_path, &end_path);
 
-    return valid_paths ? rb_assoc_new(TREEPATH2RVAL(start_path),
-                                      TREEPATH2RVAL(end_path)) : Qnil;
+    return valid_paths ? rb_assoc_new(GTKTREEPATH2RVAL(start_path),
+                                      GTKTREEPATH2RVAL(end_path)) : Qnil;
 }
 #endif
 
@@ -545,7 +541,7 @@
     VALUE self, path, pos;
 {
     gtk_tree_view_set_drag_dest_row(_SELF(self), 
-                                    NIL_P(path)?NULL:RVAL2TREEPATH(path),
+                                    NIL_P(path)?NULL:RVAL2GTKTREEPATH(path),
                                     RVAL2GENUM(pos, GTK_TYPE_TREE_VIEW_DROP_POSITION));
     return self;
 }
@@ -557,7 +553,7 @@
     GtkTreePath* path = NULL;
     GtkTreeViewDropPosition pos;
     gtk_tree_view_get_drag_dest_row(_SELF(self), &path, &pos);
-    return rb_ary_new3(2, path ? TREEPATH2RVAL(path) : Qnil, 
+    return rb_ary_new3(2, path ? GTKTREEPATH2RVAL(path) : Qnil, 
                        GENUM2RVAL(pos, GTK_TYPE_TREE_VIEW_DROP_POSITION));
 }
 
@@ -572,7 +568,7 @@
     ret = gtk_tree_view_get_dest_row_at_pos(_SELF(self), 
                                             NUM2INT(drag_x), NUM2INT(drag_y),
                                             &path, &pos);
-    return ret ? rb_ary_new3(2, path ? TREEPATH2RVAL(path) : Qnil, 
+    return ret ? rb_ary_new3(2, path ? GTKTREEPATH2RVAL(path) : Qnil, 
                              GENUM2RVAL(pos, GTK_TYPE_TREE_VIEW_DROP_POSITION)) : Qnil;
 }
 
@@ -581,7 +577,7 @@
     VALUE self, path;
 {
     return GOBJ2RVAL(gtk_tree_view_create_row_drag_icon(_SELF(self),
-                                                        RVAL2TREEPATH(path)));
+                                                        RVAL2GTKTREEPATH(path)));
 }
 
 /*
@@ -601,7 +597,7 @@
     iter->user_data3 = model;
     return RVAL2CBOOL(rb_funcall((VALUE)func, id_call, 4, 
                             GOBJ2RVAL(model), INT2NUM(column),
-                            CSTR2RVAL(key), ITR2RVAL(iter)));
+                            CSTR2RVAL(key), GTKTREEITER2RVAL(iter)));
 }
 
 static VALUE
@@ -630,7 +626,7 @@
     GtkTreeIter* iter = g_value_get_boxed(&values[1]);
     iter->user_data3 = gtk_tree_view_get_model(view);
 
-    return rb_ary_new3(3, GOBJ2RVAL(view), ITR2RVAL(iter), GVAL2RVAL(&values[2]));
+    return rb_ary_new3(3, GOBJ2RVAL(view), GTKTREEITER2RVAL(iter), GVAL2RVAL(&values[2]));
 }
 
 #if GTK_CHECK_VERSION(2,2,0)
@@ -638,7 +634,7 @@
 treeview_set_cursor_on_cell(self, path, focus_column, focus_cell, start_editing)
     VALUE self, path, focus_column, focus_cell, start_editing;
 {
-    gtk_tree_view_set_cursor_on_cell(_SELF(self), RVAL2TREEPATH(path),
+    gtk_tree_view_set_cursor_on_cell(_SELF(self), RVAL2GTKTREEPATH(path),
                                      NIL_P(focus_column) ? NULL : TREEVIEW_COL(focus_column), 
                                      NIL_P(focus_cell) ? NULL : GTK_CELL_RENDERER(RVAL2GOBJ(focus_cell)), 
                                      RVAL2CBOOL(start_editing));
@@ -677,7 +673,7 @@
     VALUE ret;
     iter->user_data3 = model;
     ret = rb_funcall((VALUE)func, id_call, 2, GOBJ2RVAL(model), 
-                     BOXED2RVAL(iter, GTK_TYPE_TREE_ITER));
+                     GTKTREEITER2RVAL(iter));
     return CBOOL2RVAL(ret);
 }
 

Modified: ruby-gnome2/trunk/gtk/src/rbgtktreeviewcolumn.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtktreeviewcolumn.c	2008-09-30 13:05:25 UTC (rev 3322)
+++ ruby-gnome2/trunk/gtk/src/rbgtktreeviewcolumn.c	2008-09-30 13:14:58 UTC (rev 3323)
@@ -146,7 +146,7 @@
     iter->user_data3 = model;
     rb_funcall((VALUE)func, id_call, 4, GOBJ2RVAL(tree_column),
                GOBJ2RVAL(cell), GOBJ2RVAL(model), 
-               BOXED2RVAL(iter, GTK_TYPE_TREE_ITER));
+               GTKTREEITER2RVAL(iter));
 }
 
 
@@ -215,7 +215,7 @@
 {
     gtk_tree_view_column_cell_set_cell_data(_SELF(self), 
                                             GTK_TREE_MODEL(RVAL2GOBJ(model)),
-                                            (GtkTreeIter*)RVAL2BOXED(iter, GTK_TYPE_TREE_ITER), 
+                                            RVAL2GTKTREEITER(iter), 
                                             RVAL2CBOOL(is_expander), 
                                             RVAL2CBOOL(is_expanded));
     return self;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3334
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3334&view=rev
Author:   ktou
Date:     2008-09-30 15:03:10 +0000 (Tue, 30 Sep 2008)

Log Message:
-----------
* src/makeinits.rb: call Init_gtk_gdk_draw() before Init_gtk_gdk_gc(). [#2113491]
  Reported by Ricky Zheng. Thanks!!!

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/makeinits.rb

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-09-30 14:56:46 UTC (rev 3333)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-09-30 15:03:10 UTC (rev 3334)
@@ -1,3 +1,9 @@
+2008-10-01  Kouhei Sutou  <kou@...>
+
+	* src/makeinits.rb: call Init_gtk_gdk_draw() before
+	Init_gtk_gdk_gc(). [#2113491]
+	Reported by Ricky Zheng. Thanks!!!
+
 2008-09-30  Kouhei Sutou  <kou@...>
 
 	* gtk/src/rbgtkconversions.h: add.

Modified: ruby-gnome2/trunk/gtk/src/makeinits.rb
===================================================================
--- ruby-gnome2/trunk/gtk/src/makeinits.rb	2008-09-30 14:56:46 UTC (rev 3333)
+++ ruby-gnome2/trunk/gtk/src/makeinits.rb	2008-09-30 15:03:10 UTC (rev 3334)
@@ -1,10 +1,24 @@
 except_targets = ["Init_gtk2()", "Init_gtk_gdk()", "Init_gtk_gtk()"]
+dependencies = {
+  "Init_gtk_gdk_gc()" => ["Init_gtk_gdk_draw()"],
+}
 
 def print_data(array, type, defs, extern = false)
   if array[type]
     extern_def = "extern void" if extern
     print "##{defs} #{type}\n" if defs
-    array[type].each do |val|
+    sorted_array = array[type].dup
+    dependencies.each do |key, values|
+      key_index = sorted_array.index(key)
+      values.each do |value|
+        value_index = sorted_array.index(value)
+        next if value_index.nil?
+        sorted_array.delete(value)
+        sorted_array[key_index - 1, 1] = value
+        key_index = sorted_array.index(key)
+      end
+    end
+    sorted_array.each do |val|
 	   print "#{extern_def}   #{val};\n"
     end
     print "#endif\n" if defs


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3339
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3339&view=rev
Author:   ktou
Date:     2008-10-02 23:30:48 +0000 (Thu, 02 Oct 2008)

Log Message:
-----------
* src/makeinits.rb: fix a bug that init function is deleted.
  Reported by kimura wataru. Thanks!!!

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/makeinits.rb

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-10-02 23:29:18 UTC (rev 3338)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-10-02 23:30:48 UTC (rev 3339)
@@ -1,3 +1,8 @@
+2008-10-03  Kouhei Sutou  <kou@...>
+
+	* src/makeinits.rb: fix a bug that init function is deleted.
+	Reported by kimura wataru. Thanks!!!
+
 2008-10-01  Kouhei Sutou  <kou@...>
 
 	* src/makeinits.rb: call Init_gtk_gdk_draw() before

Modified: ruby-gnome2/trunk/gtk/src/makeinits.rb
===================================================================
--- ruby-gnome2/trunk/gtk/src/makeinits.rb	2008-10-02 23:29:18 UTC (rev 3338)
+++ ruby-gnome2/trunk/gtk/src/makeinits.rb	2008-10-02 23:30:48 UTC (rev 3339)
@@ -14,7 +14,7 @@
         value_index = sorted_array.index(value)
         next if value_index.nil?
         sorted_array.delete(value)
-        sorted_array[key_index - 1, 1] = value
+        sorted_array[key_index - 1, 0] = value
         key_index = sorted_array.index(key)
       end
     end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3342
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3342&view=rev
Author:   ktou
Date:     2008-10-04 02:55:23 +0000 (Sat, 04 Oct 2008)

Log Message:
-----------
* src/rbgtkfilechooser.c: check GTK_FILE_SYSTEM_ERROR availability.
  Reported by Philipp G?\195?\182tzinger. Thanks!!!

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgtkfilechooser.c

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-10-03 23:21:31 UTC (rev 3341)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-10-04 02:55:23 UTC (rev 3342)
@@ -1,3 +1,8 @@
+2008-10-04  Kouhei Sutou  <kou@...>
+
+	* src/rbgtkfilechooser.c: check GTK_FILE_SYSTEM_ERROR availability.
+	Reported by Philipp Götzinger. Thanks!!!
+
 2008-10-03  Kouhei Sutou  <kou@...>
 
 	* src/makeinits.rb: fix a bug that init function is deleted.

Modified: ruby-gnome2/trunk/gtk/src/rbgtkfilechooser.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkfilechooser.c	2008-10-03 23:21:31 UTC (rev 3341)
+++ ruby-gnome2/trunk/gtk/src/rbgtkfilechooser.c	2008-10-04 02:55:23 UTC (rev 3342)
@@ -372,7 +372,7 @@
     G_DEF_ERROR(GTK_FILE_CHOOSER_ERROR, "FileChooserError", mGtk, rb_eRuntimeError, 
                 GTK_TYPE_FILE_CHOOSER_ERROR);
 
-#ifdef HAVE_GTK_GTKFILESYSTEM_H
+#ifdef GTK_FILE_SYSTEM_ERROR
     /* GtkFileSystemError */
     eFileSystemError = G_DEF_ERROR2(GTK_FILE_SYSTEM_ERROR, "FileSystemError",
 				    mGtk, rb_eRuntimeError);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3387
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3387&view=rev
Author:   ktou
Date:     2008-10-18 06:21:54 +0000 (Sat, 18 Oct 2008)

Log Message:
-----------
* src/rbgtkaction.c, src/rbgtkactiongroup.c, src/rbgtkcontainer.c,
src/rbgtkuimanager.c: fix GC problems.
Reported by Andrew S. Townley. Thanks!!!

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgtkaction.c
    ruby-gnome2/trunk/gtk/src/rbgtkactiongroup.c
    ruby-gnome2/trunk/gtk/src/rbgtkcontainer.c
    ruby-gnome2/trunk/gtk/src/rbgtkuimanager.c

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-10-16 13:41:58 UTC (rev 3386)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-10-18 06:21:54 UTC (rev 3387)
@@ -1,3 +1,9 @@
+2008-10-18  Kouhei Sutou  <kou@...>
+
+	* src/rbgtkaction.c, src/rbgtkactiongroup.c, src/rbgtkcontainer.c,
+	src/rbgtkuimanager.c: fix GC problems.
+	Reported by Andrew S. Townley. Thanks!!!
+
 2008-10-04  Kouhei Sutou  <kou@...>
 
 	* src/rbgtkfilechooser.c: check GTK_FILE_SYSTEM_ERROR availability.

Modified: ruby-gnome2/trunk/gtk/src/rbgtkaction.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkaction.c	2008-10-16 13:41:58 UTC (rev 3386)
+++ ruby-gnome2/trunk/gtk/src/rbgtkaction.c	2008-10-18 06:21:54 UTC (rev 3387)
@@ -10,7 +10,7 @@
 ************************************************/
 
 #include "global.h"
-                                                                                
+
 #if GTK_CHECK_VERSION(2,4,0)
 
 #define _SELF(self) (GTK_ACTION(RVAL2GOBJ(self)))
@@ -210,14 +210,31 @@
 }
 #endif
 
+static void
+action_mark(void *p)
+{
+    GtkAction *action;
+    GSList *node;
+
+    action = GTK_ACTION(p);
+    for (node = gtk_action_get_proxies(action);
+	 node;
+	 node = g_slist_next(node)) {
+	GtkWidget *proxy = node->data;
+	rbgobj_gc_mark_instance(proxy);
+    }
+}
 #endif
 
-void 
+void
 Init_gtk_action()
 {
 #if GTK_CHECK_VERSION(2,4,0)
-    VALUE gAction = G_DEF_CLASS(GTK_TYPE_ACTION, "Action", mGtk);
+    VALUE gAction;
 
+    gAction = G_DEF_CLASS_WITH_GC_FUNC(GTK_TYPE_ACTION, "Action", mGtk,
+				       action_mark, NULL);
+
     rb_define_method(gAction, "initialize", action_initialize, -1);
     /* (NOTICE) Gtk::Action#is_sensitive?, #is_visible are special.
        Because there are also Gtk::Action#sensitive?, #visible? as property 

Modified: ruby-gnome2/trunk/gtk/src/rbgtkactiongroup.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkactiongroup.c	2008-10-16 13:41:58 UTC (rev 3386)
+++ ruby-gnome2/trunk/gtk/src/rbgtkactiongroup.c	2008-10-18 06:21:54 UTC (rev 3387)
@@ -317,14 +317,32 @@
     return CSTR2RVAL(gtk_action_group_translate_string(_SELF(self), RVAL2CSTR(str)));
 }
 #endif
+
+static void
+action_group_mark(void *p)
+{
+    GtkActionGroup *group;
+    GList *actions, *node;
+
+    group = GTK_ACTION_GROUP(p);
+    actions = gtk_action_group_list_actions(group);
+    for (node = actions; node; node = g_list_next(node)) {
+	GtkWidget *action = node->data;
+	rbgobj_gc_mark_instance(action);
+    }
+    g_list_free(actions);
+}
 #endif
 
 void 
 Init_gtk_actiongroup()
 {
 #if GTK_CHECK_VERSION(2,4,0)
-    VALUE gActionGroup = G_DEF_CLASS(GTK_TYPE_ACTION_GROUP, "ActionGroup", mGtk);
+    VALUE gActionGroup;
 
+    gActionGroup = G_DEF_CLASS_WITH_GC_FUNC(GTK_TYPE_ACTION_GROUP, "ActionGroup",
+					    mGtk, action_group_mark, NULL);
+
     id_action_procs = rb_intern("@action_procs");
     id_toggle_action_procs = rb_intern("@toggle_action_procs");
 

Modified: ruby-gnome2/trunk/gtk/src/rbgtkcontainer.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkcontainer.c	2008-10-16 13:41:58 UTC (rev 3386)
+++ ruby-gnome2/trunk/gtk/src/rbgtkcontainer.c	2008-10-18 06:21:54 UTC (rev 3387)
@@ -729,8 +729,10 @@
 void 
 Init_gtk_container()
 {
-    VALUE gContainer = G_DEF_CLASS2(GTK_TYPE_CONTAINER, "Container", mGtk, cont_mark, NULL);
+    VALUE gContainer;
 
+    gContainer = G_DEF_CLASS_WITH_GC_FUNC(GTK_TYPE_CONTAINER, "Container",
+					  mGtk, cont_mark, NULL);
     rb_define_method(gContainer, "resize_container?", cont_is_resize_container, 0);
     rb_define_method(gContainer, "add", cont_add, -1);
     rb_define_alias(gContainer, "<<", "add");

Modified: ruby-gnome2/trunk/gtk/src/rbgtkuimanager.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkuimanager.c	2008-10-16 13:41:58 UTC (rev 3386)
+++ ruby-gnome2/trunk/gtk/src/rbgtkuimanager.c	2008-10-18 06:21:54 UTC (rev 3387)
@@ -158,14 +158,32 @@
     gtk_ui_manager_ensure_update(_SELF(self));
     return self;
 }
+
+static void
+rbuimanager_mark(void *p)
+{
+    GtkUIManager *manager;
+    GList *node;
+
+    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);
+    }
+}
 #endif
 
-void 
+void
 Init_gtk_uimanager()
 {
 #if GTK_CHECK_VERSION(2,4,0)
-    VALUE gUI = G_DEF_CLASS(GTK_TYPE_UI_MANAGER, "UIManager", mGtk);
+    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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3388
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3388&view=rev
Author:   ggc
Date:     2008-10-22 15:15:35 +0000 (Wed, 22 Oct 2008)

Log Message:
-----------
add a basic Gdk::GC autotest

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog

Added Paths:
-----------
    ruby-gnome2/trunk/gtk/test/test_gdk_gc.rb

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-10-18 06:21:54 UTC (rev 3387)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-10-22 15:15:35 UTC (rev 3388)
@@ -1,3 +1,7 @@
+2008-10-22  Guillaume Cottenceau
+
+	* test/test_gdk_gc.rb: add a basic Gdk::GC autotest
+
 2008-10-18  Kouhei Sutou  <kou@...>
 
 	* src/rbgtkaction.c, src/rbgtkactiongroup.c, src/rbgtkcontainer.c,

Added: ruby-gnome2/trunk/gtk/test/test_gdk_gc.rb
===================================================================
--- ruby-gnome2/trunk/gtk/test/test_gdk_gc.rb	                        (rev 0)
+++ ruby-gnome2/trunk/gtk/test/test_gdk_gc.rb	2008-10-22 15:15:35 UTC (rev 3388)
@@ -0,0 +1,9 @@
+class TestGdkGC < Test::Unit::TestCase
+  include GtkTestUtils
+
+  def test_constant
+    assert_nothing_raised do
+      foo = Gdk::GC::LINE_ON_OFF_DASH
+    end
+  end
+end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3389
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3389&view=rev
Author:   ktou
Date:     2008-10-23 12:25:45 +0000 (Thu, 23 Oct 2008)

Log Message:
-----------
* test/test_gtk_unix_print.rb, test/test_gdk_gc.rb: use
  assert_const_defined and assert_const_not_defined.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/test/test_gdk_gc.rb
    ruby-gnome2/trunk/gtk/test/test_gtk_unix_print.rb

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-10-22 15:15:35 UTC (rev 3388)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-10-23 12:25:45 UTC (rev 3389)
@@ -1,3 +1,8 @@
+2008-10-23  Kouhei Sutou  <kou@...>
+
+	* test/test_gtk_unix_print.rb, test/test_gdk_gc.rb: use
+	assert_const_defined and assert_const_not_defined.
+
 2008-10-22  Guillaume Cottenceau
 
 	* test/test_gdk_gc.rb: add a basic Gdk::GC autotest

Modified: ruby-gnome2/trunk/gtk/test/test_gdk_gc.rb
===================================================================
--- ruby-gnome2/trunk/gtk/test/test_gdk_gc.rb	2008-10-22 15:15:35 UTC (rev 3388)
+++ ruby-gnome2/trunk/gtk/test/test_gdk_gc.rb	2008-10-23 12:25:45 UTC (rev 3389)
@@ -2,8 +2,6 @@
   include GtkTestUtils
 
   def test_constant
-    assert_nothing_raised do
-      foo = Gdk::GC::LINE_ON_OFF_DASH
-    end
+    assert_const_defined(Gdk, :GC)
   end
 end

Modified: ruby-gnome2/trunk/gtk/test/test_gtk_unix_print.rb
===================================================================
--- ruby-gnome2/trunk/gtk/test/test_gtk_unix_print.rb	2008-10-22 15:15:35 UTC (rev 3388)
+++ ruby-gnome2/trunk/gtk/test/test_gtk_unix_print.rb	2008-10-23 12:25:45 UTC (rev 3389)
@@ -3,20 +3,12 @@
     if GLib.os_unix?
       assertion = :assert_const_defined
     else
-      assertion = :assert_not_const_defined
+      assertion = :assert_const_not_defined
     end
-    send(assertion, :PageSetupUnixDialog)
-    send(assertion, :Printer)
-    send(assertion, :PrintCapabilities)
-    send(assertion, :PrintJob)
-    send(assertion, :PrintUnixDialog)
+    send(assertion, Gtk, :PageSetupUnixDialog)
+    send(assertion, Gtk, :Printer)
+    send(assertion, Gtk, :PrintCapabilities)
+    send(assertion, Gtk, :PrintJob)
+    send(assertion, Gtk, :PrintUnixDialog)
   end
-
-  def assert_const_defined(name)
-    assert_operator(Gtk, :const_defined?, name)
-  end
-
-  def assert_not_const_defined(name)
-    assert(Gtk.const_defined?(name), "!Gtk.const_defined?(#{name.inspect})")
-  end
 end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3398
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3398&view=rev
Author:   ktou
Date:     2008-10-25 01:43:28 +0000 (Sat, 25 Oct 2008)

Log Message:
-----------
* test/test_gtk_unix_print.rb (TestGtkUnixPrint#test_classes):
  assert_const_not_defined -> assert_not_const_defined.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/test/test_gtk_unix_print.rb

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-10-23 13:48:45 UTC (rev 3397)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-10-25 01:43:28 UTC (rev 3398)
@@ -1,3 +1,8 @@
+2008-10-25  Kouhei Sutou  <kou@...>
+
+	* test/test_gtk_unix_print.rb (TestGtkUnixPrint#test_classes):
+	assert_const_not_defined -> assert_not_const_defined.
+
 2008-10-23  Kouhei Sutou  <kou@...>
 
 	* test/test_gtk_unix_print.rb, test/test_gdk_gc.rb: use

Modified: ruby-gnome2/trunk/gtk/test/test_gtk_unix_print.rb
===================================================================
--- ruby-gnome2/trunk/gtk/test/test_gtk_unix_print.rb	2008-10-23 13:48:45 UTC (rev 3397)
+++ ruby-gnome2/trunk/gtk/test/test_gtk_unix_print.rb	2008-10-25 01:43:28 UTC (rev 3398)
@@ -3,7 +3,7 @@
     if GLib.os_unix?
       assertion = :assert_const_defined
     else
-      assertion = :assert_const_not_defined
+      assertion = :assert_not_const_defined
     end
     send(assertion, Gtk, :PageSetupUnixDialog)
     send(assertion, Gtk, :Printer)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3401
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3401&view=rev
Author:   ktou
Date:     2008-11-01 12:37:17 +0000 (Sat, 01 Nov 2008)

Log Message:
-----------
* src/rbgtkconversions.h: add conversions:
- RVAL2GTKSTATETYPE
- GTKRCFLAGS2RVAL
- RVAL2GTKRCFLAGS

* src/rbgtkrcstyle.c, test/test_gtk_rc_style.rb: fix type
conversion.
Bug #2195432: Gtk::RCStyle.set_color_flags wrong conversion
Reported by Jesse van den Kieboom. Thanks!!!

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgtkconversions.h
    ruby-gnome2/trunk/gtk/src/rbgtkrcstyle.c

Added Paths:
-----------
    ruby-gnome2/trunk/gtk/test/test_gtk_rc_style.rb

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-10-25 01:46:48 UTC (rev 3400)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-11-01 12:37:17 UTC (rev 3401)
@@ -1,3 +1,15 @@
+2008-11-01  Kouhei Sutou  <kou@...>
+
+	* src/rbgtkconversions.h: add conversions:
+	- RVAL2GTKSTATETYPE
+	- GTKRCFLAGS2RVAL
+	- RVAL2GTKRCFLAGS
+
+	* src/rbgtkrcstyle.c, test/test_gtk_rc_style.rb: fix type
+	conversion.
+	Bug #2195432: Gtk::RCStyle.set_color_flags wrong conversion
+	Reported by Jesse van den Kieboom. Thanks!!!
+
 2008-10-25  Kouhei Sutou  <kou@...>
 
 	* test/test_gtk_unix_print.rb (TestGtkUnixPrint#test_classes):

Modified: ruby-gnome2/trunk/gtk/src/rbgtkconversions.h
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkconversions.h	2008-10-25 01:46:48 UTC (rev 3400)
+++ ruby-gnome2/trunk/gtk/src/rbgtkconversions.h	2008-11-01 12:37:17 UTC (rev 3401)
@@ -17,4 +17,8 @@
 #define GTKTREEITER2RVAL(i) (BOXED2RVAL(i, GTK_TYPE_TREE_ITER))
 #define RVAL2GTKTREEITER(i) ((GtkTreeIter *)RVAL2BOXED(i, GTK_TYPE_TREE_ITER))
 
+#define RVAL2GTKSTATETYPE(type) (RVAL2GENUM(type, GTK_TYPE_STATE_TYPE))
+#define GTKRCFLAGS2RVAL(flags) (GFLAGS2RVAL(flags, GTK_TYPE_RC_FLAGS))
+#define RVAL2GTKRCFLAGS(flags) (RVAL2GFLAGS(flags, GTK_TYPE_RC_FLAGS))
+
 #endif /* _RBGTKCONVERSIONS_H */

Modified: ruby-gnome2/trunk/gtk/src/rbgtkrcstyle.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkrcstyle.c	2008-10-25 01:46:48 UTC (rev 3400)
+++ ruby-gnome2/trunk/gtk/src/rbgtkrcstyle.c	2008-11-01 12:37:17 UTC (rev 3401)
@@ -76,25 +76,21 @@
 }
 
 static VALUE
-rcstyle_color_flags(self, idx)
-    VALUE self, idx;
+rcstyle_color_flags(VALUE self, VALUE rb_state_type)
 {
-    int i = NUM2INT(idx);
+    GtkStateType state_type;
 
-    if (i < 0 || 5 < i)
-        rb_raise(rb_eArgError, "state out of range");
-    return INT2FIX(_SELF(self)->color_flags[i]);
+    state_type = RVAL2GTKSTATETYPE(rb_state_type);
+    return GTKRCFLAGS2RVAL(_SELF(self)->color_flags[state_type]);
 }
 
 static VALUE
-rcstyle_set_color_flags(self, idx, flags)
-    VALUE self, idx, flags;
+rcstyle_set_color_flags(VALUE self, VALUE rb_state_type, VALUE flags)
 {
-    GtkRcFlags i = (GtkRcFlags)FIX2INT(idx);
+    GtkStateType state_type;
 
-    if (i < 0 || 5 < i)
-        rb_raise(rb_eArgError, "state out of range");
-    _SELF(self)->color_flags[i] = flags;
+    state_type = RVAL2GTKSTATETYPE(rb_state_type);
+    _SELF(self)->color_flags[state_type] = RVAL2GTKRCFLAGS(flags);
     return self;
 }
 

Added: ruby-gnome2/trunk/gtk/test/test_gtk_rc_style.rb
===================================================================
--- ruby-gnome2/trunk/gtk/test/test_gtk_rc_style.rb	                        (rev 0)
+++ ruby-gnome2/trunk/gtk/test/test_gtk_rc_style.rb	2008-11-01 12:37:17 UTC (rev 3401)
@@ -0,0 +1,14 @@
+class TestGtkRcStyle < Test::Unit::TestCase
+  include GtkTestUtils
+
+  def setup
+    @style = Gtk::RcStyle.new
+  end
+
+  def test_color_flags
+    assert_equal(Gtk::RC::Flags.new, @style.color_flags(:normal))
+    @style.set_color_flags(:normal, [:fg, :bg])
+    assert_equal(Gtk::RC::Flags::FG | Gtk::RC::Flags::BG,
+                 @style.color_flags(:normal))
+  end
+end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3403
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3403&view=rev
Author:   ktou
Date:     2008-11-01 12:39:59 +0000 (Sat, 01 Nov 2008)

Log Message:
-----------
* src/rbgtkwidget.c: use RVAL2GTKSTATETYPE().

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgtkwidget.c

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-11-01 12:37:38 UTC (rev 3402)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-11-01 12:39:59 UTC (rev 3403)
@@ -1,5 +1,7 @@
 2008-11-01  Kouhei Sutou  <kou@...>
 
+	* src/rbgtkwidget.c: use RVAL2GTKSTATETYPE().
+
 	* src/rbgtkconversions.h: add conversions:
 	- RVAL2GTKSTATETYPE
 	- GTKRCFLAGS2RVAL

Modified: ruby-gnome2/trunk/gtk/src/rbgtkwidget.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkwidget.c	2008-11-01 12:37:38 UTC (rev 3402)
+++ ruby-gnome2/trunk/gtk/src/rbgtkwidget.c	2008-11-01 12:39:59 UTC (rev 3403)
@@ -287,7 +287,7 @@
 widget_set_state(self, state)
     VALUE self, state;
 {
-    gtk_widget_set_state(_SELF(self), RVAL2GENUM(state, GTK_TYPE_STATE_TYPE));
+    gtk_widget_set_state(_SELF(self), RVAL2GTKSTATETYPE(state));
     return self;
 }
 
@@ -569,7 +569,7 @@
 widget_modify_fg(self, state, color)
     VALUE self, state, color;
 {
-    gtk_widget_modify_fg(_SELF(self), RVAL2GENUM(state, GTK_TYPE_STATE_TYPE), 
+    gtk_widget_modify_fg(_SELF(self), RVAL2GTKSTATETYPE(state),
                          RVAL2GDKCOLOR(color));
     return self;
 }
@@ -578,7 +578,7 @@
 widget_modify_bg(self, state, color)
     VALUE self, state, color;
 {
-    gtk_widget_modify_bg(_SELF(self), RVAL2GENUM(state, GTK_TYPE_STATE_TYPE),
+    gtk_widget_modify_bg(_SELF(self), RVAL2GTKSTATETYPE(state),
                          RVAL2GDKCOLOR(color));
     return self;
 }
@@ -587,7 +587,7 @@
 widget_modify_text(self, state, color)
     VALUE self, state, color;
 {
-    gtk_widget_modify_text(_SELF(self), RVAL2GENUM(state, GTK_TYPE_STATE_TYPE),
+    gtk_widget_modify_text(_SELF(self), RVAL2GTKSTATETYPE(state),
                          RVAL2GDKCOLOR(color));
     return self;
 }
@@ -596,7 +596,7 @@
 widget_modify_base(self, state, color)
     VALUE self, state, color;
 {
-    gtk_widget_modify_base(_SELF(self), RVAL2GENUM(state, GTK_TYPE_STATE_TYPE),
+    gtk_widget_modify_base(_SELF(self), RVAL2GTKSTATETYPE(state),
                          RVAL2GDKCOLOR(color));
     return self;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3404
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3404&view=rev
Author:   ktou
Date:     2008-11-01 12:42:20 +0000 (Sat, 01 Nov 2008)

Log Message:
-----------
* src/rbgtk.h (RVAL2GDKCOLOR, GDKCOLOR2RVAL): move to ...
* src/rbgtkconversions.h: ... here.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgtk.h
    ruby-gnome2/trunk/gtk/src/rbgtkconversions.h

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-11-01 12:39:59 UTC (rev 3403)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-11-01 12:42:20 UTC (rev 3404)
@@ -1,5 +1,8 @@
 2008-11-01  Kouhei Sutou  <kou@...>
 
+	* src/rbgtk.h (RVAL2GDKCOLOR, GDKCOLOR2RVAL): move to ...
+	* src/rbgtkconversions.h: ... here.
+
 	* src/rbgtkwidget.c: use RVAL2GTKSTATETYPE().
 
 	* src/rbgtkconversions.h: add conversions:

Modified: ruby-gnome2/trunk/gtk/src/rbgtk.h
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtk.h	2008-11-01 12:39:59 UTC (rev 3403)
+++ ruby-gnome2/trunk/gtk/src/rbgtk.h	2008-11-01 12:42:20 UTC (rev 3404)
@@ -39,10 +39,7 @@
 #define RVAL2GEV(ev) (get_gdkevent(ev))
 #define RVAL2ATOM(atom) (get_gdkatom(atom))
 
-#define RVAL2GDKCOLOR(color) ((GdkColor *)RVAL2BOXED(color, GDK_TYPE_COLOR))
-#define GDKCOLOR2RVAL(color) (BOXED2RVAL(color, GDK_TYPE_COLOR))
 
-
 #define RBGTK_INITIALIZE(obj,gtkobj)\
  (rbgtk_initialize_gtkobject(obj, GTK_OBJECT(gtkobj)))
 

Modified: ruby-gnome2/trunk/gtk/src/rbgtkconversions.h
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkconversions.h	2008-11-01 12:39:59 UTC (rev 3403)
+++ ruby-gnome2/trunk/gtk/src/rbgtkconversions.h	2008-11-01 12:42:20 UTC (rev 3404)
@@ -21,4 +21,7 @@
 #define GTKRCFLAGS2RVAL(flags) (GFLAGS2RVAL(flags, GTK_TYPE_RC_FLAGS))
 #define RVAL2GTKRCFLAGS(flags) (RVAL2GFLAGS(flags, GTK_TYPE_RC_FLAGS))
 
+#define RVAL2GDKCOLOR(color) ((GdkColor *)RVAL2BOXED(color, GDK_TYPE_COLOR))
+#define GDKCOLOR2RVAL(color) (BOXED2RVAL(color, GDK_TYPE_COLOR))
+
 #endif /* _RBGTKCONVERSIONS_H */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3405
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3405&view=rev
Author:   ktou
Date:     2008-11-01 12:46:45 +0000 (Sat, 01 Nov 2008)

Log Message:
-----------
* test/test_gtk_widget.rb
  (TestGtkWidget#test_modify_color_component_with_nil_color): add.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/test/test_gtk_widget.rb

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-11-01 12:42:20 UTC (rev 3404)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-11-01 12:46:45 UTC (rev 3405)
@@ -1,5 +1,8 @@
 2008-11-01  Kouhei Sutou  <kou@...>
 
+	* test/test_gtk_widget.rb
+	(TestGtkWidget#test_modify_color_component_with_nil_color): add.
+
 	* src/rbgtk.h (RVAL2GDKCOLOR, GDKCOLOR2RVAL): move to ...
 	* src/rbgtkconversions.h: ... here.
 

Modified: ruby-gnome2/trunk/gtk/test/test_gtk_widget.rb
===================================================================
--- ruby-gnome2/trunk/gtk/test/test_gtk_widget.rb	2008-11-01 12:42:20 UTC (rev 3404)
+++ ruby-gnome2/trunk/gtk/test/test_gtk_widget.rb	2008-11-01 12:46:45 UTC (rev 3405)
@@ -11,4 +11,22 @@
     @widget.window = window
     assert_equal(window, @widget.window)
   end
+
+  def test_modify_color_component_with_nil_color
+    assert_nothing_raised do
+      @widget.modify_base(:normal, nil)
+    end
+
+    assert_nothing_raised do
+      @widget.modify_text(:normal, nil)
+    end
+
+    assert_nothing_raised do
+      @widget.modify_fg(:normal, nil)
+    end
+
+    assert_nothing_raised do
+      @widget.modify_bg(:normal, nil)
+    end
+  end
 end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3407
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3407&view=rev
Author:   ktou
Date:     2008-11-01 13:53:37 +0000 (Sat, 01 Nov 2008)

Log Message:
-----------
* src/: use RARRAY_PTR() and RARRAY_LEN().

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgdkdevice.c
    ruby-gnome2/trunk/gtk/src/rbgdkdisplay.c
    ruby-gnome2/trunk/gtk/src/rbgdkdragcontext.c
    ruby-gnome2/trunk/gtk/src/rbgdkdraw.c
    ruby-gnome2/trunk/gtk/src/rbgdkgc.c
    ruby-gnome2/trunk/gtk/src/rbgdkpango.c
    ruby-gnome2/trunk/gtk/src/rbgdkpixmap.c
    ruby-gnome2/trunk/gtk/src/rbgdkregion.c
    ruby-gnome2/trunk/gtk/src/rbgdkrgb.c
    ruby-gnome2/trunk/gtk/src/rbgdkscreen.c
    ruby-gnome2/trunk/gtk/src/rbgdktimecoord.c
    ruby-gnome2/trunk/gtk/src/rbgdkwindow.c
    ruby-gnome2/trunk/gtk/src/rbgtkaboutdialog.c
    ruby-gnome2/trunk/gtk/src/rbgtkactiongroup.c
    ruby-gnome2/trunk/gtk/src/rbgtkbindingset.c
    ruby-gnome2/trunk/gtk/src/rbgtkcelllayout.c
    ruby-gnome2/trunk/gtk/src/rbgtkclipboard.c
    ruby-gnome2/trunk/gtk/src/rbgtkcolorsel.c
    ruby-gnome2/trunk/gtk/src/rbgtkcombo.c
    ruby-gnome2/trunk/gtk/src/rbgtkcontainer.c
    ruby-gnome2/trunk/gtk/src/rbgtkcurve.c
    ruby-gnome2/trunk/gtk/src/rbgtkdialog.c
    ruby-gnome2/trunk/gtk/src/rbgtkdrag.c
    ruby-gnome2/trunk/gtk/src/rbgtkicontheme.c
    ruby-gnome2/trunk/gtk/src/rbgtkiconview.c
    ruby-gnome2/trunk/gtk/src/rbgtkimcontextsimple.c
    ruby-gnome2/trunk/gtk/src/rbgtkitemfactory.c
    ruby-gnome2/trunk/gtk/src/rbgtkliststore.c
    ruby-gnome2/trunk/gtk/src/rbgtkmain.c
    ruby-gnome2/trunk/gtk/src/rbgtkmenu.c
    ruby-gnome2/trunk/gtk/src/rbgtkprintsettings.c
    ruby-gnome2/trunk/gtk/src/rbgtkradioaction.c
    ruby-gnome2/trunk/gtk/src/rbgtkradiomenuitem.c
    ruby-gnome2/trunk/gtk/src/rbgtkradiotoolbutton.c
    ruby-gnome2/trunk/gtk/src/rbgtkrc.c
    ruby-gnome2/trunk/gtk/src/rbgtkrecentdata.c
    ruby-gnome2/trunk/gtk/src/rbgtkrecentfilterinfo.c
    ruby-gnome2/trunk/gtk/src/rbgtkscalebutton.c
    ruby-gnome2/trunk/gtk/src/rbgtkselection.c
    ruby-gnome2/trunk/gtk/src/rbgtkselectiondata.c
    ruby-gnome2/trunk/gtk/src/rbgtkstyle.c
    ruby-gnome2/trunk/gtk/src/rbgtktargetlist.c
    ruby-gnome2/trunk/gtk/src/rbgtktextbuffer.c
    ruby-gnome2/trunk/gtk/src/rbgtktreemodel.c
    ruby-gnome2/trunk/gtk/src/rbgtktreerowreference.c
    ruby-gnome2/trunk/gtk/src/rbgtktreestore.c
    ruby-gnome2/trunk/gtk/src/rbgtktreeview.c
    ruby-gnome2/trunk/gtk/src/rbgtktreeviewcolumn.c
    ruby-gnome2/trunk/gtk/src/rbgtkwindow.c

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-11-01 13:53:37 UTC (rev 3407)
@@ -1,5 +1,7 @@
 2008-11-01  Kouhei Sutou  <kou@...>
 
+	* src/: use RARRAY_PTR() and RARRAY_LEN().
+
 	* test/test_gtk_widget.rb
 	(TestGtkWidget#test_modify_color_component_with_nil_color): add.
 

Modified: ruby-gnome2/trunk/gtk/src/rbgdkdevice.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgdkdevice.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgdkdevice.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -115,12 +115,12 @@
     gboolean ret;
     gdouble* gaxes;
     gint i;
-    gint len = RARRAY(axes)->len;
+    gint len = RARRAY_LEN(axes);
 
     gaxes = g_new(gdouble, len);
 
     for (i = 0; i < len; i++){
-        gaxes[i] = RARRAY(axes)->ptr[i];
+        gaxes[i] = RARRAY_PTR(axes)[i];
     }
 
     ret = gdk_device_get_axis(_SELF(self), gaxes, RVAL2GENUM(use, GDK_TYPE_AXIS_USE),

Modified: ruby-gnome2/trunk/gtk/src/rbgdkdisplay.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgdkdisplay.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgdkdisplay.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -368,11 +368,11 @@
     VALUE self, clipboard_window, time_, targets;
 {
     gint i;
-    gint n_targets = RARRAY(targets)->len;
+    gint n_targets = RARRAY_LEN(targets);
     GdkAtom* gtargets = g_new(GdkAtom, n_targets);
 
     for (i = 0; i < n_targets; i++){
-        gtargets[i] = RVAL2ATOM(RARRAY(targets)->ptr[i]);
+        gtargets[i] = RVAL2ATOM(RARRAY_PTR(targets)[i]);
     }
 
     gdk_display_store_clipboard(_SELF(self), GDK_WINDOW(RVAL2GOBJ(clipboard_window)),

Modified: ruby-gnome2/trunk/gtk/src/rbgdkdragcontext.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgdkdragcontext.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgdkdragcontext.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -190,8 +190,8 @@
     GList* list = NULL;
     VALUE ret;
     int i;
-    for (i = 0; i < RARRAY(targets)->len; i++){
-        list = g_list_append(list, GINT_TO_POINTER(RVAL2ATOM(RARRAY(targets)->ptr[0])));
+    for (i = 0; i < RARRAY_LEN(targets); i++){
+        list = g_list_append(list, GINT_TO_POINTER(RVAL2ATOM(RARRAY_PTR(targets)[0])));
     }
 
     ret = GOBJ2RVAL(gdk_drag_begin(GDK_WINDOW(RVAL2GOBJ(window)), list));

Modified: ruby-gnome2/trunk/gtk/src/rbgdkdraw.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgdkdraw.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgdkdraw.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -93,18 +93,18 @@
     int i;
 
     Check_Type(pnts, T_ARRAY);
-    points = ALLOCA_N(GdkPoint,RARRAY(pnts)->len);
-    for (i=0; i<RARRAY(pnts)->len; i++) {
-        Check_Type(RARRAY(pnts)->ptr[i], T_ARRAY);
-        if (RARRAY(RARRAY(pnts)->ptr[i])->len < 2) {
+    points = ALLOCA_N(GdkPoint,RARRAY_LEN(pnts));
+    for (i = 0; i < RARRAY_LEN(pnts); i++) {
+        Check_Type(RARRAY_PTR(pnts)[i], T_ARRAY);
+        if (RARRAY_LEN(RARRAY_PTR(pnts)[i]) < 2) {
             rb_raise(rb_eArgError, "point %d should be array of size 2", i);
         }
-        points[i].x = NUM2INT(RARRAY(RARRAY(pnts)->ptr[i])->ptr[0]);
-        points[i].y = NUM2INT(RARRAY(RARRAY(pnts)->ptr[i])->ptr[1]);
+        points[i].x = NUM2INT(RARRAY_PTR(RARRAY_PTR(pnts)[i])[0]);
+        points[i].y = NUM2INT(RARRAY_PTR(RARRAY_PTR(pnts)[i])[1]);
     }
     gdk_draw_points(_SELF(self), GDK_GC(RVAL2GOBJ(gc)),
                     points,
-                    RARRAY(pnts)->len);
+                    RARRAY_LEN(pnts));
     return self;
 }
 
@@ -126,18 +126,18 @@
     int i;
 
     Check_Type(pnts, T_ARRAY);
-    points = ALLOCA_N(GdkPoint,RARRAY(pnts)->len);
-    for (i=0; i<RARRAY(pnts)->len; i++) {
-        Check_Type(RARRAY(pnts)->ptr[i], T_ARRAY);
-        if (RARRAY(RARRAY(pnts)->ptr[i])->len < 2) {
+    points = ALLOCA_N(GdkPoint,RARRAY_LEN(pnts));
+    for (i = 0; i < RARRAY_LEN(pnts); i++) {
+        Check_Type(RARRAY_PTR(pnts)[i], T_ARRAY);
+        if (RARRAY_LEN(RARRAY_PTR(pnts)[i]) < 2) {
             rb_raise(rb_eArgError, "point %d should be array of size 2", i);
         }
-        points[i].x = NUM2INT(RARRAY(RARRAY(pnts)->ptr[i])->ptr[0]);
-        points[i].y = NUM2INT(RARRAY(RARRAY(pnts)->ptr[i])->ptr[1]);
+        points[i].x = NUM2INT(RARRAY_PTR(RARRAY_PTR(pnts)[i])[0]);
+        points[i].y = NUM2INT(RARRAY_PTR(RARRAY_PTR(pnts)[i])[1]);
     }
     gdk_draw_lines(_SELF(self), GDK_GC(RVAL2GOBJ(gc)),
                    points,
-                   RARRAY(pnts)->len);
+                   RARRAY_LEN(pnts));
     return self;
 }
 
@@ -168,19 +168,19 @@
     int i;
 
     Check_Type(segs, T_ARRAY);
-    segments = ALLOCA_N(GdkSegment,RARRAY(segs)->len);
-    for (i=0; i<RARRAY(segs)->len; i++) {
-        Check_Type(RARRAY(segs)->ptr[i], T_ARRAY);
-        if (RARRAY(RARRAY(segs)->ptr[i])->len < 4) {
+    segments = ALLOCA_N(GdkSegment,RARRAY_LEN(segs));
+    for (i = 0; i < RARRAY_LEN(segs); i++) {
+        Check_Type(RARRAY_PTR(segs)[i], T_ARRAY);
+        if (RARRAY_LEN(RARRAY_PTR(segs)[i]) < 4) {
             rb_raise(rb_eArgError, "segment %d should be array of size 4", i);
         }
-        segments[i].x1 = NUM2INT(RARRAY(RARRAY(segs)->ptr[i])->ptr[0]);
-        segments[i].y1 = NUM2INT(RARRAY(RARRAY(segs)->ptr[i])->ptr[1]);
-        segments[i].x2 = NUM2INT(RARRAY(RARRAY(segs)->ptr[i])->ptr[2]);
-        segments[i].y2 = NUM2INT(RARRAY(RARRAY(segs)->ptr[i])->ptr[3]);
+        segments[i].x1 = NUM2INT(RARRAY_PTR(RARRAY_PTR(segs)[i])[0]);
+        segments[i].y1 = NUM2INT(RARRAY_PTR(RARRAY_PTR(segs)[i])[1]);
+        segments[i].x2 = NUM2INT(RARRAY_PTR(RARRAY_PTR(segs)[i])[2]);
+        segments[i].y2 = NUM2INT(RARRAY_PTR(RARRAY_PTR(segs)[i])[3]);
     }
     gdk_draw_segments(_SELF(self), GDK_GC(RVAL2GOBJ(gc)),
-                      segments, RARRAY(segs)->len);
+                      segments, RARRAY_LEN(segs));
     return self;
 }
 
@@ -215,19 +215,19 @@
     int i;
 
     Check_Type(pnts, T_ARRAY);
-    points = ALLOCA_N(GdkPoint,RARRAY(pnts)->len);
-    for (i=0; i<RARRAY(pnts)->len; i++) {
-        Check_Type(RARRAY(pnts)->ptr[i], T_ARRAY);
-        if (RARRAY(RARRAY(pnts)->ptr[i])->len < 2) {
+    points = ALLOCA_N(GdkPoint,RARRAY_LEN(pnts));
+    for (i = 0; i < RARRAY_LEN(pnts); i++) {
+        Check_Type(RARRAY_PTR(pnts)[i], T_ARRAY);
+        if (RARRAY_LEN(RARRAY_PTR(pnts)[i]) < 2) {
             rb_raise(rb_eArgError, "point %d should be array of size 2", i);
         }
-        points[i].x = NUM2INT(RARRAY(RARRAY(pnts)->ptr[i])->ptr[0]);
-        points[i].y = NUM2INT(RARRAY(RARRAY(pnts)->ptr[i])->ptr[1]);
+        points[i].x = NUM2INT(RARRAY_PTR(RARRAY_PTR(pnts)[i])[0]);
+        points[i].y = NUM2INT(RARRAY_PTR(RARRAY_PTR(pnts)[i])[1]);
     }
     gdk_draw_polygon(_SELF(self), GDK_GC(RVAL2GOBJ(gc)),
                      RVAL2CBOOL(filled),
                      points,
-                     RARRAY(pnts)->len);
+                     RARRAY_LEN(pnts));
     return self;
 }
 
@@ -244,20 +244,20 @@
 
     Check_Type(trapezoids, T_ARRAY);
 
-    len = RARRAY(trapezoids)->len;
+    len = RARRAY_LEN(trapezoids);
 
     gtrapezoids = ALLOCA_N(GdkTrapezoid, len);
     for (i = 0; i < len; i++) {
-        Check_Type(RARRAY(trapezoids)->ptr[i], T_ARRAY);
-        if (RARRAY(RARRAY(trapezoids)->ptr[i])->len < 6) {
+        Check_Type(RARRAY_PTR(trapezoids)[i], T_ARRAY);
+        if (RARRAY_LEN(RARRAY_PTR(trapezoids)[i]) < 6) {
             rb_raise(rb_eArgError, "trapezoids %d should be array of size 6", i);
         }
-        gtrapezoids[i].y1 = NUM2DBL(RARRAY(RARRAY(trapezoids)->ptr[i])->ptr[0]);
-        gtrapezoids[i].x11 = NUM2DBL(RARRAY(RARRAY(trapezoids)->ptr[i])->ptr[1]);
-        gtrapezoids[i].x21 = NUM2DBL(RARRAY(RARRAY(trapezoids)->ptr[i])->ptr[2]);
-        gtrapezoids[i].y2 = NUM2DBL(RARRAY(RARRAY(trapezoids)->ptr[i])->ptr[3]);
-        gtrapezoids[i].x12 = NUM2DBL(RARRAY(RARRAY(trapezoids)->ptr[i])->ptr[4]);
-        gtrapezoids[i].x22 = NUM2DBL(RARRAY(RARRAY(trapezoids)->ptr[i])->ptr[5]);
+        gtrapezoids[i].y1 = NUM2DBL(RARRAY_PTR(RARRAY_PTR(trapezoids)[i])[0]);
+        gtrapezoids[i].x11 = NUM2DBL(RARRAY_PTR(RARRAY_PTR(trapezoids)[i])[1]);
+        gtrapezoids[i].x21 = NUM2DBL(RARRAY_PTR(RARRAY_PTR(trapezoids)[i])[2]);
+        gtrapezoids[i].y2 = NUM2DBL(RARRAY_PTR(RARRAY_PTR(trapezoids)[i])[3]);
+        gtrapezoids[i].x12 = NUM2DBL(RARRAY_PTR(RARRAY_PTR(trapezoids)[i])[4]);
+        gtrapezoids[i].x22 = NUM2DBL(RARRAY_PTR(RARRAY_PTR(trapezoids)[i])[5]);
     }
     gdk_draw_trapezoids(_SELF(self), GDK_GC(RVAL2GOBJ(gc)), gtrapezoids, len);
     return self; 

Modified: ruby-gnome2/trunk/gtk/src/rbgdkgc.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgdkgc.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgdkgc.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -184,13 +184,13 @@
 
     Check_Type(dash_list, T_ARRAY);
 
-    buf = ALLOCA_N(gint8, RARRAY(dash_list)->len);
-    for (i = 0; i < RARRAY(dash_list)->len; i++) {
-        Check_Type(RARRAY(dash_list)->ptr[i], T_FIXNUM);
-        buf[i] = (gint8)NUM2CHR(RARRAY(dash_list)->ptr[i]);
+    buf = ALLOCA_N(gint8, RARRAY_LEN(dash_list));
+    for (i = 0; i < RARRAY_LEN(dash_list); i++) {
+        Check_Type(RARRAY_PTR(dash_list)[i], T_FIXNUM);
+        buf[i] = (gint8)NUM2CHR(RARRAY_PTR(dash_list)[i]);
     }
     gdk_gc_set_dashes(_SELF(self), NUM2INT(dash_offset),
-                      (gint8*)buf, RARRAY(dash_list)->len);
+                      (gint8*)buf, RARRAY_LEN(dash_list));
 
     return self;
 }

Modified: ruby-gnome2/trunk/gtk/src/rbgdkpango.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgdkpango.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgdkpango.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -77,11 +77,11 @@
     VALUE self, x_origin, y_origin, index_ranges;
 {
     int i;
-    gint len = RARRAY(index_ranges)->len;
+    gint len = RARRAY_LEN(index_ranges);
     gint* ranges = g_new(gint, len);
 
     for (i = 0; i < len; i++) {
-        ranges[i] = RARRAY(index_ranges)->ptr[i];
+        ranges[i] = RARRAY_PTR(index_ranges)[i];
     }
     return BOXED2RVAL(gdk_pango_layout_get_clip_region(PANGO_LAYOUT(RVAL2GOBJ(self)),
                                                        NUM2INT(x_origin),
@@ -94,11 +94,11 @@
     VALUE self, x_origin, y_origin, index_ranges;
 {
     int i;
-    gint len = RARRAY(index_ranges)->len;
+    gint len = RARRAY_LEN(index_ranges);
     gint* ranges = g_new(gint, len);
 
     for (i = 0; i < len; i++) {
-        ranges[i] = RARRAY(index_ranges)->ptr[i];
+        ranges[i] = RARRAY_PTR(index_ranges)[i];
     }
     return BOXED2RVAL(gdk_pango_layout_line_get_clip_region(
                           (PangoLayoutLine*)RVAL2BOXED(self, PANGO_TYPE_LAYOUT_LINE),

Modified: ruby-gnome2/trunk/gtk/src/rbgdkpixmap.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgdkpixmap.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgdkpixmap.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -76,9 +76,9 @@
     gchar **buf;
 
     Check_Type(data, T_ARRAY);
-    buf = ALLOCA_N(char*, RARRAY(data)->len);
-    for (i=0; i < RARRAY(data)->len; i++) {
-        buf[i] = RVAL2CSTR(RARRAY(data)->ptr[i]);
+    buf = ALLOCA_N(char*, RARRAY_LEN(data));
+    for (i=0; i < RARRAY_LEN(data); i++) {
+        buf[i] = RVAL2CSTR(RARRAY_PTR(data)[i]);
     }
     new = gdk_pixmap_create_from_xpm_d(GDK_WINDOW(RVAL2GOBJ(win)),
 				       &mask, RVAL2GDKCOLOR(tcolor), buf);
@@ -113,9 +113,9 @@
     gchar **buf;
 
     Check_Type(data, T_ARRAY);
-    buf = ALLOCA_N(char*, RARRAY(data)->len);
-    for (i=0; i<RARRAY(data)->len; i++) {
-	buf[i] = RVAL2CSTR(RARRAY(data)->ptr[i]);
+    buf = ALLOCA_N(char*, RARRAY_LEN(data));
+    for (i=0; i<RARRAY_LEN(data); i++) {
+	buf[i] = RVAL2CSTR(RARRAY_PTR(data)[i]);
     }
 
     new = gdk_pixmap_colormap_create_from_xpm_d(NIL_P(win) ? NULL : GDK_WINDOW(RVAL2GOBJ(win)),

Modified: ruby-gnome2/trunk/gtk/src/rbgdkregion.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgdkregion.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgdkregion.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -43,17 +43,17 @@
     if (NIL_P(points_or_rectangle)){
         region = gdk_region_new();
     } else if (TYPE(points_or_rectangle) == T_ARRAY){
-        gpoints = ALLOCA_N(GdkPoint, RARRAY(points_or_rectangle)->len);
+        gpoints = ALLOCA_N(GdkPoint, RARRAY_LEN(points_or_rectangle));
 
-        for (i = 0; i < RARRAY(points_or_rectangle)->len; i++) {
-            Check_Type(RARRAY(points_or_rectangle)->ptr[i], T_ARRAY);
-            if (RARRAY(RARRAY(points_or_rectangle)->ptr[i])->len < 2) {
+        for (i = 0; i < RARRAY_LEN(points_or_rectangle); i++) {
+            Check_Type(RARRAY_PTR(points_or_rectangle)[i], T_ARRAY);
+            if (RARRAY_LEN(RARRAY_PTR(points_or_rectangle)[i]) < 2) {
                 rb_raise(rb_eArgError, "point %d should be array of size 2", i);
             }
-            gpoints[i].x = NUM2INT(RARRAY(RARRAY(points_or_rectangle)->ptr[i])->ptr[0]);
-            gpoints[i].y = NUM2INT(RARRAY(RARRAY(points_or_rectangle)->ptr[i])->ptr[1]);
+            gpoints[i].x = NUM2INT(RARRAY_PTR(RARRAY_PTR(points_or_rectangle)[i])[0]);
+            gpoints[i].y = NUM2INT(RARRAY_PTR(RARRAY_PTR(points_or_rectangle)[i])[1]);
         }
-        region = gdk_region_polygon(gpoints, RARRAY(points_or_rectangle)->len, 
+        region = gdk_region_polygon(gpoints, RARRAY_LEN(points_or_rectangle),
                                     RVAL2GENUM(fill_rule, GDK_TYPE_FILL_RULE));
     } else if (RVAL2GTYPE(points_or_rectangle) == GDK_TYPE_RECTANGLE){
         region = gdk_region_rectangle((GdkRectangle*)RVAL2BOXED(points_or_rectangle, 
@@ -99,17 +99,17 @@
     VALUE self, spans, sorted;
 {
     int i;
-    GdkSpan* gspans = ALLOCA_N(GdkSpan, RARRAY(spans)->len);
+    GdkSpan* gspans = ALLOCA_N(GdkSpan, RARRAY_LEN(spans));
     volatile VALUE func = rb_block_proc();
 
     G_RELATIVE(self, func);
-    for (i = 0; i < RARRAY(spans)->len; i++) {
-        gspans[i].x = NUM2INT(RARRAY(RARRAY(spans)->ptr[i])->ptr[0]);
-        gspans[i].y = NUM2INT(RARRAY(RARRAY(spans)->ptr[i])->ptr[1]);
-        gspans[i].width = NUM2INT(RARRAY(RARRAY(spans)->ptr[i])->ptr[2]);
+    for (i = 0; i < RARRAY_LEN(spans); i++) {
+        gspans[i].x = NUM2INT(RARRAY_PTR(RARRAY_PTR(spans)[i])[0]);
+        gspans[i].y = NUM2INT(RARRAY_PTR(RARRAY_PTR(spans)[i])[1]);
+        gspans[i].width = NUM2INT(RARRAY_PTR(RARRAY_PTR(spans)[i])[2]);
     }
-    gdk_region_spans_intersect_foreach(_SELF(self), 
-                                       gspans, RARRAY(spans)->len, RVAL2CBOOL(sorted), 
+    gdk_region_spans_intersect_foreach(_SELF(self),
+                                       gspans, RARRAY_LEN(spans), RVAL2CBOOL(sorted),
                                        (GdkSpanFunc)gdkregion_span_func, (gpointer)func);
     return self;
 }

Modified: ruby-gnome2/trunk/gtk/src/rbgdkrgb.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgdkrgb.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgdkrgb.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -56,14 +56,14 @@
     guint32* gcolors;
     gint i, n_colors;
 
-    n_colors = RARRAY(colors)->len;
+    n_colors = RARRAY_LEN(colors);
 
     if (n_colors > 255)
         rb_raise(rb_eArgError, "colors: out of range (0 - 255)");
 
     gcolors = g_new(guint32, n_colors);
     for (i = 0; i < n_colors; i++) {
-        gcolors[i] = NUM2UINT(RARRAY(colors)->ptr[i]);
+        gcolors[i] = NUM2UINT(RARRAY_PTR(colors)[i]);
     }
 
     cmap = gdk_rgb_cmap_new(gcolors, n_colors);

Modified: ruby-gnome2/trunk/gtk/src/rbgdkscreen.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgdkscreen.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgdkscreen.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -316,11 +316,11 @@
 
     if (! NIL_P(argv)){
         Check_Type(argv, T_ARRAY);
-        gargc = RARRAY(argv)->len;
+        gargc = RARRAY_LEN(argv);
         gargv = ALLOCA_N(gchar*, gargc + 1);
         for (i = 0; i < gargc; i++) {
-            if (TYPE(RARRAY(argv)->ptr[i]) == T_STRING) {
-                gargv[i] = RVAL2CSTR(RARRAY(argv)->ptr[i]);
+            if (TYPE(RARRAY_PTR(argv)[i]) == T_STRING) {
+                gargv[i] = RVAL2CSTR(RARRAY_PTR(argv)[i]);
             }
             else {
                 gargv[i] = "";
@@ -331,11 +331,11 @@
 
     if (! NIL_P(envp)){
         Check_Type(envp, T_ARRAY);
-        genc = RARRAY(envp)->len;
+        genc = RARRAY_LEN(envp);
         genvp = ALLOCA_N(gchar*, genc + 1);
         for (i = 0; i < genc; i++) {
-            if (TYPE(RARRAY(envp)->ptr[i]) == T_STRING) {
-                genvp[i] = RVAL2CSTR(RARRAY(envp)->ptr[i]);
+            if (TYPE(RARRAY_PTR(envp)[i]) == T_STRING) {
+                genvp[i] = RVAL2CSTR(RARRAY_PTR(envp)[i]);
             }
             else {
                 genvp[i] = "";
@@ -377,11 +377,11 @@
 
     if (! NIL_P(argv)){
         Check_Type(argv, T_ARRAY);
-        gargc = RARRAY(argv)->len;
+        gargc = RARRAY_LEN(argv);
         gargv = ALLOCA_N(gchar*, gargc + 1);
         for (i = 0; i < gargc; i++) {
-            if (TYPE(RARRAY(argv)->ptr[i]) == T_STRING) {
-                gargv[i] = RVAL2CSTR(RARRAY(argv)->ptr[i]);
+            if (TYPE(RARRAY_PTR(argv)[i]) == T_STRING) {
+                gargv[i] = RVAL2CSTR(RARRAY_PTR(argv)[i]);
             }
             else {
                 gargv[i] = "";
@@ -392,11 +392,11 @@
 
     if (! NIL_P(envp)){
         Check_Type(envp, T_ARRAY);
-        genc = RARRAY(envp)->len;
+        genc = RARRAY_LEN(envp);
         genvp = ALLOCA_N(gchar*, genc + 1);
         for (i = 0; i < genc; i++) {
-            if (TYPE(RARRAY(envp)->ptr[i]) == T_STRING) {
-                genvp[i] = RVAL2CSTR(RARRAY(envp)->ptr[i]);
+            if (TYPE(RARRAY_PTR(envp)[i]) == T_STRING) {
+                genvp[i] = RVAL2CSTR(RARRAY_PTR(envp)[i]);
             }
             else {
                 genvp[i] = "";

Modified: ruby-gnome2/trunk/gtk/src/rbgdktimecoord.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgdktimecoord.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgdktimecoord.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -44,12 +44,12 @@
     int i;
     coord.time = NUM2UINT(time);
 
-    if (RARRAY(axes)->len > GDK_MAX_TIMECOORD_AXES){
-        rb_raise(rb_eArgError, "axes: Out of range: %ld", RARRAY(axes)->len);
+    if (RARRAY_LEN(axes) > GDK_MAX_TIMECOORD_AXES){
+        rb_raise(rb_eArgError, "axes: Out of range: %ld", RARRAY_LEN(axes));
     }
 
-    for (i = 0; i < RARRAY(axes)->len; i++){
-        coord.axes[i] = NUM2DBL(RARRAY(axes)->ptr[i]);
+    for (i = 0; i < RARRAY_LEN(axes); i++){
+        coord.axes[i] = NUM2DBL(RARRAY_PTR(axes)[i]);
     }
 
     G_INITIALIZE(self, &coord);
@@ -91,12 +91,12 @@
     int i;
     GdkTimeCoord* coord = _SELF(self);
 
-    if (RARRAY(axes)->len > GDK_MAX_TIMECOORD_AXES){
-        rb_raise(rb_eArgError, "axes: Out of range: %ld", RARRAY(axes)->len);
+    if (RARRAY_LEN(axes) > GDK_MAX_TIMECOORD_AXES){
+        rb_raise(rb_eArgError, "axes: Out of range: %ld", RARRAY_LEN(axes));
     }
 
-    for (i = 0; i < RARRAY(axes)->len; i++){
-        coord->axes[i] = NUM2DBL(RARRAY(axes)->ptr[i]);
+    for (i = 0; i < RARRAY_LEN(axes); i++){
+        coord->axes[i] = NUM2DBL(RARRAY_PTR(axes)[i]);
     }
     return self;
 }

Modified: ruby-gnome2/trunk/gtk/src/rbgdkwindow.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgdkwindow.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgdkwindow.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -714,8 +714,8 @@
     GList *glist = NULL;
 
     Check_Type(pixbufs, T_ARRAY);
-    for (i = 0; i < RARRAY(pixbufs)->len; i++) {
-        glist = g_list_append(glist, GDK_PIXBUF(RVAL2GOBJ(RARRAY(pixbufs)->ptr[i])));
+    for (i = 0; i < RARRAY_LEN(pixbufs); i++) {
+        glist = g_list_append(glist, GDK_PIXBUF(RVAL2GOBJ(RARRAY_PTR(pixbufs)[i])));
     }
 
     gdk_window_set_icon_list(_SELF(self), glist);

Modified: ruby-gnome2/trunk/gtk/src/rbgtkaboutdialog.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkaboutdialog.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkaboutdialog.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -129,34 +129,34 @@
 
     ary = rb_funcall(props, rb_intern("to_a"), 0);
     
-    if (RARRAY(ary)->len > ABOUT_PROP_NUM)
+    if (RARRAY_LEN(ary) > ABOUT_PROP_NUM)
         rb_raise(rb_eArgError, "Too many args.");
 
     for (i = 0; i < ABOUT_PROP_NUM; i++){
         pd[i].name = (const char*)NULL;
         pd[i].value = (gpointer)NULL;
     }
-    for (i = 0; i < RARRAY(ary)->len; i++){
-        if (TYPE(RARRAY(RARRAY(ary)->ptr[i])->ptr[0]) == T_SYMBOL){
-            pd[i].name = rb_id2name(SYM2ID(RARRAY(RARRAY(ary)->ptr[i])->ptr[0]));
+    for (i = 0; i < RARRAY_LEN(ary); i++){
+        if (TYPE(RARRAY_PTR(RARRAY_PTR(ary)[i])[0]) == T_SYMBOL){
+            pd[i].name = rb_id2name(SYM2ID(RARRAY_PTR(RARRAY_PTR(ary)[i])[0]));
         } else {
-            pd[i].name = RVAL2CSTR(RARRAY(RARRAY(ary)->ptr[i])->ptr[0]);
+            pd[i].name = RVAL2CSTR(RARRAY_PTR(RARRAY_PTR(ary)[i])[0]);
         }
         if (strncmp(pd[i].name, "artists", strlen("artists")) == 0||
             strncmp(pd[i].name, "authors", strlen("authors")) == 0||
             strncmp(pd[i].name, "documenters", strlen("documenters")) == 0){
             GValue gval = {0,};
             g_value_init(&gval, G_TYPE_STRV);
-            rbgobj_rvalue_to_gvalue(RARRAY(RARRAY(ary)->ptr[i])->ptr[1], &gval);
+            rbgobj_rvalue_to_gvalue(RARRAY_PTR(RARRAY_PTR(ary)[i])[1], &gval);
 
             pd[i].value = g_boxed_copy(G_TYPE_STRV, g_value_get_boxed(&gval));
-        } else if (strncmp(pd[i].name, "logo", strlen("logo")) == 0 && 
+        } else if (strncmp(pd[i].name, "logo", strlen("logo")) == 0 &&
                    strlen(pd[i].name) == strlen("logo")){
-            pd[i].value = g_object_ref(RVAL2GOBJ(RARRAY(RARRAY(ary)->ptr[i])->ptr[1]));
+            pd[i].value = g_object_ref(RVAL2GOBJ(RARRAY_PTR(RARRAY_PTR(ary)[i])[1]));
         } else if (strncmp(pd[i].name, "wrap_license", strlen("wrap_license")) == 0){
-            pd[i].value = GINT_TO_POINTER(RVAL2CBOOL(RARRAY(ary)->ptr[i]));
+            pd[i].value = GINT_TO_POINTER(RVAL2CBOOL(RARRAY_PTR(ary)[i]));
         } else {
-            pd[i].value = g_strdup(RVAL2CSTR(RARRAY(RARRAY(ary)->ptr[i])->ptr[1]));
+            pd[i].value = g_strdup(RVAL2CSTR(RARRAY_PTR(RARRAY_PTR(ary)[i])[1]));
         }
     }
 

Modified: ruby-gnome2/trunk/gtk/src/rbgtkactiongroup.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkactiongroup.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkactiongroup.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -95,7 +95,7 @@
 {
     int i;
     VALUE action_procs;
-    guint n_entries = (guint)RARRAY(entries)->len;
+    guint n_entries = (guint)RARRAY_LEN(entries);
     GtkActionEntry* gentries = g_new0(GtkActionEntry, n_entries);
 
     if (rb_ivar_defined(self, id_action_procs) == Qtrue){
@@ -105,39 +105,43 @@
     }
 
     for (i = 0; i < n_entries; i++){
-        struct RArray* entry = RARRAY(RARRAY(entries)->ptr[i]);
-        int size = entry->len;
+        VALUE entry;
+        int size;
 
+	entry = RARRAY_PTR(entries)[i];
+	size = RARRAY_LEN(entry);
         if (size < 1)
             rb_raise(rb_eArgError, "wrong array parameter");
 
-        gentries[i].name = NIL_P(entry->ptr[0]) ? NULL: RVAL2CSTR(entry->ptr[0]);
+        gentries[i].name = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[0]);
         gentries[i].callback = G_CALLBACK(activate_action);
 
         if (size < 2) continue;
 
-        if (NIL_P(entry->ptr[1])){
+        if (NIL_P(RARRAY_PTR(entry)[1])){
             gentries[i].stock_id = NULL;
-        } else if (SYMBOL_P(entry->ptr[1])){
-            gentries[i].stock_id = rb_id2name(SYM2ID(entry->ptr[1]));
-        } else if (TYPE(entry->ptr[1]) == T_STRING){
-            gentries[i].stock_id = RVAL2CSTR(entry->ptr[1]);
+        } else if (SYMBOL_P(RARRAY_PTR(entry)[1])){
+            gentries[i].stock_id = rb_id2name(SYM2ID(RARRAY_PTR(entry)[1]));
+        } else if (TYPE(RARRAY_PTR(entry)[1]) == T_STRING){
+            gentries[i].stock_id = RVAL2CSTR(RARRAY_PTR(entry)[1]);
         } else{
-            rb_raise(rb_eArgError, "invalid argument %s (expect Symbol or String)",
-                     rb_class2name(CLASS_OF(entry->ptr[1])));
+            rb_raise(rb_eArgError,
+		     "invalid argument %s (expect Symbol or String)",
+                     rb_class2name(CLASS_OF(RARRAY_PTR(entry)[1])));
         }
 
         if (size < 3) continue;
-        gentries[i].label = NIL_P(entry->ptr[2]) ? (const gchar*)NULL : RVAL2CSTR(entry->ptr[2]);
+        gentries[i].label = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[2]);
         if (size < 4) continue;
-        gentries[i].accelerator = NIL_P(entry->ptr[3]) ? (const gchar*)NULL : RVAL2CSTR(entry->ptr[3]);
+        gentries[i].accelerator = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[3]);
         if (size < 4) continue;
-        gentries[i].tooltip = NIL_P(entry->ptr[4]) ? (const gchar*)NULL : RVAL2CSTR(entry->ptr[4]);
+        gentries[i].tooltip = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[4]);
         if (size < 5) continue;
-        rb_hash_aset(action_procs, entry->ptr[0], entry->ptr[5]);
-    } 
+        rb_hash_aset(action_procs, RARRAY_PTR(entry)[0], RARRAY_PTR(entry)[5]);
+    }
     rb_ivar_set(self, id_action_procs, action_procs);
-    gtk_action_group_add_actions(_SELF(self), gentries, n_entries, (gpointer)self);
+    gtk_action_group_add_actions(_SELF(self), gentries, n_entries,
+				 (gpointer)self);
     g_free(gentries);
 
     return self;
@@ -160,7 +164,7 @@
 {
     int i;
     VALUE toggle_action_procs;
-    guint n_entries = (guint)RARRAY(entries)->len;
+    guint n_entries = (guint)RARRAY_LEN(entries);
     GtkToggleActionEntry* gentries = g_new0(GtkToggleActionEntry, n_entries);
 
     if (rb_ivar_defined(self, id_toggle_action_procs) == Qtrue){
@@ -170,41 +174,45 @@
     }
 
     for (i = 0; i < n_entries; i++){
-        struct RArray* entry = RARRAY(RARRAY(entries)->ptr[i]);
-        int size = entry->len;
+        VALUE entry;
+	int size;
 
+	entry = RARRAY_PTR(entries)[i];
+	size = RARRAY_LEN(entry);
         if (size < 1)
             rb_raise(rb_eArgError, "wrong array parameter");
 
-        gentries[i].name = NIL_P(entry->ptr[0]) ? NULL: RVAL2CSTR(entry->ptr[0]);
+        gentries[i].name = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[0]);
         gentries[i].callback = G_CALLBACK(activate_toggle_action);
 
         if (size < 2) continue;
 
-        if (NIL_P(entry->ptr[1])){
+        if (NIL_P(RARRAY_PTR(entry)[1])){
             gentries[i].stock_id = NULL;
-        } else if (SYMBOL_P(entry->ptr[1])){
-            gentries[i].stock_id = rb_id2name(SYM2ID(entry->ptr[1]));
-        } else if (TYPE(entry->ptr[1]) == T_STRING){
-            gentries[i].stock_id = RVAL2CSTR(entry->ptr[1]);
+        } else if (SYMBOL_P(RARRAY_PTR(entry)[1])){
+            gentries[i].stock_id = rb_id2name(SYM2ID(RARRAY_PTR(entry)[1]));
+        } else if (TYPE(RARRAY_PTR(entry)[1]) == T_STRING){
+            gentries[i].stock_id = RVAL2CSTR(RARRAY_PTR(entry)[1]);
         } else{
             rb_raise(rb_eArgError, "invalid argument %s (expect Symbol or String)",
-                     rb_class2name(CLASS_OF(entry->ptr[1])));
+                     rb_class2name(CLASS_OF(RARRAY_PTR(entry)[1])));
         }
 
         if (size < 3) continue;
-        gentries[i].label = NIL_P(entry->ptr[2]) ? (const gchar*)NULL : RVAL2CSTR(entry->ptr[2]);
+        gentries[i].label = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[2]);
         if (size < 4) continue;
-        gentries[i].accelerator = NIL_P(entry->ptr[3]) ? (const gchar*)NULL : RVAL2CSTR(entry->ptr[3]);
+        gentries[i].accelerator = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[3]);
         if (size < 4) continue;
-        gentries[i].tooltip = NIL_P(entry->ptr[4]) ? (const gchar*)NULL : RVAL2CSTR(entry->ptr[4]);
+        gentries[i].tooltip = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[4]);
         if (size < 5) continue;
-        rb_hash_aset(toggle_action_procs, entry->ptr[0], entry->ptr[5]);
+        rb_hash_aset(toggle_action_procs,
+		     RARRAY_PTR(entry)[0], RARRAY_PTR(entry)[5]);
         if (size < 6) continue;
-        gentries[i].is_active = RVAL2CBOOL(entry->ptr[6]);
-    } 
+        gentries[i].is_active = RVAL2CBOOL(RARRAY_PTR(entry)[6]);
+    }
     rb_ivar_set(self, id_toggle_action_procs, toggle_action_procs);
-    gtk_action_group_add_toggle_actions(_SELF(self), gentries, n_entries, (gpointer)self);
+    gtk_action_group_add_toggle_actions(_SELF(self), gentries, n_entries,
+					(gpointer)self);
     g_free(gentries);
 
     return self;
@@ -238,42 +246,47 @@
         proc = rb_block_proc();
         G_RELATIVE(self, proc);
     }
-    n_entries = (guint)RARRAY(entries)->len;
+    n_entries = (guint)RARRAY_LEN(entries);
     gentries = g_new0(GtkRadioActionEntry, n_entries);
 
     for (i = 0; i < n_entries; i++){
-        struct RArray* entry = RARRAY(RARRAY(entries)->ptr[i]);
-        int size = entry->len;
+        VALUE entry;
+	int size;
 
+	entry = RARRAY_PTR(entries)[i];
+	size = RARRAY_LEN(entry);
         if (size < 1)
             rb_raise(rb_eArgError, "wrong array parameter");
 
-        gentries[i].name = NIL_P(entry->ptr[0]) ? NULL: RVAL2CSTR(entry->ptr[0]);
+        gentries[i].name = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[0]);
 
         if (size < 2) continue;
 
-        if (NIL_P(entry->ptr[1])){
+        if (NIL_P(RARRAY_PTR(entry)[1])){
             gentries[i].stock_id = NULL;
-        } else if (SYMBOL_P(entry->ptr[1])){
-            gentries[i].stock_id = rb_id2name(SYM2ID(entry->ptr[1]));
-        } else if (TYPE(entry->ptr[1]) == T_STRING){
-            gentries[i].stock_id = RVAL2CSTR(entry->ptr[1]);
+        } else if (SYMBOL_P(RARRAY_PTR(entry)[1])){
+            gentries[i].stock_id = rb_id2name(SYM2ID(RARRAY_PTR(entry)[1]));
+        } else if (TYPE(RARRAY_PTR(entry)[1]) == T_STRING){
+            gentries[i].stock_id = RVAL2CSTR(RARRAY_PTR(entry)[1]);
         } else{
-            rb_raise(rb_eArgError, "invalid argument %s (expect Symbol or String)",
-                     rb_class2name(CLASS_OF(entry->ptr[1])));
+            rb_raise(rb_eArgError,
+		     "invalid argument %s (expect Symbol or String)",
+                     rb_class2name(CLASS_OF(RARRAY_PTR(entry)[1])));
         }
 
         if (size < 3) continue;
-        gentries[i].label = NIL_P(entry->ptr[2]) ? (const gchar*)NULL : RVAL2CSTR(entry->ptr[2]);
+        gentries[i].label = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[2]);
         if (size < 4) continue;
-        gentries[i].accelerator = NIL_P(entry->ptr[3]) ? (const gchar*)NULL : RVAL2CSTR(entry->ptr[3]);
+        gentries[i].accelerator = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[3]);
         if (size < 4) continue;
-        gentries[i].tooltip = NIL_P(entry->ptr[4]) ? (const gchar*)NULL : RVAL2CSTR(entry->ptr[4]);
+        gentries[i].tooltip = RVAL2CSTR_ACCEPT_NIL(RARRAY_PTR(entry)[4]);
         if (size < 5) continue;
-        gentries[i].value = NUM2INT(entry->ptr[5]);
-    } 
-    gtk_action_group_add_radio_actions(_SELF(self), gentries, n_entries, NUM2INT(value), 
-                                       G_CALLBACK(activate_radio_action), (gpointer)proc);
+        gentries[i].value = NUM2INT(RARRAY_PTR(entry)[5]);
+    }
+    gtk_action_group_add_radio_actions(_SELF(self), gentries,
+				       n_entries, NUM2INT(value),
+                                       G_CALLBACK(activate_radio_action),
+				       (gpointer)proc);
     g_free(gentries);
 
     return self;

Modified: ruby-gnome2/trunk/gtk/src/rbgtkbindingset.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkbindingset.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkbindingset.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -91,7 +91,6 @@
      VALUE self;
 {
     VALUE keyval, modifiers, signame, rest;
-    struct RArray *params;
     long i;
     VALUE param;
     GSList *slist, *free_slist;
@@ -100,14 +99,13 @@
 
     rb_scan_args(argc, argv, "3*", &keyval, &modifiers, &signame, &rest);
 
-    params = RARRAY(rest);
-    for (i=0; i<params->len; i++) {
+    for (i = 0; i < RARRAY_LEN(rest); i++) {
         GtkBindingArg *arg;
 
         arg = g_new0 (GtkBindingArg, 1);
         slist = g_slist_prepend (slist, arg);
 
-        param = params->ptr[i];
+        param = RARRAY_PTR(rest)[i];
         if (TYPE(param) == T_FLOAT) {
             arg->arg_type = G_TYPE_DOUBLE;
             arg->d.double_data = NUM2DBL(param);

Modified: ruby-gnome2/trunk/gtk/src/rbgtkcelllayout.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkcelllayout.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkcelllayout.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -117,10 +117,10 @@
     layout_clear_attributes(self, cell);
 
     ary = rb_funcall(attrs, rb_intern("to_a"), 0);
-    for (i = 0; i < RARRAY(ary)->len; i++){
+    for (i = 0; i < RARRAY_LEN(ary); i++){
         layout_add_attribute(self, cell, 
-                             RARRAY(RARRAY(ary)->ptr[i])->ptr[0],
-                             RARRAY(RARRAY(ary)->ptr[i])->ptr[1]);
+                             RARRAY_PTR(RARRAY_PTR(ary)[i])[0],
+                             RARRAY_PTR(RARRAY_PTR(ary)[i])[1]);
     }
     return self;
 }

Modified: ruby-gnome2/trunk/gtk/src/rbgtkclipboard.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkclipboard.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkclipboard.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -102,7 +102,7 @@
     G_RELATIVE(self, func);
     return CBOOL2RVAL(gtk_clipboard_set_with_data(_SELF(self), 
                                                   gtargets,
-                                                  RARRAY(targets)->len,
+                                                  RARRAY_LEN(targets),
                                                   (GtkClipboardGetFunc)clipboard_get_func,
                                                   (GtkClipboardClearFunc)NULL,
                                                   (gpointer)func));
@@ -401,7 +401,7 @@
     GtkTargetEntry* entries = (GtkTargetEntry*)NULL;
 
     if (!NIL_P(targets)){
-        n_targets = RARRAY(targets)->len;
+        n_targets = RARRAY_LEN(targets);
         entries = rbgtk_get_target_entry(targets);
     }
     gtk_clipboard_set_can_store(_SELF(self), entries, n_targets);

Modified: ruby-gnome2/trunk/gtk/src/rbgtkcolorsel.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkcolorsel.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkcolorsel.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -102,11 +102,11 @@
         rb_scan_args(argc, argv, "10", &colors);
     }
 
-    len = RARRAY(colors)->len;
+    len = RARRAY_LEN(colors);
     gcolors = ALLOCA_N(GdkColor, len);
 
     for (i = 0; i < len; i++) {
-        gcolor = RVAL2GDKCOLOR(RARRAY(colors)->ptr[i]);
+        gcolor = RVAL2GDKCOLOR(RARRAY_PTR(colors)[i]);
         gcolors[i] = *gcolor;
     }
 

Modified: ruby-gnome2/trunk/gtk/src/rbgtkcombo.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkcombo.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkcombo.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -24,8 +24,8 @@
     GList *glist = NULL;
 
     Check_Type(ary, T_ARRAY);
-    for (i=0; i<RARRAY(ary)->len; i++) {
-        glist = g_list_append(glist, RVAL2CSTR(RARRAY(ary)->ptr[i]));
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+        glist = g_list_append(glist, RVAL2CSTR(RARRAY_PTR(ary)[i]));
     }
     gtk_combo_set_popdown_strings(GTK_COMBO(RVAL2GOBJ(self)), glist);
     g_list_free(glist);

Modified: ruby-gnome2/trunk/gtk/src/rbgtkcontainer.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkcontainer.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkcontainer.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -333,10 +333,10 @@
         ary = rb_funcall(properties, rb_intern("to_a"), 0);
         obj = RVAL2GOBJ(self);
         
-        for (i = 0; i < RARRAY(ary)->len; i++) {
+        for (i = 0; i < RARRAY_LEN(ary); i++) {
             cont_child_set_property(self, other, 
-                       RARRAY(RARRAY(ary)->ptr[i])->ptr[0],
-                       RARRAY(RARRAY(ary)->ptr[i])->ptr[1]);
+                       RARRAY_PTR(RARRAY_PTR(ary)[i])[0],
+                       RARRAY_PTR(RARRAY_PTR(ary)[i])[1]);
         }
     }
     gtk_widget_thaw_child_notify(child);
@@ -381,8 +381,8 @@
     GList *glist = NULL;
 
     Check_Type(focusable_widgets, T_ARRAY);
-    for (i = 0; i < RARRAY(focusable_widgets)->len; i++) {
-        glist = g_list_append(glist, RVAL2GOBJ(RARRAY(focusable_widgets)->ptr[i]));
+    for (i = 0; i < RARRAY_LEN(focusable_widgets); i++) {
+        glist = g_list_append(glist, RVAL2GOBJ(RARRAY_PTR(focusable_widgets)[i]));
     }
     gtk_container_set_focus_chain(_SELF(self), glist);
     g_list_free(glist);

Modified: ruby-gnome2/trunk/gtk/src/rbgtkcurve.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkcurve.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkcurve.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -58,7 +58,7 @@
 
     c_vec = ALLOCA_N(gfloat, len);
     for (i = 0; i < len; i++)
-      c_vec[i] = NUM2DBL(RARRAY(vector)->ptr[i]);
+      c_vec[i] = NUM2DBL(RARRAY_PTR(vector)[i]);
 
     gtk_curve_set_vector(GTK_CURVE(RVAL2GOBJ(self)), len, c_vec);
 

Modified: ruby-gnome2/trunk/gtk/src/rbgtkdialog.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkdialog.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkdialog.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -38,12 +38,12 @@
 {
     int i;
     GObject* obj = RVAL2GOBJ(self);
-    if (RARRAY(button_ary)->ptr[0] != Qnil){
+    if (RARRAY_PTR(button_ary)[0] != Qnil){
         g_object_freeze_notify(obj);
-        for (i = 0; i < RARRAY(button_ary)->len; i++) {
-            Check_Type(RARRAY(RARRAY(button_ary)->ptr[i]), T_ARRAY);
-            dialog_add_button(self, RARRAY(RARRAY(button_ary)->ptr[i])->ptr[0],
-                              RARRAY(RARRAY(button_ary)->ptr[i])->ptr[1]);
+        for (i = 0; i < RARRAY_LEN(button_ary); i++) {
+            Check_Type(RARRAY_PTR(button_ary)[i], T_ARRAY);
+            dialog_add_button(self, RARRAY_PTR(RARRAY_PTR(button_ary)[i])[0],
+                              RARRAY_PTR(RARRAY_PTR(button_ary)[i])[1]);
         }
         g_object_thaw_notify(obj);
     }
@@ -165,11 +165,11 @@
     VALUE self, new_order;
 {
     gint i;
-    gint len = RARRAY(new_order)->len;
+    gint len = RARRAY_LEN(new_order);
     gint* gnew_order = g_new(gint, len);
 
     for (i = 0; i < len; i++){
-        gnew_order[i] = NUM2INT(RARRAY(new_order)->ptr[i]);
+        gnew_order[i] = NUM2INT(RARRAY_PTR(new_order)[i]);
     }
 
     gtk_dialog_set_alternative_button_order_from_array(_SELF(self), len, gnew_order);

Modified: ruby-gnome2/trunk/gtk/src/rbgtkdrag.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkdrag.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkdrag.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -27,7 +27,7 @@
     if (NIL_P(targets)) return NULL;
     Check_Type(targets, T_ARRAY);
     
-    n_targets = RARRAY(targets)->len;
+    n_targets = RARRAY_LEN(targets);
     entries = ALLOC_N(GtkTargetEntry, n_targets);
     
     for (i = 0; i < n_targets; i++) {
@@ -52,7 +52,7 @@
     int num;
     GtkTargetEntry* entries = rbgtk_get_target_entry(targets);
     if (entries){
-        num = RARRAY(targets)->len;
+        num = RARRAY_LEN(targets);
         
         gtk_drag_dest_set(RVAL2WIDGET(widget), RVAL2GFLAGS(flags, GTK_TYPE_DEST_DEFAULTS), 
                           entries, 
@@ -283,7 +283,7 @@
 {
     gtk_drag_source_set(RVAL2WIDGET(widget), RVAL2GFLAGS(flags, GDK_TYPE_MODIFIER_TYPE),
                         rbgtk_get_target_entry(targets), 
-                        RARRAY(targets)->len, 
+                        RARRAY_LEN(targets), 
                         RVAL2GFLAGS(actions, GDK_TYPE_DRAG_ACTION));
     return self;
 }

Modified: ruby-gnome2/trunk/gtk/src/rbgtkicontheme.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkicontheme.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkicontheme.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -56,11 +56,11 @@
 
     Check_Type(paths, T_ARRAY);
     
-    size = RARRAY(paths)->len;
+    size = RARRAY_LEN(paths);
     gpaths = g_new(gchar*, size);
 
     for (i = 0; i < size; i++) { 
-        gpaths[i] = (gchar*)(RARRAY(paths)->ptr[0]);
+        gpaths[i] = (gchar*)(RARRAY_PTR(paths)[0]);
     }
     gtk_icon_theme_set_search_path(_SELF(self), (const gchar**)gpaths, size);
     g_free(gpaths);

Modified: ruby-gnome2/trunk/gtk/src/rbgtkiconview.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkiconview.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkiconview.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -188,7 +188,7 @@
 {
     gtk_icon_view_enable_model_drag_dest(_SELF(self),
                                          rbgtk_get_target_entry(targets),
-                                         RARRAY(targets)->len,
+                                         RARRAY_LEN(targets),
                                          RVAL2GFLAGS(actions, GDK_TYPE_DRAG_ACTION));
     return self;
 }
@@ -200,7 +200,7 @@
     gtk_icon_view_enable_model_drag_source(_SELF(self),
                                            RVAL2GFLAGS(flags, GDK_TYPE_MODIFIER_TYPE),
                                            rbgtk_get_target_entry(targets),
-                                           RARRAY(targets)->len,
+                                           RARRAY_LEN(targets),
                                            RVAL2GFLAGS(actions, GDK_TYPE_DRAG_ACTION));
     return self;
 }

Modified: ruby-gnome2/trunk/gtk/src/rbgtkimcontextsimple.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkimcontextsimple.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkimcontextsimple.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -25,10 +25,10 @@
     VALUE self, data, max_seq_len, n_seqs;
 {
     int i;
-    guint16* gdata = ALLOCA_N(guint16, RARRAY(data)->len);
+    guint16* gdata = ALLOCA_N(guint16, RARRAY_LEN(data));
     
-    for (i = 0; i < RARRAY(data)->len; i++) {
-        gdata[i] = NUM2INT(RARRAY(data)->ptr[i]);
+    for (i = 0; i < RARRAY_LEN(data); i++) {
+        gdata[i] = NUM2INT(RARRAY_PTR(data)[i]);
     }
     
     gtk_im_context_simple_add_table(_SELF(self), gdata,

Modified: ruby-gnome2/trunk/gtk/src/rbgtkitemfactory.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkitemfactory.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkitemfactory.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -123,8 +123,8 @@
     VALUE iter, data;
     VALUE action = rb_hash_aref(action_table, UINT2NUM(action_id));
 
-    iter = RARRAY(action)->ptr[0];
-    data = RARRAY(action)->ptr[1];
+    iter = RARRAY_PTR(action)[0];
+    data = RARRAY_PTR(action)[1];
     if (!NIL_P(iter)) {
         rb_funcall(iter, id_call, 2, data, GOBJ2RVAL(widget));
     }
@@ -201,19 +201,19 @@
     GtkItemFactoryEntry *entries;
     guint i, len, n_menu_entries;
 
-    n_menu_entries = RARRAY(ary)->len;
+    n_menu_entries = RARRAY_LEN(ary);
     entries = ALLOC_N(GtkItemFactoryEntry, n_menu_entries);
 
     for (i = 0; i < n_menu_entries; i++) {
-        entry = RARRAY(ary)->ptr[i];
-        len = RARRAY(entry)->len;
+        entry = RARRAY_PTR(ary)[i];
+        len = RARRAY_LEN(entry);
         Check_Type(entry, T_ARRAY);
-        path =  RARRAY(entry)->ptr[0];
-        type =  ((len > 1) ? RARRAY(entry)->ptr[1] : Qnil);
-        accel = ((len > 2) ? RARRAY(entry)->ptr[2] : Qnil);
-        extdata = ((len > 3) ? RARRAY(entry)->ptr[3] : Qnil);
-        func =  ((len > 4) ? RARRAY(entry)->ptr[4] : Qnil);
-        data =  ((len > 5) ? RARRAY(entry)->ptr[5] : Qnil);
+        path =  RARRAY_PTR(entry)[0];
+        type =  ((len > 1) ? RARRAY_PTR(entry)[1] : Qnil);
+        accel = ((len > 2) ? RARRAY_PTR(entry)[2] : Qnil);
+        extdata = ((len > 3) ? RARRAY_PTR(entry)[3] : Qnil);
+        func =  ((len > 4) ? RARRAY_PTR(entry)[4] : Qnil);
+        data =  ((len > 5) ? RARRAY_PTR(entry)[5] : Qnil);
 
         create_factory_entry(&entries[i], self, path, type, accel, extdata, func, data);
     }

Modified: ruby-gnome2/trunk/gtk/src/rbgtkliststore.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkliststore.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkliststore.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -131,8 +131,8 @@
         g_columns[i] = i;
         g_type = gtk_tree_model_get_column_type(model, i);
         g_value_init(&g_values[i], g_type);
-        rbgobj_rvalue_to_gvalue(RARRAY(array)->ptr[i], &g_values[i]);
-        G_CHILD_ADD(iter, RARRAY(array)->ptr[i]);
+        rbgobj_rvalue_to_gvalue(RARRAY_PTR(array)[i], &g_values[i]);
+        G_CHILD_ADD(iter, RARRAY_PTR(array)[i]);
     }
 }
 
@@ -225,18 +225,18 @@
         GValue* gvalues;
         VALUE ary = rb_funcall(values, id_to_a, 0);
 
-        n_values = RARRAY(ary)->len;
+        n_values = RARRAY_LEN(ary);
         
         gvalues = g_new(GValue, n_values);
         columns = g_new(gint, n_values);
         
         for (cnt = 0; cnt < n_values; cnt++) {
-            Check_Type(RARRAY(RARRAY(ary)->ptr[cnt]), T_ARRAY);
-            columns[cnt] = NUM2INT(RARRAY(RARRAY(ary)->ptr[cnt])->ptr[1]);
+            Check_Type(RARRAY_PTR(ary)[cnt], T_ARRAY);
+            columns[cnt] = NUM2INT(RARRAY_PTR(RARRAY_PTR(ary)[cnt])[1]);
             gtype = gtk_tree_model_get_column_type(GTK_TREE_MODEL(store), columns[cnt]);
             gvalues[cnt].g_type = 0;
             g_value_init(&gvalues[cnt], gtype);
-            rbgobj_rvalue_to_gvalue(RARRAY(RARRAY(ary)->ptr[cnt])->ptr[0], &gvalues[cnt]);
+            rbgobj_rvalue_to_gvalue(RARRAY_PTR(RARRAY_PTR(ary)[cnt])[0], &gvalues[cnt]);
         }
         
         gtk_list_store_insert_with_valuesv(store, &iter, NUM2INT(position),
@@ -342,11 +342,11 @@
     VALUE self, new_order;
 {
     gint i;
-    gint len = RARRAY(new_order)->len;
+    gint len = RARRAY_LEN(new_order);
     gint* gnew_order = g_new(gint, len);
 
     for (i = 0; i < len; i++){
-        gnew_order[i] = NUM2INT(RARRAY(new_order)->ptr[i]);
+        gnew_order[i] = NUM2INT(RARRAY_PTR(new_order)[i]);
     }
 
     gtk_list_store_reorder(_SELF(self), gnew_order);

Modified: ruby-gnome2/trunk/gtk/src/rbgtkmain.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkmain.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkmain.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -106,18 +106,18 @@
 
     if (NIL_P(argary)){
         argary = rb_const_get(rb_cObject, rb_intern("ARGV"));
-        gargc = RARRAY(argary)->len;
+        gargc = RARRAY_LEN(argary);
     } else {
         Check_Type(argary, T_ARRAY);
-        gargc = RARRAY(argary)->len;
+        gargc = RARRAY_LEN(argary);
     }
 
     gargv = ALLOCA_N(char*,gargc + 1);
     gargv[0] = RVAL2CSTR(rb_progname);
 
     for (i = 0; i < gargc; i++) {
-        if (TYPE(RARRAY(argary)->ptr[i]) == T_STRING) {
-            gargv[i+1] = RVAL2CSTR(RARRAY(argary)->ptr[i]);
+        if (TYPE(RARRAY_PTR(argary)[i]) == T_STRING) {
+            gargv[i+1] = RVAL2CSTR(RARRAY_PTR(argary)[i]);
         }
         else {
             gargv[i+1] = "";

Modified: ruby-gnome2/trunk/gtk/src/rbgtkmenu.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkmenu.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkmenu.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -67,11 +67,11 @@
                            INT2FIX(*px), INT2FIX(*py), 
                            CBOOL2RVAL(*push_in));
 
-    if (TYPE(arr) == T_ARRAY && (RARRAY(arr)->len == 2 || RARRAY(arr)->len == 3)){
-        *px = NUM2INT(RARRAY(arr)->ptr[0]);
-        *py = NUM2INT(RARRAY(arr)->ptr[1]);
-        if (RARRAY(arr)->len == 3)
-            *push_in = RVAL2CBOOL(RARRAY(arr)->ptr[2]);
+    if (TYPE(arr) == T_ARRAY && (RARRAY_LEN(arr) == 2 || RARRAY_LEN(arr) == 3)){
+        *px = NUM2INT(RARRAY_PTR(arr)[0]);
+        *py = NUM2INT(RARRAY_PTR(arr)[1]);
+        if (RARRAY_LEN(arr) == 3)
+            *push_in = RVAL2CBOOL(RARRAY_PTR(arr)[2]);
     } else {
         rb_raise(rb_eArgError, "block should return [x, y, push_in]"); 
     } 

Modified: ruby-gnome2/trunk/gtk/src/rbgtkprintsettings.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkprintsettings.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkprintsettings.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -509,13 +509,13 @@
     GtkPageRange *page_ranges;
     gint i, num_ranges;
 
-    num_ranges = RARRAY(rb_page_ranges)->len;
+    num_ranges = RARRAY_LEN(rb_page_ranges);
     page_ranges = ALLOCA_N(GtkPageRange, num_ranges);
     for (i = 0; i < num_ranges; i++) {
         VALUE page_range;
-        page_range = RARRAY(rb_page_ranges)->ptr[i];
-        page_ranges[i].start = NUM2INT(RARRAY(page_range)->ptr[0]);
-        page_ranges[i].end = NUM2INT(RARRAY(page_range)->ptr[1]);
+        page_range = RARRAY_PTR(rb_page_ranges)[i];
+        page_ranges[i].start = NUM2INT(RARRAY_PTR(page_range)[0]);
+        page_ranges[i].end = NUM2INT(RARRAY_PTR(page_range)[1]);
     }
     gtk_print_settings_set_page_ranges(_SELF(self), page_ranges, num_ranges);
     return self;

Modified: ruby-gnome2/trunk/gtk/src/rbgtkradioaction.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkradioaction.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkradioaction.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -50,13 +50,13 @@
     GSList *glist = NULL;
 
     if (TYPE(group) == T_ARRAY){
-        for (i = 0; i < RARRAY(group)->len; i++) {
-            glist = g_slist_append(glist, RVAL2GOBJ(RARRAY(group)->ptr[i]));
+        for (i = 0; i < RARRAY_LEN(group); i++) {
+            glist = g_slist_append(glist, RVAL2GOBJ(RARRAY_PTR(group)[i]));
         }
         gtk_radio_action_set_group(_SELF(group), glist);
         g_slist_free(glist);
     } else {
-        glist = gtk_radio_action_get_group(GTK_RADIO_ACTION(RVAL2GOBJ(group))); 
+        glist = gtk_radio_action_get_group(GTK_RADIO_ACTION(RVAL2GOBJ(group)));
         gtk_radio_action_set_group(_SELF(group), glist);
     }
     return self;

Modified: ruby-gnome2/trunk/gtk/src/rbgtkradiomenuitem.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkradiomenuitem.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkradiomenuitem.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -24,8 +24,8 @@
 
     if (NIL_P(ary)) return NULL;
     Check_Type(ary, T_ARRAY);
-    for (i=0; i<RARRAY(ary)->len; i++) {
-        glist = g_slist_append(glist,RVAL2GOBJ(RARRAY(ary)->ptr[i]));
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+        glist = g_slist_append(glist,RVAL2GOBJ(RARRAY_PTR(ary)[i]));
     }
 
     return glist;

Modified: ruby-gnome2/trunk/gtk/src/rbgtkradiotoolbutton.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkradiotoolbutton.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkradiotoolbutton.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -31,8 +31,8 @@
         if (TYPE(group_or_stock_id) == T_ARRAY){
             int i;
             Check_Type(group_or_stock_id, T_ARRAY);
-            for (i = 0; i < RARRAY(group_or_stock_id)->len; i++) {
-                list = g_slist_append(list, RVAL2GOBJ(RARRAY(group_or_stock_id)->ptr[i]));
+            for (i = 0; i < RARRAY_LEN(group_or_stock_id); i++) {
+                list = g_slist_append(list, RVAL2GOBJ(RARRAY_PTR(group_or_stock_id)[i]));
             }
         } else if (rb_obj_is_kind_of(group_or_stock_id, gRToolButton)){
             list = gtk_radio_tool_button_get_group(_SELF(group_or_stock_id));
@@ -71,8 +71,8 @@
     GSList* list = NULL;
     if (TYPE(group) == T_ARRAY){
         int i;
-        for (i = 0; i < RARRAY(group)->len; i++){
-            list = g_slist_append(list, RVAL2GOBJ(RARRAY(group)->ptr[i]));
+        for (i = 0; i < RARRAY_LEN(group); i++){
+            list = g_slist_append(list, RVAL2GOBJ(RARRAY_PTR(group)[i]));
         }
     } else {
         list = gtk_radio_tool_button_get_group(_SELF(group));

Modified: ruby-gnome2/trunk/gtk/src/rbgtkrc.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkrc.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkrc.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -132,11 +132,11 @@
     VALUE self, filenames;
 {
     int i;
-    gchar** gfiles = g_new(gchar*, RARRAY(filenames)->len + 1);
-    for (i = 0; i < RARRAY(filenames)->len; i++) {
-        gfiles[i] = RVAL2CSTR(RARRAY(filenames)->ptr[i]);
+    gchar** gfiles = g_new(gchar*, RARRAY_LEN(filenames) + 1);
+    for (i = 0; i < RARRAY_LEN(filenames); i++) {
+        gfiles[i] = RVAL2CSTR(RARRAY_PTR(filenames)[i]);
     }
-    gfiles[RARRAY(filenames)->len] = NULL;
+    gfiles[RARRAY_LEN(filenames)] = NULL;
     gtk_rc_set_default_files(gfiles);
     return filenames;
 }

Modified: ruby-gnome2/trunk/gtk/src/rbgtkrecentdata.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkrecentdata.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkrecentdata.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -97,10 +97,10 @@
     VALUE self, groups;
 {
     gint i;
-    gint len = RARRAY(groups)->len;
+    gint len = RARRAY_LEN(groups);
     gchar** grps = g_new(gchar*, len + 1);
     for (i = 0; i < len; i++) {
-        grps[i] = RVAL2CSTR(RARRAY(groups)->ptr[i]);
+        grps[i] = RVAL2CSTR(RARRAY_PTR(groups)[i]);
     }
     grps[len] = NULL;
     _SELF(self)->groups = grps;

Modified: ruby-gnome2/trunk/gtk/src/rbgtkrecentfilterinfo.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkrecentfilterinfo.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkrecentfilterinfo.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -111,10 +111,10 @@
     VALUE self, applications;
 {
     gint i;
-    gint len = RARRAY(applications)->len;
+    gint len = RARRAY_LEN(applications);
     gchar** apps = g_new(gchar*, len + 1);
     for (i = 0; i < len; i++) {
-        apps[i] = RVAL2CSTR(RARRAY(applications)->ptr[i]);
+        apps[i] = RVAL2CSTR(RARRAY_PTR(applications)[i]);
     }
     apps[len] = NULL;
     _SELF(self)->applications = (const gchar**)apps;
@@ -142,10 +142,10 @@
     VALUE self, groups;
 {
     gint i;
-    gint len = RARRAY(groups)->len;
+    gint len = RARRAY_LEN(groups);
     gchar** grps = g_new(gchar*, len + 1);
     for (i = 0; i < len; i++) {
-        grps[i] = RVAL2CSTR(RARRAY(groups)->ptr[i]);
+        grps[i] = RVAL2CSTR(RARRAY_PTR(groups)[i]);
     }
     grps[len] = NULL;
     _SELF(self)->groups = (const gchar**)grps;

Modified: ruby-gnome2/trunk/gtk/src/rbgtkscalebutton.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkscalebutton.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkscalebutton.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -66,9 +66,9 @@
     VALUE self, icons;
 {
     int i;
-    gchar **icons_c = g_new0(gchar*, RARRAY(icons)->len + 1);
-    for (i = 0; i < RARRAY(icons)->len; i++)
-        icons_c[i] = RVAL2CSTR(RARRAY(icons)->ptr[i]);
+    gchar **icons_c = g_new0(gchar*, RARRAY_LEN(icons) + 1);
+    for (i = 0; i < RARRAY_LEN(icons); i++)
+        icons_c[i] = RVAL2CSTR(RARRAY_PTR(icons)[i]);
     icons_c[i] = NULL;
     gtk_scale_button_set_icons(_SELF(self), (const gchar **) icons_c);
     g_free(icons_c);

Modified: ruby-gnome2/trunk/gtk/src/rbgtkselection.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkselection.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkselection.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -60,7 +60,7 @@
 {
     gtk_selection_add_targets(RVAL2WIDGET(widget), 
                               RVAL2ATOM(selection),
-                              rbgtk_get_target_entry(targets), RARRAY(targets)->len);
+                              rbgtk_get_target_entry(targets), RARRAY_LEN(targets));
     return self;
 }
 
@@ -96,11 +96,11 @@
      VALUE self, targets, writable;
 {
   gint i;
-  gint len = RARRAY(targets)->len;
+  gint len = RARRAY_LEN(targets);
   GdkAtom* gtargets = ALLOCA_N(GdkAtom, len);
 
   for (i = 0; i < len; i++){
-    gtargets[i] = RVAL2ATOM(RARRAY(targets)->ptr[i]);
+    gtargets[i] = RVAL2ATOM(RARRAY_PTR(targets)[i]);
   }
 
   return CBOOL2RVAL(gtk_targets_include_image(gtargets, len, RVAL2CBOOL(writable)));
@@ -111,10 +111,10 @@
      VALUE self, targets;
 {
   gint i;
-  gint len = RARRAY(targets)->len;
+  gint len = RARRAY_LEN(targets);
   GdkAtom* gtargets = ALLOCA_N(GdkAtom, len);
   for (i = 0; i < len; i++){
-    gtargets[i] = RVAL2ATOM(RARRAY(targets)->ptr[i]);
+    gtargets[i] = RVAL2ATOM(RARRAY_PTR(targets)[i]);
   }
   return CBOOL2RVAL(gtk_targets_include_text(gtargets, len));
 }
@@ -124,11 +124,11 @@
      VALUE self, targets;
 {
   gint i;
-  gint len = RARRAY(targets)->len;
+  gint len = RARRAY_LEN(targets);
   GdkAtom* gtargets = ALLOCA_N(GdkAtom, len);
 
   for (i = 0; i < len; i++){
-    gtargets[i] = RVAL2ATOM(RARRAY(targets)->ptr[i]);
+    gtargets[i] = RVAL2ATOM(RARRAY_PTR(targets)[i]);
   }
 
   return CBOOL2RVAL(gtk_targets_include_uri(gtargets, len));
@@ -139,11 +139,11 @@
      VALUE self, targets, buffer;
 {
   gint i;
-  gint len = RARRAY(targets)->len;
+  gint len = RARRAY_LEN(targets);
   GdkAtom* gtargets = ALLOCA_N(GdkAtom, len);
 
   for (i = 0; i < len; i++){
-    gtargets[i] = RVAL2ATOM(RARRAY(targets)->ptr[i]);
+    gtargets[i] = RVAL2ATOM(RARRAY_PTR(targets)[i]);
   }
 
   return CBOOL2RVAL(gtk_targets_include_rich_text(gtargets, len, RVAL2GOBJ(buffer)));

Modified: ruby-gnome2/trunk/gtk/src/rbgtkselectiondata.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkselectiondata.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkselectiondata.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -197,12 +197,12 @@
     int i, n_targets;
     
     Check_Type(uris, T_ARRAY);
-    n_targets = RARRAY(uris)->len;
+    n_targets = RARRAY_LEN(uris);
  
     guris = g_new(gchar*, n_targets + 1);
 
     for (i = 0; i < n_targets; i++) {
-        guris[i] = RVAL2CSTR(RARRAY(uris)->ptr[i]);
+        guris[i] = RVAL2CSTR(RARRAY_PTR(uris)[i]);
     }
     guris[n_targets] = NULL;
 

Modified: ruby-gnome2/trunk/gtk/src/rbgtkstyle.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkstyle.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkstyle.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -279,17 +279,17 @@
     points, fill;
 {
     int i;
-    GdkPoint* gpoints = g_new (GdkPoint, RARRAY(points)->len);
+    GdkPoint* gpoints = g_new (GdkPoint, RARRAY_LEN(points));
 
-    for (i = 0; i < RARRAY(points)->len; i++){
-        gpoints[i].x = RARRAY(RARRAY(points)->ptr[i])->ptr[0];
-        gpoints[i].y = RARRAY(RARRAY(points)->ptr[i])->ptr[1];
+    for (i = 0; i < RARRAY_LEN(points); i++){
+        gpoints[i].x = RARRAY_PTR(RARRAY_PTR(points)[i])[0];
+        gpoints[i].y = RARRAY_PTR(RARRAY_PTR(points)[i])[1];
     }
     gtk_paint_polygon(_SELF(self), GDK_WINDOW(RVAL2GOBJ(gdkwindow)),
                       RVAL2STATE(state_type), RVAL2SHADOW(shadow_type), RVAL2REC(area),
                       GTK_WIDGET(RVAL2GOBJ(widget)), 
                       NIL_P(detail) ? NULL : RVAL2CSTR(detail), gpoints,
-                      RARRAY(points)->len, RVAL2CBOOL(fill));
+                      RARRAY_LEN(points), RVAL2CBOOL(fill));
     return self;
 }
 

Modified: ruby-gnome2/trunk/gtk/src/rbgtktargetlist.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtktargetlist.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtktargetlist.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -46,7 +46,7 @@
     Check_Type(targets, T_ARRAY);
     G_INITIALIZE(self, gtk_target_list_new(
                      rbgtk_get_target_entry(targets), 
-                     RARRAY(targets)->len));
+                     RARRAY_LEN(targets)));
     return Qnil;
 }
 
@@ -65,7 +65,7 @@
 {
     gtk_target_list_add_table(_SELF(self),
                               rbgtk_get_target_entry(targets), 
-                              RARRAY(targets)->len);
+                              RARRAY_LEN(targets));
     return self;
 }
 

Modified: ruby-gnome2/trunk/gtk/src/rbgtktextbuffer.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtktextbuffer.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtktextbuffer.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -739,13 +739,11 @@
     VALUE self;
 {
     VALUE where, value, tags;
-    struct RArray *tarray;
     gint start_offset;
     GtkTextIter start;
     int i;
 
     rb_scan_args(argc, argv, "2*", &where, &value, &tags);
-    tarray = RARRAY(tags);
 
     G_CHILD_ADD(self, where);
     G_CHILD_ADD(self, value);
@@ -761,22 +759,24 @@
         gtk_text_buffer_insert(_SELF(self), RVAL2ITR(where),
                                RVAL2CSTR(value), RSTRING_LEN(value));
         
-        if(tarray->len == 0)
+        if (RARRAY_LEN(tags) == 0)
             return self;
 
         G_CHILD_ADD(self, tags);
         
         gtk_text_buffer_get_iter_at_offset(_SELF(self), &start, start_offset);
         
-        for(i=0; i<tarray->len; i++) {
+        for(i = 0; i < RARRAY_LEN(tags); i++) {
             GtkTextTag *tag;
             
-            if (rb_obj_is_kind_of(tarray->ptr[i], GTYPE2CLASS(GTK_TYPE_TEXT_TAG))) {
-                tag = RVAL2GOBJ(tarray->ptr[i]);
+            if (rb_obj_is_kind_of(RARRAY_PTR(tags)[i], GTYPE2CLASS(GTK_TYPE_TEXT_TAG))) {
+                tag = RVAL2GOBJ(RARRAY_PTR(tags)[i]);
             } else {
-                tag = gtk_text_tag_table_lookup(_SELF(self)->tag_table, RVAL2CSTR(tarray->ptr[i]));
+                tag = gtk_text_tag_table_lookup(_SELF(self)->tag_table,
+						RVAL2CSTR(RARRAY_PTR(tags)[i]));
                 if (tag == NULL) {
-                    g_warning ("%s: no tag with name '%s'!", G_STRLOC, RVAL2CSTR(tarray->ptr[i]));
+                    g_warning ("%s: no tag with name '%s'!",
+			       G_STRLOC, RVAL2CSTR(RARRAY_PTR(tags)[i]));
                     return self;
                 }
             }

Modified: ruby-gnome2/trunk/gtk/src/rbgtktreemodel.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtktreemodel.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtktreemodel.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -169,11 +169,11 @@
 
     Check_Type(new_orders, T_ARRAY);
 
-    len = RARRAY(new_orders)->len;
+    len = RARRAY_LEN(new_orders);
     orders = ALLOCA_N(gint, len);
 
     for (i = 0; i < len; i++) {
-        orders[i] = RARRAY(new_orders)->ptr[i];
+        orders[i] = RARRAY_PTR(new_orders)[i];
     }
   
     gtk_tree_model_rows_reordered(_SELF(self), RVAL2GTKTREEPATH(path), RVAL2GTKTREEITER(iter), orders);

Modified: ruby-gnome2/trunk/gtk/src/rbgtktreerowreference.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtktreerowreference.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtktreerowreference.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -133,11 +133,11 @@
 
     Check_Type(new_orders, T_ARRAY);
 
-    len = RARRAY(new_orders)->len;
+    len = RARRAY_LEN(new_orders);
     orders = ALLOCA_N(gint, len);
 
     for (i = 0; i < len; i++) {
-        orders[i] = RARRAY(new_orders)->ptr[i];
+        orders[i] = RARRAY_PTR(new_orders)[i];
     }
   
     gtk_tree_row_reference_reordered(RVAL2GOBJ(proxy), RVAL2GTKTREEPATH(path), 

Modified: ruby-gnome2/trunk/gtk/src/rbgtktreestore.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtktreestore.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtktreestore.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -310,11 +310,11 @@
     VALUE self, parent, new_order;
 {
     gint i;
-    gint len = RARRAY(new_order)->len;
+    gint len = RARRAY_LEN(new_order);
     gint* gnew_order = g_new(gint, len);
 
     for (i = 0; i < len; i++){
-        gnew_order[i] = NUM2INT(RARRAY(new_order)->ptr[i]);
+        gnew_order[i] = NUM2INT(RARRAY_PTR(new_order)[i]);
     }
 
     gtk_tree_store_reorder(_SELF(self), RVAL2GTKTREEITER(parent), gnew_order);

Modified: ruby-gnome2/trunk/gtk/src/rbgtktreeview.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtktreeview.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtktreeview.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -140,14 +140,14 @@
         
         ret = gtk_tree_view_insert_column(_SELF(self), column, NUM2INT(args[0]));
         ary = rb_funcall(args[3], rb_intern("to_a"), 0);
-        for (i = 0; i < RARRAY(ary)->len; i++) {
-            VALUE val = RARRAY(RARRAY(ary)->ptr[i])->ptr[0];
+        for (i = 0; i < RARRAY_LEN(ary); i++) {
+            VALUE val = RARRAY_PTR(RARRAY_PTR(ary)[i])[0];
             if (SYMBOL_P(val)) {
                 name = rb_id2name(SYM2ID(val));
             } else {
                 name = RVAL2CSTR(val);
             }
-            col = NUM2INT(RARRAY(RARRAY(ary)->ptr[i])->ptr[1]);
+            col = NUM2INT(RARRAY_PTR(RARRAY_PTR(ary)[i])[1]);
             gtk_tree_view_column_add_attribute(column,
                                                renderer,
                                                name, col);
@@ -497,7 +497,7 @@
     VALUE self, targets, actions;
 {
     const GtkTargetEntry* entries = rbgtk_get_target_entry(targets);
-    int num = RARRAY(targets)->len;
+    int num = RARRAY_LEN(targets);
 
     gtk_tree_view_enable_model_drag_dest(_SELF(self),  entries, 
                                          num, RVAL2GFLAGS(actions, GDK_TYPE_DRAG_ACTION));
@@ -510,7 +510,7 @@
 {
     GtkTargetEntry* entries = rbgtk_get_target_entry(targets);
     if (entries){
-        gint num = RARRAY(targets)->len;
+        gint num = RARRAY_LEN(targets);
         
         gtk_tree_view_enable_model_drag_source(_SELF(self), 
                                                RVAL2GFLAGS(start_button_mask, GDK_TYPE_MODIFIER_TYPE), 

Modified: ruby-gnome2/trunk/gtk/src/rbgtktreeviewcolumn.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtktreeviewcolumn.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtktreeviewcolumn.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -41,14 +41,14 @@
     if (argc == 3){
         ary = rb_funcall(argv[2], rb_intern("to_a"), 0);
         renderer = RVAL2CELLRENDERER(argv[1]);
-        for (i = 0; i < RARRAY(ary)->len; i++) {
-            val = RARRAY(RARRAY(ary)->ptr[i])->ptr[0];
+        for (i = 0; i < RARRAY_LEN(ary); i++) {
+            val = RARRAY_PTR(RARRAY_PTR(ary)[i])[0];
             if (SYMBOL_P(val)) {
                 name = rb_id2name(SYM2ID(val));
             } else {
                 name = RVAL2CSTR(val);
             }
-            col = NUM2INT(RARRAY(RARRAY(ary)->ptr[i])->ptr[1]);
+            col = NUM2INT(RARRAY_PTR(RARRAY_PTR(ary)[i])[1]);
             gtk_tree_view_column_add_attribute(_SELF(self), renderer, name, col);
         }       
     }
@@ -122,14 +122,14 @@
     gtk_tree_view_column_clear_attributes(tvc, grenderer);
 
     ary = rb_funcall(attributes, rb_intern("to_a"), 0);
-    for (i = 0; i < RARRAY(ary)->len; i++) {
-        val = RARRAY(RARRAY(ary)->ptr[i])->ptr[0];
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
+        val = RARRAY_PTR(RARRAY_PTR(ary)[i])[0];
         if (SYMBOL_P(val)) {
             name = rb_id2name(SYM2ID(val));
         } else {
             name = RVAL2CSTR(val);
         }
-        col = NUM2INT(RARRAY(RARRAY(ary)->ptr[i])->ptr[1]);
+        col = NUM2INT(RARRAY_PTR(RARRAY_PTR(ary)[i])[1]);
         gtk_tree_view_column_add_attribute(tvc, grenderer, name, col);
     }       
     return self;

Modified: ruby-gnome2/trunk/gtk/src/rbgtkwindow.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkwindow.c	2008-11-01 13:30:15 UTC (rev 3406)
+++ ruby-gnome2/trunk/gtk/src/rbgtkwindow.c	2008-11-01 13:53:37 UTC (rev 3407)
@@ -579,8 +579,8 @@
     int i;
     GList *glist = NULL;
     Check_Type(list, T_ARRAY);
-    for (i = 0; i < RARRAY(list)->len; i++){
-        glist = g_list_append(glist, RVAL2GOBJ(RARRAY(list)->ptr[i]));
+    for (i = 0; i < RARRAY_LEN(list); i++){
+        glist = g_list_append(glist, RVAL2GOBJ(RARRAY_PTR(list)[i]));
     }
     gtk_window_set_default_icon_list(glist);
     g_list_free(glist);
@@ -647,8 +647,8 @@
     int i;
     GList *glist = NULL;
     Check_Type(list, T_ARRAY);
-    for (i = 0; i < RARRAY(list)->len; i++){
-        glist = g_list_append(glist, RVAL2GOBJ(RARRAY(list)->ptr[i]));
+    for (i = 0; i < RARRAY_LEN(list); i++){
+        glist = g_list_append(glist, RVAL2GOBJ(RARRAY_PTR(list)[i]));
     }
     gtk_window_set_icon_list(_SELF(self), glist);
     g_list_free(glist);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3427
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3427&view=rev
Author:   ktou
Date:     2008-11-01 14:31:04 +0000 (Sat, 01 Nov 2008)

Log Message:
-----------
* src/rbgtk.h: remove a needless header.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgtk.h

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-11-01 14:20:52 UTC (rev 3426)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-11-01 14:31:04 UTC (rev 3427)
@@ -1,5 +1,7 @@
 2008-11-01  Kouhei Sutou  <kou@...>
 
+	* src/rbgtk.h: remove a needless header.
+
 	* src/: use RARRAY_PTR() and RARRAY_LEN().
 
 	* test/test_gtk_widget.rb

Modified: ruby-gnome2/trunk/gtk/src/rbgtk.h
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtk.h	2008-11-01 14:20:52 UTC (rev 3426)
+++ ruby-gnome2/trunk/gtk/src/rbgtk.h	2008-11-01 14:31:04 UTC (rev 3427)
@@ -16,7 +16,6 @@
 #define _RBGTK_H
 
 #include "ruby.h"
-#include "rubysig.h"
 #include "rbgobject.h"
 #include <gtk/gtk.h>
 #include "rbgtkconversions.h"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3428
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3428&view=rev
Author:   ktou
Date:     2008-11-01 14:33:07 +0000 (Sat, 01 Nov 2008)

Log Message:
-----------
* src/global.h: fix #ifdef condition.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/global.h

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-11-01 14:31:04 UTC (rev 3427)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-11-01 14:33:07 UTC (rev 3428)
@@ -1,5 +1,7 @@
 2008-11-01  Kouhei Sutou  <kou@...>
 
+	* src/global.h: fix #ifdef condition.
+
 	* src/rbgtk.h: remove a needless header.
 
 	* src/: use RARRAY_PTR() and RARRAY_LEN().

Modified: ruby-gnome2/trunk/gtk/src/global.h
===================================================================
--- ruby-gnome2/trunk/gtk/src/global.h	2008-11-01 14:31:04 UTC (rev 3427)
+++ ruby-gnome2/trunk/gtk/src/global.h	2008-11-01 14:33:07 UTC (rev 3428)
@@ -16,11 +16,10 @@
 #define _RBGTK_GLOBAL_H
 
 #include "rbgtk.h"
-#ifdef HAVE_ST_H
-#  include <st.h>
-#endif
 #ifdef HAVE_RUBY_ST_H
 #  include <ruby/st.h>
+#else
+#  include <st.h>
 #endif
 
 #ifndef HAVE_RB_ERRINFO


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3430
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3430&view=rev
Author:   ktou
Date:     2008-11-03 01:39:18 +0000 (Mon, 03 Nov 2008)

Log Message:
-----------
* src/: split GDK related headers.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/gtk2.def
    ruby-gnome2/trunk/gtk/src/rbgdkcolor.c
    ruby-gnome2/trunk/gtk/src/rbgtk.h
    ruby-gnome2/trunk/gtk/src/rbgtkconversions.h

Added Paths:
-----------
    ruby-gnome2/trunk/gtk/src/rbgdk.h
    ruby-gnome2/trunk/gtk/src/rbgdkconversions.h
    ruby-gnome2/trunk/gtk/src/rbgtkmacros.h

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-11-02 03:33:38 UTC (rev 3429)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-11-03 01:39:18 UTC (rev 3430)
@@ -1,3 +1,7 @@
+2008-11-03  Kouhei Sutou  <kou@...>
+
+	* src/: split GDK related headers.
+
 2008-11-01  Kouhei Sutou  <kou@...>
 
 	* src/global.h: fix #ifdef condition.

Modified: ruby-gnome2/trunk/gtk/src/gtk2.def
===================================================================
--- ruby-gnome2/trunk/gtk/src/gtk2.def	2008-11-02 03:33:38 UTC (rev 3429)
+++ ruby-gnome2/trunk/gtk/src/gtk2.def	2008-11-03 01:39:18 UTC (rev 3430)
@@ -1,6 +1,7 @@
 EXPORTS
     Init_gtk2
     mGdk DATA
+    rb_cGdkColor DATA
     mGtk DATA
     exec_callback
     gdk_atom_copy

Added: ruby-gnome2/trunk/gtk/src/rbgdk.h
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgdk.h	                        (rev 0)
+++ ruby-gnome2/trunk/gtk/src/rbgdk.h	2008-11-03 01:39:18 UTC (rev 3430)
@@ -0,0 +1,50 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/************************************************
+
+  rbgdkconversions.h -
+
+  Copyright (C) 2008 Ruby-GNOME2 Project Team
+************************************************/
+
+#ifndef __RB_GDK_H__
+#define __RB_GDK_H__
+
+#include <rbgobject.h>
+#include <rbgtkmacros.h>
+#include <gdk/gdk.h>
+#include <rbgdkconversions.h>
+
+#ifdef GDK_WINDOWING_X11
+#  include <gdk/gdkx.h>
+#endif
+
+#define GDK_BITMAP(b) ((GdkBitmap*)GDK_PIXMAP(b))
+
+#define GEV2RVAL(ev) (make_gdkevent(ev))
+#define RVAL2GEV(ev) (get_gdkevent(ev))
+#define RVAL2ATOM(atom) (get_gdkatom(atom))
+
+#define GDK_TYPE_GEOMETRY (gdk_geometry_get_type())
+#define GDK_TYPE_REGION (gdk_region_get_type())
+#define GDK_TYPE_ATOM (gdk_atom_get_type())
+#define GDK_TYPE_WINDOW_ATTR (gdk_windowattr_get_type())
+#define GDK_TYPE_TIME_COORD (gdk_timecoord_get_type())
+
+RUBY_GTK2_VAR VALUE mGdk;
+RUBY_GTK2_VAR VALUE rb_cGdkColor;
+
+typedef struct {
+    GdkAtom atom;
+} GdkAtomData;
+
+extern GType gdk_windowattr_get_type(void);
+extern GType gdk_atom_get_type(void);
+extern GType gdk_geometry_get_type(void);
+extern GType gdk_region_get_type(void);
+extern GType gdk_timecoord_get_type(void);
+
+extern GdkAtom get_gdkatom(VALUE atom);
+extern VALUE make_gdkevent(GdkEvent* event);
+extern GdkEvent* get_gdkevent(VALUE event);
+
+#endif /* __RB_GDK_H__ */


Property changes on: ruby-gnome2/trunk/gtk/src/rbgdk.h
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: ruby-gnome2/trunk/gtk/src/rbgdkcolor.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgdkcolor.c	2008-11-02 03:33:38 UTC (rev 3429)
+++ ruby-gnome2/trunk/gtk/src/rbgdkcolor.c	2008-11-03 01:39:18 UTC (rev 3430)
@@ -16,6 +16,8 @@
 
 #define _SELF(c) (RVAL2GDKCOLOR(c))
 
+VALUE rb_cGdkColor = Qnil;
+
 static VALUE
 gdkcolor_initialize(self, red, green, blue)
     VALUE self;
@@ -127,23 +129,23 @@
 void
 Init_gtk_gdk_color()
 {
-    VALUE gdkColor = G_DEF_CLASS(GDK_TYPE_COLOR, "Color", mGdk);
+    rb_cGdkColor = G_DEF_CLASS(GDK_TYPE_COLOR, "Color", mGdk);
 
-    rb_define_singleton_method(gdkColor, "parse", gdkcolor_s_parse, 1);
-    rb_define_method(gdkColor, "initialize", gdkcolor_initialize, 3);
-    rb_define_method(gdkColor, "pixel", gdkcolor_pixel, 0);
-    rb_define_method(gdkColor, "red", gdkcolor_red, 0);
-    rb_define_method(gdkColor, "set_red", gdkcolor_set_red, 1);
-    rb_define_method(gdkColor, "green", gdkcolor_green, 0);
-    rb_define_method(gdkColor, "set_green", gdkcolor_set_green, 1);
-    rb_define_method(gdkColor, "blue", gdkcolor_blue, 0);
-    rb_define_method(gdkColor, "set_blue", gdkcolor_set_blue, 1);
-    rb_define_method(gdkColor, "to_a", gdkcolor_to_a, 0);
-    rb_define_method(gdkColor, "==", gdkcolor_equal, 1);
+    rb_define_singleton_method(rb_cGdkColor, "parse", gdkcolor_s_parse, 1);
+    rb_define_method(rb_cGdkColor, "initialize", gdkcolor_initialize, 3);
+    rb_define_method(rb_cGdkColor, "pixel", gdkcolor_pixel, 0);
+    rb_define_method(rb_cGdkColor, "red", gdkcolor_red, 0);
+    rb_define_method(rb_cGdkColor, "set_red", gdkcolor_set_red, 1);
+    rb_define_method(rb_cGdkColor, "green", gdkcolor_green, 0);
+    rb_define_method(rb_cGdkColor, "set_green", gdkcolor_set_green, 1);
+    rb_define_method(rb_cGdkColor, "blue", gdkcolor_blue, 0);
+    rb_define_method(rb_cGdkColor, "set_blue", gdkcolor_set_blue, 1);
+    rb_define_method(rb_cGdkColor, "to_a", gdkcolor_to_a, 0);
+    rb_define_method(rb_cGdkColor, "==", gdkcolor_equal, 1);
 #if GTK_CHECK_VERSION(2, 12, 0)
-    rb_define_method(gdkColor, "to_s", gdkcolor_to_string, 0);
+    rb_define_method(rb_cGdkColor, "to_s", gdkcolor_to_string, 0);
 #endif
 
-    G_DEF_SETTERS(gdkColor);
+    G_DEF_SETTERS(rb_cGdkColor);
 }
 

Added: ruby-gnome2/trunk/gtk/src/rbgdkconversions.h
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgdkconversions.h	                        (rev 0)
+++ ruby-gnome2/trunk/gtk/src/rbgdkconversions.h	2008-11-03 01:39:18 UTC (rev 3430)
@@ -0,0 +1,18 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/************************************************
+
+  rbgdkconversions.h -
+
+  Copyright (C) 2008 Ruby-GNOME2 Project Team
+************************************************/
+
+#ifndef __RB_GDK_CONVERSIONS_H__
+#define __RB_GDK_CONVERSIONS_H__
+
+#include <rbgobject.h>
+#include <gdk/gdk.h>
+
+#define RVAL2GDKCOLOR(color) ((GdkColor *)RVAL2BOXED(color, GDK_TYPE_COLOR))
+#define GDKCOLOR2RVAL(color) (BOXED2RVAL(color, GDK_TYPE_COLOR))
+
+#endif /* __RB_GDK_CONVERSIONS_H__ */


Property changes on: ruby-gnome2/trunk/gtk/src/rbgdkconversions.h
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: ruby-gnome2/trunk/gtk/src/rbgtk.h
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtk.h	2008-11-02 03:33:38 UTC (rev 3429)
+++ ruby-gnome2/trunk/gtk/src/rbgtk.h	2008-11-03 01:39:18 UTC (rev 3430)
@@ -15,39 +15,19 @@
 #ifndef _RBGTK_H
 #define _RBGTK_H
 
-#include "ruby.h"
-#include "rbgobject.h"
+#include <rbgobject.h>
+#include <rbgtkmacros.h>
 #include <gtk/gtk.h>
-#include "rbgtkconversions.h"
+#include <rbgdk.h>
+#include <rbgtkconversions.h>
 
-#ifdef GDK_WINDOWING_X11
-#include <gdk/gdkx.h>
-#endif
-
 #include <signal.h>
 
-#define RBGTK_MAJOR_VERSION RBGLIB_MAJOR_VERSION
-#define RBGTK_MINOR_VERSION RBGLIB_MINOR_VERSION
-#define RBGTK_MICRO_VERSION RBGLIB_MICRO_VERSION
-
 #define RubyGtkContainerHookModule "RubyGtkContainerHook__"
 
-#define GDK_BITMAP(b) ((GdkBitmap*)GDK_PIXMAP(b))
-
-#define GEV2RVAL(ev) (make_gdkevent(ev))
-#define RVAL2GEV(ev) (get_gdkevent(ev))
-#define RVAL2ATOM(atom) (get_gdkatom(atom))
-
-
 #define RBGTK_INITIALIZE(obj,gtkobj)\
  (rbgtk_initialize_gtkobject(obj, GTK_OBJECT(gtkobj)))
 
-#define GDK_TYPE_GEOMETRY (gdk_geometry_get_type())
-#define GDK_TYPE_REGION (gdk_region_get_type())
-#define GDK_TYPE_ATOM (gdk_atom_get_type())
-#define GDK_TYPE_WINDOW_ATTR (gdk_windowattr_get_type())
-#define GDK_TYPE_TIME_COORD (gdk_timecoord_get_type())
-
 #define GTK_TYPE_ALLOCATION (gtk_allocation_get_type())
 #define GTK_TYPE_ACCEL_KEY (gtk_accel_key_get_type())
 #define GTK_TYPE_ACCEL_GROUP_ENTRY (gtk_accel_group_entry_get_type())
@@ -60,18 +40,7 @@
 #define GTK_TYPE_TARGET_LIST (gtk_target_list_get_type())
 #endif
 
-#if defined(G_PLATFORM_WIN32) && !defined(RUBY_GTK2_STATIC_COMPILATION)
-#  ifdef RUBY_GTK2_COMPILATION
-#    define RUBY_GTK2_VAR __declspec(dllexport)
-#  else
-#    define RUBY_GTK2_VAR extern __declspec(dllimport)
-#  endif
-#else
-#  define RUBY_GTK2_VAR extern
-#endif
-
 RUBY_GTK2_VAR VALUE mGtk;
-RUBY_GTK2_VAR VALUE mGdk;
 
 /*
  * for gtk2.0/gtk2.2
@@ -145,21 +114,4 @@
  */
 extern VALUE rbgtk_dialog_add_buttons_internal(VALUE self, VALUE button_ary);
 
-/*
- * for gdk
- */
-typedef struct {
-    GdkAtom atom;
-} GdkAtomData;
-
-extern GType gdk_windowattr_get_type(void);
-extern GType gdk_atom_get_type(void);
-extern GType gdk_geometry_get_type(void);
-extern GType gdk_region_get_type(void);
-extern GType gdk_timecoord_get_type(void);
-
-extern GdkAtom get_gdkatom(VALUE atom);
-extern VALUE make_gdkevent(GdkEvent* event);
-extern GdkEvent* get_gdkevent(VALUE event);
-
 #endif /* _RBGTK_H */

Modified: ruby-gnome2/trunk/gtk/src/rbgtkconversions.h
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkconversions.h	2008-11-02 03:33:38 UTC (rev 3429)
+++ ruby-gnome2/trunk/gtk/src/rbgtkconversions.h	2008-11-03 01:39:18 UTC (rev 3430)
@@ -12,6 +12,8 @@
 #include <rbgobject.h>
 #include <gtk/gtk.h>
 
+#include <rbgdkconversions.h>
+
 #define GTKTREEPATH2RVAL(t) (BOXED2RVAL(t, GTK_TYPE_TREE_PATH))
 #define RVAL2GTKTREEPATH(t) ((GtkTreePath *)RVAL2BOXED(t, GTK_TYPE_TREE_PATH))
 #define GTKTREEITER2RVAL(i) (BOXED2RVAL(i, GTK_TYPE_TREE_ITER))
@@ -21,7 +23,4 @@
 #define GTKRCFLAGS2RVAL(flags) (GFLAGS2RVAL(flags, GTK_TYPE_RC_FLAGS))
 #define RVAL2GTKRCFLAGS(flags) (RVAL2GFLAGS(flags, GTK_TYPE_RC_FLAGS))
 
-#define RVAL2GDKCOLOR(color) ((GdkColor *)RVAL2BOXED(color, GDK_TYPE_COLOR))
-#define GDKCOLOR2RVAL(color) (BOXED2RVAL(color, GDK_TYPE_COLOR))
-
 #endif /* _RBGTKCONVERSIONS_H */

Added: ruby-gnome2/trunk/gtk/src/rbgtkmacros.h
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkmacros.h	                        (rev 0)
+++ ruby-gnome2/trunk/gtk/src/rbgtkmacros.h	2008-11-03 01:39:18 UTC (rev 3430)
@@ -0,0 +1,26 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/************************************************
+
+  rbgtkconversions.h -
+
+  Copyright (C) 2008 Ruby-GNOME2 Project Team
+************************************************/
+
+#ifndef __RB_GTK_MACROS_H__
+#define __RB_GTK_MACROS_H__
+
+#define RBGTK_MAJOR_VERSION RBGLIB_MAJOR_VERSION
+#define RBGTK_MINOR_VERSION RBGLIB_MINOR_VERSION
+#define RBGTK_MICRO_VERSION RBGLIB_MICRO_VERSION
+
+#if defined(G_PLATFORM_WIN32) && !defined(RUBY_GTK2_STATIC_COMPILATION)
+#  ifdef RUBY_GTK2_COMPILATION
+#    define RUBY_GTK2_VAR __declspec(dllexport)
+#  else
+#    define RUBY_GTK2_VAR extern __declspec(dllimport)
+#  endif
+#else
+#  define RUBY_GTK2_VAR extern
+#endif
+
+#endif /* __RB_GTK_MACROS_H__ */


Property changes on: ruby-gnome2/trunk/gtk/src/rbgtkmacros.h
___________________________________________________________________
Added: svn:keywords
   + Id


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3437
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3437&view=rev
Author:   ktou
Date:     2008-11-07 09:47:37 +0000 (Fri, 07 Nov 2008)

Log Message:
-----------
* src/rbgtkuimanager.c (rbuimanager_mark): mark unmarked object.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgtkuimanager.c

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-11-06 12:51:49 UTC (rev 3436)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-11-07 09:47:37 UTC (rev 3437)
@@ -1,3 +1,7 @@
+2008-11-07  Kouhei Sutou  <kou@...>
+
+	* src/rbgtkuimanager.c (rbuimanager_mark): mark unmarked object.
+
 2008-11-03  Kouhei Sutou  <kou@...>
 
 	* src/: split GDK related headers.

Modified: ruby-gnome2/trunk/gtk/src/rbgtkuimanager.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkuimanager.c	2008-11-06 12:51:49 UTC (rev 3436)
+++ ruby-gnome2/trunk/gtk/src/rbgtkuimanager.c	2008-11-07 09:47:37 UTC (rev 3437)
@@ -172,6 +172,8 @@
 	GtkWidget *action_group = node->data;
 	rbgobj_gc_mark_instance(action_group);
     }
+
+    rbgobj_gc_mark_instance(gtk_ui_manager_get_accel_group(manager));
 }
 #endif
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3440
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3440&view=rev
Author:   ktou
Date:     2008-11-19 11:47:45 +0000 (Wed, 19 Nov 2008)

Log Message:
-----------
* src/rbgtkfilechooser.c (Init_gtk_file_chooser): fix ifdef guard target.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgtkfilechooser.c

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-11-09 02:35:18 UTC (rev 3439)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-11-19 11:47:45 UTC (rev 3440)
@@ -1,3 +1,7 @@
+2008-11-09  Kouhei Sutou  <kou@...>
+
+	* src/rbgtkfilechooser.c (Init_gtk_file_chooser): fix ifdef guard target.
+
 2008-11-07  Kouhei Sutou  <kou@...>
 
 	* src/rbgtkuimanager.c (rbuimanager_mark): mark unmarked object.

Modified: ruby-gnome2/trunk/gtk/src/rbgtkfilechooser.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkfilechooser.c	2008-11-09 02:35:18 UTC (rev 3439)
+++ ruby-gnome2/trunk/gtk/src/rbgtkfilechooser.c	2008-11-19 11:47:45 UTC (rev 3440)
@@ -326,7 +326,7 @@
 #if GTK_CHECK_VERSION(2,4,0)
 
     VALUE gFileCho = G_DEF_INTERFACE(GTK_TYPE_FILE_CHOOSER, "FileChooser", mGtk);
-#ifdef HAVE_GTK_GTKFILESYSTEM_H
+#ifdef GTK_FILE_SYSTEM_ERROR
     VALUE eFileSystemError;
 #endif
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3442
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3442&view=rev
Author:   ktou
Date:     2008-11-19 11:53:25 +0000 (Wed, 19 Nov 2008)

Log Message:
-----------
* test/test_gc.rb (TestGC#test_inheritance_and_gc): moved from Ruby/GLib.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/test/test_gc.rb

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-11-19 11:52:35 UTC (rev 3441)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-11-19 11:53:25 UTC (rev 3442)
@@ -1,3 +1,7 @@
+2008-11-19  Kouhei Sutou  <kou@...>
+
+	* test/test_gc.rb (TestGC#test_inheritance_and_gc): moved from Ruby/GLib.
+
 2008-11-09  Kouhei Sutou  <kou@...>
 
 	* src/rbgtkfilechooser.c (Init_gtk_file_chooser): fix ifdef guard target.

Modified: ruby-gnome2/trunk/gtk/test/test_gc.rb
===================================================================
--- ruby-gnome2/trunk/gtk/test/test_gc.rb	2008-11-19 11:52:35 UTC (rev 3441)
+++ ruby-gnome2/trunk/gtk/test/test_gc.rb	2008-11-19 11:53:25 UTC (rev 3442)
@@ -10,4 +10,16 @@
       GC.start
     end
   end
+
+  def test_inheritance_and_gc
+    button = Class.new(Gtk::Button)
+    box = Gtk::HBox.new
+    n = 10
+    n.times do
+      box.add(button.new)
+    end
+    GC.start
+    assert_equal([button] * 10,
+                 box.children.collect {|item| item.class})
+  end
 end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3443
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3443&view=rev
Author:   ktou
Date:     2008-11-19 11:57:46 +0000 (Wed, 19 Nov 2008)

Log Message:
-----------
* test/test_gdk_display.rb
  (TestGdkDisplay#test_broadcast_startup_message):
  Gdk::Display#broadcast_startup_message can't be implemented in
  GTK+ 2.14 API. :<

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/test/test_gdk_display.rb

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-11-19 11:53:25 UTC (rev 3442)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-11-19 11:57:46 UTC (rev 3443)
@@ -1,5 +1,10 @@
 2008-11-19  Kouhei Sutou  <kou@...>
 
+	* test/test_gdk_display.rb
+	(TestGdkDisplay#test_broadcast_startup_message):
+	Gdk::Display#broadcast_startup_message can't be implemented in
+	GTK+ 2.14 API. :<
+
 	* test/test_gc.rb (TestGC#test_inheritance_and_gc): moved from Ruby/GLib.
 
 2008-11-09  Kouhei Sutou  <kou@...>

Modified: ruby-gnome2/trunk/gtk/test/test_gdk_display.rb
===================================================================
--- ruby-gnome2/trunk/gtk/test/test_gdk_display.rb	2008-11-19 11:53:25 UTC (rev 3442)
+++ ruby-gnome2/trunk/gtk/test/test_gdk_display.rb	2008-11-19 11:57:46 UTC (rev 3443)
@@ -19,7 +19,7 @@
   end
 
   def test_broadcast_startup_message
-    only_gtk_version(2, 14, 0)
+    only_gtk_version(2, 16, 0)
     only_x11
 
     id = "#{$$}_TIME_#{Time.now.to_i}"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3445
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3445&view=rev
Author:   ktou
Date:     2008-11-21 12:45:59 +0000 (Fri, 21 Nov 2008)

Log Message:
-----------
* src/rbgtkselectiondata.c (rbgtk_atom2selectiondata): accept
  length for string type selection.
  [#2318481] gtkselectiondata_set Drag and Drop API problem
  Reported by dave foster. Thanks!!!

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgtkselectiondata.c

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-11-19 12:17:12 UTC (rev 3444)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-11-21 12:45:59 UTC (rev 3445)
@@ -1,3 +1,10 @@
+2008-11-21  Kouhei Sutou  <kou@...>
+
+	* src/rbgtkselectiondata.c (rbgtk_atom2selectiondata): accept
+	length for string type selection.
+	[#2318481] gtkselectiondata_set Drag and Drop API problem
+	Reported by dave foster. Thanks!!!
+
 2008-11-19  Kouhei Sutou  <kou@...>
 
 	* test/test_gdk_display.rb

Modified: ruby-gnome2/trunk/gtk/src/rbgtkselectiondata.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkselectiondata.c	2008-11-19 12:17:12 UTC (rev 3444)
+++ ruby-gnome2/trunk/gtk/src/rbgtkselectiondata.c	2008-11-21 12:45:59 UTC (rev 3445)
@@ -34,8 +34,13 @@
         len = 1;
     } else if(ntype == GDK_SELECTION_TYPE_STRING) {
         dat = RVAL2CSTR(src);
-        fmt = sizeof(char) * 8;
-        len = RSTRING_LEN(src);
+	if (NIL_P(size)) {
+	    fmt = sizeof(char) * 8;
+	    len = RSTRING_LEN(src);
+	} else {
+	    len = NUM2UINT(size);
+	    fmt = (RSTRING_LEN(src) / len) * 8;
+	}
     } else if(ntype == compound_text){
         guchar* str = (guchar*)dat;
         gdk_string_to_compound_text(RVAL2CSTR(src), &ntype, &fmt, &str, &len);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3448
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3448&view=rev
Author:   ktou
Date:     2008-12-06 04:04:04 +0000 (Sat, 06 Dec 2008)

Log Message:
-----------
* src/rbgdkdraw.c (gdkdraw_set_colormap, gdkdraw_get_colormap):
  guard colormap from GC.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgdkdraw.c

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-11-21 12:52:24 UTC (rev 3447)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-12-06 04:04:04 UTC (rev 3448)
@@ -1,3 +1,8 @@
+2008-12-06  Kouhei Sutou  <kou@...>
+
+	* src/rbgdkdraw.c (gdkdraw_set_colormap, gdkdraw_get_colormap):
+	guard colormap from GC.
+
 2008-11-21  Kouhei Sutou  <kou@...>
 
 	* src/rbgtkselectiondata.c (rbgtk_atom2selectiondata): accept

Modified: ruby-gnome2/trunk/gtk/src/rbgdkdraw.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgdkdraw.c	2008-11-21 12:52:24 UTC (rev 3447)
+++ ruby-gnome2/trunk/gtk/src/rbgdkdraw.c	2008-12-06 04:04:04 UTC (rev 3448)
@@ -31,18 +31,26 @@
 }
 
 static VALUE
-gdkdraw_set_colormap(self, colormap)
-    VALUE self, colormap;
+gdkdraw_set_colormap(VALUE self, VALUE colormap)
 {
+    VALUE old_colormap;
+
+    old_colormap = GOBJ2RVAL(gdk_drawable_get_colormap(_SELF(self)));
+    G_CHILD_REMOVE(self, old_colormap);
+
+    G_CHILD_ADD(self, colormap);
     gdk_drawable_set_colormap(_SELF(self), GDK_COLORMAP(RVAL2GOBJ(colormap)));
     return self;
 }
 
 static VALUE
-gdkdraw_get_colormap(self)
-    VALUE self;
+gdkdraw_get_colormap(VALUE self)
 {
-    return GOBJ2RVAL(gdk_drawable_get_colormap(_SELF(self)));
+    VALUE rb_colormap;
+
+    rb_colormap = GOBJ2RVAL(gdk_drawable_get_colormap(_SELF(self)));
+    G_CHILD_ADD(self, rb_colormap);
+    return rb_colormap;
 }
 
 static VALUE


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3451
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3451&view=rev
Author:   ktou
Date:     2008-12-12 12:05:14 +0000 (Fri, 12 Dec 2008)

Log Message:
-----------
* extconf.rb: fix dependency check order to support build on other
  directory. [#2420281]
  Reported by troels knak-nielsen. Thanks!!!

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/extconf.rb

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2008-12-12 01:48:09 UTC (rev 3450)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2008-12-12 12:05:14 UTC (rev 3451)
@@ -1,3 +1,9 @@
+2008-12-12  Kouhei Sutou  <kou@...>
+
+	* extconf.rb: fix dependency check order to support build on other
+	directory. [#2420281]
+	Reported by troels knak-nielsen. Thanks!!!
+
 2008-12-06  Kouhei Sutou  <kou@...>
 
 	* src/rbgdkdraw.c (gdkdraw_set_colormap, gdkdraw_get_colormap):

Modified: ruby-gnome2/trunk/gtk/extconf.rb
===================================================================
--- ruby-gnome2/trunk/gtk/extconf.rb	2008-12-12 01:48:09 UTC (rev 3450)
+++ ruby-gnome2/trunk/gtk/extconf.rb	2008-12-12 12:05:14 UTC (rev 3451)
@@ -77,6 +77,10 @@
 add_distcleanfile("rbgdkkeysyms.h")
 add_distcleanfile("rbgtkinits.c")
 
+$defs.delete("-DRUBY_GTK2_COMPILATION")
+
+add_depend_package("gtk2", "gtk/src", TOPDIR)
+
 create_makefile_at_srcdir(PACKAGE_NAME, SRCDIR, "-DRUBY_GTK2_COMPILATION") {
   File.delete("rbgtkinits.c") if FileTest.exist?("rbgtkinits.c")
   SRCDIR_QUOTED = SRCDIR.gsub(' ', '\ ')
@@ -84,8 +88,4 @@
   system("#{$ruby} #{SRCDIR_QUOTED}/makekeysyms.rb #{gdkincl}/gdkkeysyms.h > rbgdkkeysyms.h") or raise "failed to make GDK Keysyms"
 }
 
-$defs.delete("-DRUBY_GTK2_COMPILATION")
-
-add_depend_package("gtk2", "gtk/src", TOPDIR)
-
 create_top_makefile(["src"])


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3602
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3602&view=rev
Author:   ktou
Date:     2009-02-23 13:29:15 +0000 (Mon, 23 Feb 2009)

Log Message:
-----------
* src/rbgtkmain.c (gtk_m_init): use rb_argv0 instead of rb_progname.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgtkmain.c

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2009-02-23 13:27:46 UTC (rev 3601)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2009-02-23 13:29:15 UTC (rev 3602)
@@ -1,3 +1,7 @@
+2009-02-23  Kouhei Sutou  <kou@...>
+
+	* src/rbgtkmain.c (gtk_m_init): use rb_argv0 instead of rb_progname.
+
 2008-12-12  Kouhei Sutou  <kou@...>
 
 	* extconf.rb: fix dependency check order to support build on other

Modified: ruby-gnome2/trunk/gtk/src/rbgtkmain.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkmain.c	2009-02-23 13:27:46 UTC (rev 3601)
+++ ruby-gnome2/trunk/gtk/src/rbgtkmain.c	2009-02-23 13:29:15 UTC (rev 3602)
@@ -1,4 +1,3 @@
-
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /************************************************
 
@@ -7,7 +6,7 @@
   $Author: ggc $
   $Date: 2007/07/13 16:07:31 $
 
-  Copyright (C) 2002,2003 Ruby-GNOME2 Project Team
+  Copyright (C) 2002,2003, 2009 Ruby-GNOME2 Project Team
   Copyright (C) 1998-2000 Yukihiro Matsumoto,
                           Daisuke Kanda,
                           Hiroshi Igarashi
@@ -15,8 +14,6 @@
 #include "global.h"
 #include <locale.h>
 
-EXTERN VALUE rb_progname;
-
 static VALUE rbgtk_eGtkInitError;
 
 static ID id__quit_callbacks__, id__timeout_callbacks__;
@@ -112,8 +109,8 @@
         gargc = RARRAY_LEN(argary);
     }
 
-    gargv = ALLOCA_N(char*,gargc + 1);
-    gargv[0] = RVAL2CSTR(rb_progname);
+    gargv = ALLOCA_N(char *, gargc + 1);
+    gargv[0] = RVAL2CSTR(rb_argv0);
 
     for (i = 0; i < gargc; i++) {
         if (TYPE(RARRAY_PTR(argary)[i]) == T_STRING) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3645
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3645&view=rev
Author:   ktou
Date:     2009-05-31 02:22:43 +0000 (Sun, 31 May 2009)

Log Message:
-----------
* src/lib/gtk2/base.rb: remove cairo loading because Ruby/Pango
  has tried it.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/lib/gtk2/base.rb

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2009-05-31 02:21:46 UTC (rev 3644)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2009-05-31 02:22:43 UTC (rev 3645)
@@ -1,3 +1,8 @@
+2009-05-31  Kouhei Sutou  <kou@...>
+
+	* src/lib/gtk2/base.rb: remove cairo loading because Ruby/Pango
+	has tried it.
+
 2009-05-27  Detlef Reichl  <detlef.reichl@...>
 	* src/rbgtkmain.c (gtk_m_init): use $0 instead of rb_argv0.
 

Modified: ruby-gnome2/trunk/gtk/src/lib/gtk2/base.rb
===================================================================
--- ruby-gnome2/trunk/gtk/src/lib/gtk2/base.rb	2009-05-31 02:21:46 UTC (rev 3644)
+++ ruby-gnome2/trunk/gtk/src/lib/gtk2/base.rb	2009-05-31 02:22:43 UTC (rev 3645)
@@ -12,10 +12,6 @@
 require 'glib2'
 require 'atk'
 require 'pango'
-begin
-  require 'cairo'
-rescue LoadError
-end
 require 'gtk2.so'
 require 'gdk_pixbuf2'
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3648
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3648&view=rev
Author:   ktou
Date:     2009-05-31 02:27:17 +0000 (Sun, 31 May 2009)

Log Message:
-----------
* src/depend: use RUBYARCHDIR.
  Patch by OBATA Akio. Thanks!!!

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/depend

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2009-05-31 02:26:17 UTC (rev 3647)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2009-05-31 02:27:17 UTC (rev 3648)
@@ -1,5 +1,8 @@
 2009-05-31  Kouhei Sutou  <kou@...>
 
+	* src/depend: use RUBYARCHDIR.
+	Patch by OBATA Akio. Thanks!!!
+
 	* src/lib/gtk2/base.rb: remove cairo loading because Ruby/Pango
 	has tried it.
 

Modified: ruby-gnome2/trunk/gtk/src/depend
===================================================================
--- ruby-gnome2/trunk/gtk/src/depend	2009-05-31 02:26:17 UTC (rev 3647)
+++ ruby-gnome2/trunk/gtk/src/depend	2009-05-31 02:27:17 UTC (rev 3648)
@@ -1,3 +1,3 @@
-install:
-	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgtk.h $(sitearchdir)$(target_prefix)
-	@$(RUBY) -run -e install -- -m 0644 -v $(srcdir)/rbgtkconversions.h $(sitearchdir)$(target_prefix)
+install-so:
+	$(INSTALL_DATA) $(srcdir)/rbgtk.h $(RUBYARCHDIR)
+	$(INSTALL_DATA) $(srcdir)/rbgtkconversions.h $(RUBYARCHDIR)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3665
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3665&view=rev
Author:   ktou
Date:     2009-07-01 13:57:13 +0000 (Wed, 01 Jul 2009)

Log Message:
-----------
* src/depend: add missing headers.
  Patch by Mamoru Tasaka. Thanks!!!

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/depend

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2009-06-28 06:03:57 UTC (rev 3664)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2009-07-01 13:57:13 UTC (rev 3665)
@@ -1,3 +1,8 @@
+2009-07-01  Kouhei Sutou  <kou@...>
+
+	* src/depend: add missing headers.
+	Patch by Mamoru Tasaka. Thanks!!!
+
 2009-05-31  Kouhei Sutou  <kou@...>
 
 	* src/depend: use RUBYARCHDIR.

Modified: ruby-gnome2/trunk/gtk/src/depend
===================================================================
--- ruby-gnome2/trunk/gtk/src/depend	2009-06-28 06:03:57 UTC (rev 3664)
+++ ruby-gnome2/trunk/gtk/src/depend	2009-07-01 13:57:13 UTC (rev 3665)
@@ -1,6 +1,9 @@
 install-so:
+	$(INSTALL_DATA) $(srcdir)/rbgdk.h $(RUBYARCHDIR)
+	$(INSTALL_DATA) $(srcdir)/rbgdkconversions.h $(RUBYARCHDIR)
 	$(INSTALL_DATA) $(srcdir)/rbgtk.h $(RUBYARCHDIR)
 	$(INSTALL_DATA) $(srcdir)/rbgtkconversions.h $(RUBYARCHDIR)
+	$(INSTALL_DATA) $(srcdir)/rbgtkmacros.h $(RUBYARCHDIR)
 
 install:
 	$(INSTALL_DATA) ../gtk+-2.0-ruby.pc $(libdir)/pkgconfig


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3697
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3697&view=rev
Author:   ktou
Date:     2009-09-22 13:54:25 +0000 (Tue, 22 Sep 2009)

Log Message:
-----------
* src/rbgtkwidget.c: fix a typo:
  Gtk::Widget#set_scroll_adjustments ->
  Gtk::Widget#set_scroll_adjustment. [#2679744]
  Reported by Kentaro Fukuchi. Thanks!!!

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgtkwidget.c

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2009-09-22 13:35:30 UTC (rev 3696)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2009-09-22 13:54:25 UTC (rev 3697)
@@ -1,3 +1,10 @@
+2009-09-22  Kouhei Sutou  <kou@...>
+
+	* src/rbgtkwidget.c: fix a typo:
+	Gtk::Widget#set_scroll_adjustments ->
+	Gtk::Widget#set_scroll_adjustment. [#2679744]
+	Reported by Kentaro Fukuchi. Thanks!!!
+
 2009-07-01  Kouhei Sutou  <kou@...>
 
 	* src/depend: add missing headers.

Modified: ruby-gnome2/trunk/gtk/src/rbgtkwidget.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkwidget.c	2009-09-22 13:35:30 UTC (rev 3696)
+++ ruby-gnome2/trunk/gtk/src/rbgtkwidget.c	2009-09-22 13:54:25 UTC (rev 3697)
@@ -1311,7 +1311,9 @@
     rb_define_method(gWidget, "set_double_buffered", widget_set_double_buffered, 1);
     rb_define_method(gWidget, "set_redraw_on_allocate", widget_set_redraw_on_allocate, 1);
     rb_define_method(gWidget, "set_composite_name", widget_set_composite_name, 1);
-    rb_define_method(gWidget, "set_scroll_adjustment", widget_set_scroll_adjustments, 2);
+    rb_define_method(gWidget, "set_scroll_adjustments", widget_set_scroll_adjustments, 2);
+    /* for backward compatibility. */
+    rb_define_alias(gWidget, "set_scroll_adjustment", "set_scroll_adjustments");
     rb_define_method(gWidget, "mnemonic_activate", widget_mnemonic_activate, 1);
     rb_define_method(gWidget, "region_intersect", widget_region_intersect, 1);
     rb_define_method(gWidget, "send_expose", widget_send_expose, 1);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3713
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3713&view=rev
Author:   ktou
Date:     2009-09-27 04:09:52 +0000 (Sun, 27 Sep 2009)

Log Message:
-----------
* src/rbgdkwindow.c: ignore GdkWindow's cursor property because it
  is registered as gpointer. We can't handle Gdk::Cursor without
  type information. We should define Gdk::Window#cursor instead of
  auto-property reader for it. [#2865895]
  Reported by Guillaume Cottenceau. Thanks!!!
  Reported by Mamoru Tasaka. Thanks!!!

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgdkwindow.c

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2009-09-24 11:46:10 UTC (rev 3712)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2009-09-27 04:09:52 UTC (rev 3713)
@@ -1,3 +1,12 @@
+2009-09-27  Kouhei Sutou  <kou@...>
+
+	* src/rbgdkwindow.c: ignore GdkWindow's cursor property because it
+	is registered as gpointer. We can't handle Gdk::Cursor without
+	type information. We should define Gdk::Window#cursor instead of
+	auto-property reader for it. [#2865895]
+	Reported by Guillaume Cottenceau. Thanks!!!
+	Reported by Mamoru Tasaka. Thanks!!!
+
 2009-09-22  Kouhei Sutou  <kou@...>
 
 	* src/rbgtkwidget.c: fix a typo:

Modified: ruby-gnome2/trunk/gtk/src/rbgdkwindow.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgdkwindow.c	2009-09-24 11:46:10 UTC (rev 3712)
+++ ruby-gnome2/trunk/gtk/src/rbgdkwindow.c	2009-09-27 04:09:52 UTC (rev 3713)
@@ -1093,8 +1093,11 @@
 void
 Init_gtk_gdk_window()
 {
+    GObjectClass *g_class;
     VALUE gdkWindow = G_DEF_CLASS(GDK_TYPE_WINDOW, "Window", mGdk);
 
+    g_class = g_type_class_peek(GDK_TYPE_WINDOW);
+
     rb_define_method(gdkWindow, "initialize", gdkwin_initialize, 3);
     rb_define_method(gdkWindow, "destroy", gdkwin_destroy, 0);
     rb_define_method(gdkWindow, "window_type", gdkwin_get_window_type, 0);
@@ -1178,6 +1181,10 @@
     rb_define_method(gdkWindow, "set_background", gdkwin_set_background, 1);
     rb_define_method(gdkWindow, "set_back_pixmap", gdkwin_set_back_pixmap, 2);
     rb_define_method(gdkWindow, "set_cursor", gdkwin_set_cursor, 1);
+    if (g_object_class_find_property(g_class, "cursor")) {
+        rb_undef_method(gdkWindow, "cursor");
+        rb_undef_method(gdkWindow, "cursor=");
+    }
     rb_define_method(gdkWindow, "user_data", gdkwin_get_user_data, 0);
     rb_define_method(gdkWindow, "geometry", gdkwin_get_geometry, 0);
     rb_define_method(gdkWindow, "set_geometry_hints", gdkwin_set_geometry_hints, 2);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3715
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3715&view=rev
Author:   ktou
Date:     2009-10-04 09:00:10 +0000 (Sun, 04 Oct 2009)

Log Message:
-----------
* src/rbgdkwindow.c: enable GdkWindow's cursor property again
  because GTK+ 2.18.1 fixed it. We marks GTK+ 2.18.0 as unsupported
  GTK+ version.
  Reported by Guillaume Cottenceau. Thanks!!!

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgdkwindow.c

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2009-09-27 05:17:33 UTC (rev 3714)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2009-10-04 09:00:10 UTC (rev 3715)
@@ -1,3 +1,10 @@
+2009-10-04  Kouhei Sutou  <kou@...>
+
+	* src/rbgdkwindow.c: enable GdkWindow's cursor property again
+	because GTK+ 2.18.1 fixed it. We marks GTK+ 2.18.0 as unsupported
+	GTK+ version.
+	Reported by Guillaume Cottenceau. Thanks!!!
+
 2009-09-27  Kouhei Sutou  <kou@...>
 
 	* src/rbgdkwindow.c: ignore GdkWindow's cursor property because it

Modified: ruby-gnome2/trunk/gtk/src/rbgdkwindow.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgdkwindow.c	2009-09-27 05:17:33 UTC (rev 3714)
+++ ruby-gnome2/trunk/gtk/src/rbgdkwindow.c	2009-10-04 09:00:10 UTC (rev 3715)
@@ -663,6 +663,7 @@
     return self;
 }
 
+#if !GTK_CHECK_VERSION(2, 18, 0)
 static VALUE
 gdkwin_set_cursor(self, cursor)
     VALUE self, cursor;
@@ -672,6 +673,7 @@
 
     return self;
 }
+#endif
 
 /* Obsolete
    #define     gdk_window_set_colormap
@@ -1180,11 +1182,9 @@
     rb_define_method(gdkWindow, "set_title", gdkwin_set_title, 1);
     rb_define_method(gdkWindow, "set_background", gdkwin_set_background, 1);
     rb_define_method(gdkWindow, "set_back_pixmap", gdkwin_set_back_pixmap, 2);
+#if !GTK_CHECK_VERSION(2, 18, 0)
     rb_define_method(gdkWindow, "set_cursor", gdkwin_set_cursor, 1);
-    if (g_object_class_find_property(g_class, "cursor")) {
-        rb_undef_method(gdkWindow, "cursor");
-        rb_undef_method(gdkWindow, "cursor=");
-    }
+#endif
     rb_define_method(gdkWindow, "user_data", gdkwin_get_user_data, 0);
     rb_define_method(gdkWindow, "geometry", gdkwin_get_geometry, 0);
     rb_define_method(gdkWindow, "set_geometry_hints", gdkwin_set_geometry_hints, 2);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3721
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3721&view=rev
Author:   ktou
Date:     2009-12-15 12:29:34 +0000 (Tue, 15 Dec 2009)

Log Message:
-----------
* src/rbgtkmenuitem.c: accept nil as label.
  Reported by Kazuhiro NISHIYAMA. Thanks!!!
* test/test_gtk_menu_item.rb: add.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgtkmenuitem.c

Added Paths:
-----------
    ruby-gnome2/trunk/gtk/test/test_gtk_menu_item.rb

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2009-10-11 05:21:38 UTC (rev 3720)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2009-12-15 12:29:34 UTC (rev 3721)
@@ -1,3 +1,10 @@
+2009-12-15  Kouhei Sutou  <kou@...>
+
+	* src/rbgtkmenuitem.c: accept nil as label.
+	Reported by Kazuhiro NISHIYAMA. Thanks!!!
+
+	* test/test_gtk_menu_item.rb: add.
+
 2009-10-04  Kouhei Sutou  <kou@...>
 
 	* src/rbgdkwindow.c: enable GdkWindow's cursor property again

Modified: ruby-gnome2/trunk/gtk/src/rbgtkmenuitem.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkmenuitem.c	2009-10-11 05:21:38 UTC (rev 3720)
+++ ruby-gnome2/trunk/gtk/src/rbgtkmenuitem.c	2009-12-15 12:29:34 UTC (rev 3721)
@@ -22,14 +22,18 @@
     VALUE *argv;
     VALUE self;
 {
-    VALUE label, use_underline;
+    VALUE rb_label, use_underline;
     GtkWidget *widget = NULL;
 
-    if (rb_scan_args(argc, argv, "02", &label, &use_underline) > 0) {
-        if (NIL_P(use_underline) || RVAL2CBOOL(use_underline)){
-            widget = gtk_menu_item_new_with_mnemonic(RVAL2CSTR(label));
+    if (rb_scan_args(argc, argv, "02", &rb_label, &use_underline) > 0) {
+        const gchar *label = NULL;
+
+        if (!NIL_P(rb_label))
+            label = RVAL2CSTR(rb_label);
+        if (NIL_P(use_underline) || RVAL2CBOOL(use_underline)) {
+            widget = gtk_menu_item_new_with_mnemonic(label);
         } else {
-            widget = gtk_menu_item_new_with_label(RVAL2CSTR(label));
+            widget = gtk_menu_item_new_with_label(label);
         }
     } else {
         widget = gtk_menu_item_new();

Added: ruby-gnome2/trunk/gtk/test/test_gtk_menu_item.rb
===================================================================
--- ruby-gnome2/trunk/gtk/test/test_gtk_menu_item.rb	                        (rev 0)
+++ ruby-gnome2/trunk/gtk/test/test_gtk_menu_item.rb	2009-12-15 12:29:34 UTC (rev 3721)
@@ -0,0 +1,13 @@
+class TestGtkMenuItem < Test::Unit::TestCase
+  include GtkTestUtils
+
+  def test_new_with_label
+    item = Gtk::MenuItem.new("Label")
+    assert_equal("Label", item.label)
+  end
+
+  def test_new_with_nil_label
+    item = Gtk::MenuItem.new(nil)
+    assert_equal("", item.label)
+  end
+end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3729
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3729&view=rev
Author:   ktou
Date:     2010-01-16 02:11:07 +0000 (Sat, 16 Jan 2010)

Log Message:
-----------
* src/rbgdkwindow.c (gdkwin_invalidate): accept nil as 'area' argument.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgdkwindow.c

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2010-01-02 03:15:42 UTC (rev 3728)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2010-01-16 02:11:07 UTC (rev 3729)
@@ -1,3 +1,8 @@
+2010-01-16  Hiroyuki Ito  <ZXB01226@...>
+
+	* src/rbgdkwindow.c (gdkwin_invalidate): accept nil as 'area'
+	argument.
+
 2009-12-15  Kouhei Sutou  <kou@...>
 
 	* src/rbgtkmenuitem.c: accept nil as label.

Modified: ruby-gnome2/trunk/gtk/src/rbgdkwindow.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgdkwindow.c	2010-01-02 03:15:42 UTC (rev 3728)
+++ ruby-gnome2/trunk/gtk/src/rbgdkwindow.c	2010-01-16 02:11:07 UTC (rev 3729)
@@ -374,14 +374,14 @@
 gdkwin_invalidate(self, area, invalidate_children)
     VALUE self, area, invalidate_children;
 {
-    if (rb_obj_is_kind_of(area, GTYPE2CLASS(GDK_TYPE_RECTANGLE))){
+    if (rb_obj_is_kind_of(area, GTYPE2CLASS(GDK_TYPE_REGION))){
+        gdk_window_invalidate_region(_SELF(self),
+                                     RVAL2BOXED(area, GDK_TYPE_REGION),
+                                     RVAL2CBOOL(invalidate_children));
+    } else {
         gdk_window_invalidate_rect(_SELF(self),
                                    RVAL2BOXED(area, GDK_TYPE_RECTANGLE),
                                    RVAL2CBOOL(invalidate_children));
-    } else {
-        gdk_window_invalidate_region(_SELF(self),
-                                     RVAL2BOXED(area, GDK_TYPE_REGION),
-                                     RVAL2CBOOL(invalidate_children));
     }
     return self;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3739
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3739&view=rev
Author:   htrb
Date:     2010-02-02 14:13:45 +0000 (Tue, 02 Feb 2010)

Log Message:
-----------
add stock items available with GTK+ 2.14 and 2.16.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgtkstock.c

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2010-01-17 14:39:09 UTC (rev 3738)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2010-02-02 14:13:45 UTC (rev 3739)
@@ -1,3 +1,8 @@
+2010-02-02  Hiroyuki Ito  <ZXB01226@...>
+
+	* src/rbgtkstock.c (Init_gtk_stock): add items available with GTK+
+	2.14 and 2.16.
+
 2010-01-16  Hiroyuki Ito  <ZXB01226@...>
 
 	* src/rbgdkwindow.c (gdkwin_invalidate): accept nil as 'area'

Modified: ruby-gnome2/trunk/gtk/src/rbgtkstock.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkstock.c	2010-01-17 14:39:09 UTC (rev 3738)
+++ ruby-gnome2/trunk/gtk/src/rbgtkstock.c	2010-02-02 14:13:45 UTC (rev 3739)
@@ -119,6 +119,9 @@
     rb_define_const(mGtkStock, "APPLY", CSTR2SYM(GTK_STOCK_APPLY));
     rb_define_const(mGtkStock, "BOLD", CSTR2SYM(GTK_STOCK_BOLD));
     rb_define_const(mGtkStock, "CANCEL", CSTR2SYM(GTK_STOCK_CANCEL));
+#if GTK_CHECK_VERSION(2,16,0)
+    rb_define_const(mGtkStock, "CAPS_LOCK_WARNING", CSTR2SYM(GTK_STOCK_CAPS_LOCK_WARNING));
+#endif
     rb_define_const(mGtkStock, "CDROM", CSTR2SYM(GTK_STOCK_CDROM));
     rb_define_const(mGtkStock, "CLEAR", CSTR2SYM(GTK_STOCK_CLEAR));
     rb_define_const(mGtkStock, "CLOSE", CSTR2SYM(GTK_STOCK_CLOSE));
@@ -214,10 +217,21 @@
     rb_define_const(mGtkStock, "ORIENTATION_REVERSE_LANDSCAPE", CSTR2SYM(GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE));
     rb_define_const(mGtkStock, "ORIENTATION_REVERSE_PORTRAIT", CSTR2SYM(GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT));
 #endif
+#if GTK_CHECK_VERSION(2,14,0)
+    rb_define_const(mGtkStock, "PAGE_SETUP", CSTR2SYM(GTK_STOCK_PAGE_SETUP));
+#endif
     rb_define_const(mGtkStock, "PASTE", CSTR2SYM(GTK_STOCK_PASTE));
     rb_define_const(mGtkStock, "PREFERENCES", CSTR2SYM(GTK_STOCK_PREFERENCES));
     rb_define_const(mGtkStock, "PRINT", CSTR2SYM(GTK_STOCK_PRINT));
+#if GTK_CHECK_VERSION(2,14,0)
+    rb_define_const(mGtkStock, "PRINT_ERROR", CSTR2SYM(GTK_STOCK_PRINT_ERROR));
+    rb_define_const(mGtkStock, "PRINT_PAUSED", CSTR2SYM(GTK_STOCK_PRINT_PAUSED));
+#endif
     rb_define_const(mGtkStock, "PRINT_PREVIEW", CSTR2SYM(GTK_STOCK_PRINT_PREVIEW));
+#if GTK_CHECK_VERSION(2,14,0)
+    rb_define_const(mGtkStock, "PRINT_REPORT", CSTR2SYM(GTK_STOCK_PRINT_REPORT));
+    rb_define_const(mGtkStock, "PRINT_WARNING", CSTR2SYM(GTK_STOCK_PRINT_WARNING));
+#endif
     rb_define_const(mGtkStock, "PROPERTIES", CSTR2SYM(GTK_STOCK_PROPERTIES));
     rb_define_const(mGtkStock, "QUIT", CSTR2SYM(GTK_STOCK_QUIT));
     rb_define_const(mGtkStock, "REDO", CSTR2SYM(GTK_STOCK_REDO));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3743
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3743&view=rev
Author:   ktou
Date:     2010-02-12 12:40:22 +0000 (Fri, 12 Feb 2010)

Log Message:
-----------
* src/rbgtkclipboard.c (clipboard_text_received_func): set UTF-8
  encoding to text passed from clipbord.
  Suggested by Rg Rg. Thanks!!!

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgtkclipboard.c

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2010-02-10 13:57:57 UTC (rev 3742)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2010-02-12 12:40:22 UTC (rev 3743)
@@ -1,3 +1,9 @@
+2010-02-12  Kouhei Sutou  <kou@...>
+
+	* src/rbgtkclipboard.c (clipboard_text_received_func): set UTF-8
+	encoding to text passed from clipbord.
+	Suggested by Rg Rg. Thanks!!!
+
 2010-02-02  Hiroyuki Ito  <ZXB01226@...>
 
 	* src/rbgtkstock.c (Init_gtk_stock): add items available with GTK+

Modified: ruby-gnome2/trunk/gtk/src/rbgtkclipboard.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkclipboard.c	2010-02-10 13:57:57 UTC (rev 3742)
+++ ruby-gnome2/trunk/gtk/src/rbgtkclipboard.c	2010-02-12 12:40:22 UTC (rev 3743)
@@ -176,14 +176,15 @@
 }
 
 static void
-clipboard_text_received_func(clipboard, text, func)
-    GtkClipboard* clipboard;
-    const gchar* text;
-    gpointer func;
+clipboard_text_received_func(GtkClipboard *clipboard, const gchar *text,
+                             gpointer func)
 {
     VALUE vtext = Qnil;
-    if(text) vtext = CSTR2RVAL(text);
-        
+    if (text) {
+        vtext = CSTR2RVAL(text);
+        RBG_STRING_SET_UTF8_ENCODING(vtext);
+    }
+
     rb_funcall((VALUE)func, id_call, 2, CLIPBOARD2RVAL(clipboard), vtext);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3751
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3751&view=rev
Author:   ktou
Date:     2010-02-28 08:32:39 +0000 (Sun, 28 Feb 2010)

Log Message:
-----------
* src/rbgdkpixbuf.c: fix wrong number of arguments.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgdkpixbuf.c

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2010-02-28 07:33:28 UTC (rev 3750)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2010-02-28 08:32:39 UTC (rev 3751)
@@ -1,3 +1,7 @@
+2010-02-28  Kouhei Sutou  <kou@...>
+
+	* src/rbgdkpixbuf.c: fix wrong number of arguments.
+
 2010-02-12  Kouhei Sutou  <kou@...>
 
 	* src/rbgtkclipboard.c (clipboard_text_received_func): set UTF-8

Modified: ruby-gnome2/trunk/gtk/src/rbgdkpixbuf.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgdkpixbuf.c	2010-02-28 07:33:28 UTC (rev 3750)
+++ ruby-gnome2/trunk/gtk/src/rbgdkpixbuf.c	2010-02-28 08:32:39 UTC (rev 3751)
@@ -33,8 +33,7 @@
     VALUE *argv;
     VALUE self;
 {
-    VALUE args[11];
-    VALUE gc, src_x, src_y, dest_x, dest_y, width, height, 
+    VALUE gc, src_x, src_y, dest_x, dest_y, width, height,
         dither, x_dither, y_dither;
 
     int i;
@@ -43,13 +42,23 @@
     rb_warn("Gdk::Pixbuf#render_to_drawable is obsolete. Use Gdk::Drawable#draw_pixbuf instead.");
 #endif
 
-    rb_scan_args(argc, argv, "83", &gc, &src_x, &src_y, &dest_x, &dest_y,
+    rb_scan_args(argc, argv, "73", &gc, &src_x, &src_y, &dest_x, &dest_y,
                  &width, &height, &dither, &x_dither, &y_dither);
 
-    for (i = 0; i < 8; i++) {
-	if (NIL_P(args[i]))
-	    rb_raise(rb_eArgError, "arguments %d must be non nil", i);
-    }
+    if (NIL_P(gc))
+        rb_raise(rb_eArgError, "arguments 1 must be non nil");
+    if (NIL_P(src_x))
+        rb_raise(rb_eArgError, "arguments 2 must be non nil");
+    if (NIL_P(src_y))
+        rb_raise(rb_eArgError, "arguments 3 must be non nil");
+    if (NIL_P(dest_x))
+        rb_raise(rb_eArgError, "arguments 4 must be non nil");
+    if (NIL_P(dest_y))
+        rb_raise(rb_eArgError, "arguments 5 must be non nil");
+    if (NIL_P(width))
+        rb_raise(rb_eArgError, "arguments 6 must be non nil");
+    if (NIL_P(height))
+        rb_raise(rb_eArgError, "arguments 7 must be non nil");
 
     gdk_pixbuf_render_to_drawable(_SELF(self),
 				  GDK_DRAWABLE(RVAL2GOBJ(self)),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3755
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3755&view=rev
Author:   ktou
Date:     2010-04-09 12:31:43 +0000 (Fri, 09 Apr 2010)

Log Message:
-----------
* src/rbgtktreepath.c, test/test_gtk_tree_path.rb: fix wrong Ruby
  <-> C conversion of Gtk::TreePath#<=>.
  Reported by Takeuchi Yusuke. Thanks!!!

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgtktreepath.c

Added Paths:
-----------
    ruby-gnome2/trunk/gtk/test/test_gtk_tree_path.rb

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2010-04-07 13:17:17 UTC (rev 3754)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2010-04-09 12:31:43 UTC (rev 3755)
@@ -1,3 +1,9 @@
+2010-04-09  Kouhei Sutou  <kou@...>
+
+	* src/rbgtktreepath.c, test/test_gtk_tree_path.rb: fix wrong Ruby
+	<-> C conversion of Gtk::TreePath#<=>.
+	Reported by Takeuchi Yusuke. Thanks!!!
+
 2010-02-28  Kouhei Sutou  <kou@...>
 
 	* src/rbgdkpixbuf.c: fix wrong number of arguments.

Modified: ruby-gnome2/trunk/gtk/src/rbgtktreepath.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtktreepath.c	2010-04-07 13:17:17 UTC (rev 3754)
+++ ruby-gnome2/trunk/gtk/src/rbgtktreepath.c	2010-04-09 12:31:43 UTC (rev 3755)
@@ -111,7 +111,7 @@
 treepath_compare(self, other)
     VALUE self, other;
 {
-    return NUM2INT(gtk_tree_path_compare(_SELF(self), _SELF(other)));
+    return INT2NUM(gtk_tree_path_compare(_SELF(self), _SELF(other)));
 }
 
 static VALUE

Added: ruby-gnome2/trunk/gtk/test/test_gtk_tree_path.rb
===================================================================
--- ruby-gnome2/trunk/gtk/test/test_gtk_tree_path.rb	                        (rev 0)
+++ ruby-gnome2/trunk/gtk/test/test_gtk_tree_path.rb	2010-04-09 12:31:43 UTC (rev 3755)
@@ -0,0 +1,14 @@
+class TestGtkTreePath < Test::Unit::TestCase
+  include GtkTestUtils
+
+  def test_compare
+    assert_equal(-1, tree_path("0") <=> tree_path("1"))
+    assert_equal(0, tree_path("0") <=> tree_path("0"))
+    assert_equal(1, tree_path("1") <=> tree_path("0"))
+  end
+
+  private
+  def tree_path(path)
+    Gtk::TreePath.new(path)
+  end
+end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3756
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3756&view=rev
Author:   ktou
Date:     2010-04-09 12:38:26 +0000 (Fri, 09 Apr 2010)

Log Message:
-----------
* src/rbgtktreepath.c, test/test_gtk_tree_path.rb: add Gtk::TreePath#==.
  Suggested by Takeuchi Yusuke. Thanks!!!

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgtktreepath.c
    ruby-gnome2/trunk/gtk/test/test_gtk_tree_path.rb

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2010-04-09 12:31:43 UTC (rev 3755)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2010-04-09 12:38:26 UTC (rev 3756)
@@ -1,5 +1,9 @@
 2010-04-09  Kouhei Sutou  <kou@...>
 
+	* src/rbgtktreepath.c, test/test_gtk_tree_path.rb: add
+	Gtk::TreePath#==.
+	Suggested by Takeuchi Yusuke. Thanks!!!
+
 	* src/rbgtktreepath.c, test/test_gtk_tree_path.rb: fix wrong Ruby
 	<-> C conversion of Gtk::TreePath#<=>.
 	Reported by Takeuchi Yusuke. Thanks!!!

Modified: ruby-gnome2/trunk/gtk/src/rbgtktreepath.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtktreepath.c	2010-04-09 12:31:43 UTC (rev 3755)
+++ ruby-gnome2/trunk/gtk/src/rbgtktreepath.c	2010-04-09 12:38:26 UTC (rev 3756)
@@ -14,6 +14,8 @@
 
 #define _SELF(s) ((GtkTreePath*)RVAL2BOXED(s, GTK_TYPE_TREE_PATH))
 
+static ID id_equal;
+
 static VALUE
 treepath_initialize(argc, argv, self)
     int argc;
@@ -115,6 +117,16 @@
 }
 
 static VALUE
+treepath_equal(VALUE self, VALUE other)
+{
+    if (!RVAL2CBOOL(rb_funcall(CLASS_OF(self), id_equal, 1, CLASS_OF(other)))) {
+        return Qfalse;
+    }
+
+    return CBOOL2RVAL(gtk_tree_path_compare(_SELF(self), _SELF(other)) == 0);
+}
+
+static VALUE
 treepath_next(self)
     VALUE self;
 {
@@ -163,6 +175,8 @@
 {
     VALUE gTreepath = G_DEF_CLASS(GTK_TYPE_TREE_PATH, "TreePath", mGtk);
 
+    id_equal = rb_intern("==");
+
     rb_define_method(gTreepath, "initialize", treepath_initialize, -1);
     rb_define_method(gTreepath, "to_str", treepath_to_string, 0);
     rb_define_alias(gTreepath, "to_s", "to_str");
@@ -171,6 +185,7 @@
     rb_define_method(gTreepath, "depth", treepath_get_depth, 0);
     rb_define_method(gTreepath, "indices", treepath_get_indices, 0);
     rb_define_method(gTreepath, "<=>", treepath_compare, 1);
+    rb_define_method(gTreepath, "==", treepath_equal, 1);
     rb_define_method(gTreepath, "next!", treepath_next, 0);
     rb_define_method(gTreepath, "prev!", treepath_prev, 0);
     rb_define_method(gTreepath, "up!", treepath_up, 0);

Modified: ruby-gnome2/trunk/gtk/test/test_gtk_tree_path.rb
===================================================================
--- ruby-gnome2/trunk/gtk/test/test_gtk_tree_path.rb	2010-04-09 12:31:43 UTC (rev 3755)
+++ ruby-gnome2/trunk/gtk/test/test_gtk_tree_path.rb	2010-04-09 12:38:26 UTC (rev 3756)
@@ -7,6 +7,12 @@
     assert_equal(1, tree_path("1") <=> tree_path("0"))
   end
 
+  def test_equal
+    assert_equal(tree_path("0"), tree_path("0"))
+    assert_not_equal(tree_path("0"), tree_path("1"))
+    assert_not_equal(tree_path("0"), "0")
+  end
+
   private
   def tree_path(path)
     Gtk::TreePath.new(path)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3761
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3761&view=rev
Author:   ktou
Date:     2010-04-17 02:29:52 +0000 (Sat, 17 Apr 2010)

Log Message:
-----------
* src/rbgtkrecentinfo.c (ri_get_application_info): fix double free bug.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgtkrecentinfo.c

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2010-04-17 02:26:54 UTC (rev 3760)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2010-04-17 02:29:52 UTC (rev 3761)
@@ -1,3 +1,8 @@
+2010-04-17  Kouhei Sutou  <kou@...>
+
+	* src/rbgtkrecentinfo.c (ri_get_application_info): fix double free
+	bug.
+
 2010-04-09  Kouhei Sutou  <kou@...>
 
 	* src/rbgtktreepath.c, test/test_gtk_tree_path.rb: add

Modified: ruby-gnome2/trunk/gtk/src/rbgtkrecentinfo.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkrecentinfo.c	2010-04-17 02:26:54 UTC (rev 3760)
+++ ruby-gnome2/trunk/gtk/src/rbgtkrecentinfo.c	2010-04-17 02:29:52 UTC (rev 3761)
@@ -79,7 +79,7 @@
 ri_get_application_info(self, app_name)
     VALUE self, app_name;
 {
-    gchar* app_exec;
+    const gchar *app_exec;
     guint count;
     time_t t;
     gboolean ret = gtk_recent_info_get_application_info(_SELF(self),
@@ -90,7 +90,6 @@
     VALUE ary = rb_ary_new();
     if (ret){
         rb_ary_push(ary, CSTR2RVAL(app_exec));
-        g_free(app_exec);
         rb_ary_push(ary, UINT2NUM(count));
         rb_ary_push(ary, rb_funcall(rb_cTime, rb_intern("at"), 1, INT2NUM(t)));
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3763
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3763&view=rev
Author:   ktou
Date:     2010-04-17 02:32:37 +0000 (Sat, 17 Apr 2010)

Log Message:
-----------
* src/rbgdkpixbuf.c (pixbuf_render_to_drawable): remove an unused variable.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgdkpixbuf.c

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2010-04-17 02:31:05 UTC (rev 3762)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2010-04-17 02:32:37 UTC (rev 3763)
@@ -1,5 +1,8 @@
 2010-04-17  Kouhei Sutou  <kou@...>
 
+	* src/rbgdkpixbuf.c (pixbuf_render_to_drawable): remove an unused
+	variable.
+
 	* src/rbgtkrecentinfo.c (ri_get_application_info): fix double free
 	bug.
 

Modified: ruby-gnome2/trunk/gtk/src/rbgdkpixbuf.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgdkpixbuf.c	2010-04-17 02:31:05 UTC (rev 3762)
+++ ruby-gnome2/trunk/gtk/src/rbgdkpixbuf.c	2010-04-17 02:32:37 UTC (rev 3763)
@@ -36,8 +36,6 @@
     VALUE gc, src_x, src_y, dest_x, dest_y, width, height,
         dither, x_dither, y_dither;
 
-    int i;
-
 #if GTK_CHECK_VERSION(2,2,0)
     rb_warn("Gdk::Pixbuf#render_to_drawable is obsolete. Use Gdk::Drawable#draw_pixbuf instead.");
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3767
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3767&view=rev
Author:   ktou
Date:     2010-05-03 22:24:56 +0000 (Mon, 03 May 2010)

Log Message:
-----------
* src/rbgtkbuildable.c: use #builder_name/#set_builder_name
  instead of #name/#set_name because they are hidden by Gtk::Widget.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/src/rbgtkbuildable.c

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2010-04-17 03:06:58 UTC (rev 3766)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2010-05-03 22:24:56 UTC (rev 3767)
@@ -1,3 +1,8 @@
+2010-05-04  Kouhei Sutou  <kou@...>
+
+	* src/rbgtkbuildable.c: use #builder_name/#set_builder_name
+	instead of #name/#set_name because they are hidden by Gtk::Widget.
+
 2010-04-17  Kouhei Sutou  <kou@...>
 
 	* src/rbgdkpixbuf.c (pixbuf_render_to_drawable): remove an unused

Modified: ruby-gnome2/trunk/gtk/src/rbgtkbuildable.c
===================================================================
--- ruby-gnome2/trunk/gtk/src/rbgtkbuildable.c	2010-04-17 03:06:58 UTC (rev 3766)
+++ ruby-gnome2/trunk/gtk/src/rbgtkbuildable.c	2010-05-03 22:24:56 UTC (rev 3767)
@@ -100,8 +100,8 @@
 
     cGtkBuildable = G_DEF_CLASS(GTK_TYPE_BUILDABLE, "Buildable", mGtk);
 
-    rb_define_method(cGtkBuildable, "name", buildable_get_name, 0);
-    rb_define_method(cGtkBuildable, "set_name", buildable_set_name, 1);
+    rb_define_method(cGtkBuildable, "builder_name", buildable_get_name, 0);
+    rb_define_method(cGtkBuildable, "set_builder_name", buildable_set_name, 1);
     rb_define_method(cGtkBuildable, "add_child", buildable_add_child, -1);
     rb_define_method(cGtkBuildable, "set_buildable_property",
                      buildable_set_buildable_property, 3);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3771
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3771&view=rev
Author:   ktou
Date:     2010-05-09 00:27:33 +0000 (Sun, 09 May 2010)

Log Message:
-----------
* extconf.rb: remove needless add_depended_package.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/extconf.rb

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2010-05-09 00:26:43 UTC (rev 3770)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2010-05-09 00:27:33 UTC (rev 3771)
@@ -1,3 +1,7 @@
+2010-05-09  Kouhei Sutou  <kou@...>
+
+	* extconf.rb: remove needless add_depended_package.
+
 2010-05-04  Kouhei Sutou  <kou@...>
 
 	* src/rbgtkbuildable.c: use #builder_name/#set_builder_name

Modified: ruby-gnome2/trunk/gtk/extconf.rb
===================================================================
--- ruby-gnome2/trunk/gtk/extconf.rb	2010-05-09 00:26:43 UTC (rev 3770)
+++ ruby-gnome2/trunk/gtk/extconf.rb	2010-05-09 00:27:33 UTC (rev 3771)
@@ -79,8 +79,6 @@
 
 $defs.delete("-DRUBY_GTK2_COMPILATION")
 
-add_depend_package("gtk2", "gtk/src", TOPDIR)
-
 create_pkg_config_file("Ruby/GTK2", PKG_CONFIG_ID, ruby_gnome2_version)
 
 create_makefile_at_srcdir(PACKAGE_NAME, SRCDIR, "-DRUBY_GTK2_COMPILATION") {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3772
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3772&view=rev
Author:   ktou
Date:     2010-05-09 00:28:04 +0000 (Sun, 09 May 2010)

Log Message:
-----------
* extconf.rb: add missing have_library("X11").

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/extconf.rb

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2010-05-09 00:27:33 UTC (rev 3771)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2010-05-09 00:28:04 UTC (rev 3772)
@@ -1,5 +1,7 @@
 2010-05-09  Kouhei Sutou  <kou@...>
 
+	* extconf.rb: add missing have_library("X11").
+
 	* extconf.rb: remove needless add_depended_package.
 
 2010-05-04  Kouhei Sutou  <kou@...>

Modified: ruby-gnome2/trunk/gtk/extconf.rb
===================================================================
--- ruby-gnome2/trunk/gtk/extconf.rb	2010-05-09 00:27:33 UTC (rev 3771)
+++ ruby-gnome2/trunk/gtk/extconf.rb	2010-05-09 00:28:04 UTC (rev 3772)
@@ -54,7 +54,7 @@
 end
 
 xlib_header = "X11/Xlib.h"
-if target == "x11" and have_header('X11/Xlib.h')
+if target == "x11" and have_header('X11/Xlib.h') and have_library("X11")
   have_func("XReadBitmapFileData", xlib_header)
   have_func("XGetErrorText", xlib_header)
 end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3810
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3810&view=rev
Author:   ktou
Date:     2010-09-22 14:59:58 +0000 (Wed, 22 Sep 2010)

Log Message:
-----------
* src/lib/: -> lib/.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog

Added Paths:
-----------
    ruby-gnome2/trunk/gtk/lib/

Removed Paths:
-------------
    ruby-gnome2/trunk/gtk/src/lib/

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2010-09-22 14:30:22 UTC (rev 3809)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2010-09-22 14:59:58 UTC (rev 3810)
@@ -1,3 +1,7 @@
+2010-09-22  Kouhei Sutou  <kou@...>
+
+	* src/lib/: -> lib/.
+
 2010-05-09  Kouhei Sutou  <kou@...>
 
 	* extconf.rb: add missing have_library("X11").


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3812
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3812&view=rev
Author:   ktou
Date:     2010-09-22 16:05:44 +0000 (Wed, 22 Sep 2010)

Log Message:
-----------
* ./: make buildable with rake-compiler.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/ext/gtk2/gtk2.def
    ruby-gnome2/trunk/gtk/extconf.rb

Added Paths:
-----------
    ruby-gnome2/trunk/gtk/Rakefile
    ruby-gnome2/trunk/gtk/ext/
    ruby-gnome2/trunk/gtk/ext/gtk2/
    ruby-gnome2/trunk/gtk/ext/gtk2/extconf.rb

Removed Paths:
-------------
    ruby-gnome2/trunk/gtk/ext/gtk2/makeinits.rb
    ruby-gnome2/trunk/gtk/ext/gtk2/makekeysyms.rb
    ruby-gnome2/trunk/gtk/src/

Property Changed:
----------------
    ruby-gnome2/trunk/gtk/
    ruby-gnome2/trunk/gtk/lib/


Property changes on: ruby-gnome2/trunk/gtk
___________________________________________________________________
Modified: svn:ignore
   - *~
Makefile
MANIFEST
MANIFEST-doc
MANIFEST-src
MANIFEST-sample
t
t2
patch
ar
r.const
r2.const
g.const
g2.const
mkmf.log
ruby-gtk2.pc

   + *~
Makefile
mkmf.log
ruby-gtk2.pc
tmp
pkg
vendor


Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2010-09-22 16:03:44 UTC (rev 3811)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2010-09-22 16:05:44 UTC (rev 3812)
@@ -1,3 +1,7 @@
+2010-09-23  Kouhei Sutou  <kou@...>
+
+	* ./: make buildable with rake-compiler.
+
 2010-09-22  Kouhei Sutou  <kou@...>
 
 	* src/lib/: -> lib/.

Added: ruby-gnome2/trunk/gtk/Rakefile
===================================================================
--- ruby-gnome2/trunk/gtk/Rakefile	                        (rev 0)
+++ ruby-gnome2/trunk/gtk/Rakefile	2010-09-22 16:05:44 UTC (rev 3812)
@@ -0,0 +1,74 @@
+# -*- ruby -*-
+
+require 'pathname'
+require 'find'
+require 'rubygems'
+require 'rake/extensiontask'
+
+@top_dir = Pathname(__FILE__).dirname.parent.expand_path
+@rb_glib2_dir = @top_dir + "glib"
+
+task :default => :build
+
+def version
+  @version ||= ENV["VERSION"] || guess_version
+end
+
+def guess_version
+  versions = {}
+  rbglib_h_path = @rb_glib2_dir + "ext" + "glib2" + "rbglib.h"
+  rbglib_h_path.open do |rbglib_h|
+    rbglib_h.each_line do |line|
+      if /#define\s+RBGLIB_([A-Z]+)_VERSION\s+(\d+)/ =~ line
+        versions[$1.downcase] = $2.to_i
+      end
+    end
+  end
+  ["major", "minor", "micro"].collect {|type| versions[type]}.compact.join(".")
+end
+
+package_name = "gtk2"
+
+spec = Gem::Specification.new do |s|
+  s.name = package_name
+  s.summary = "Ruby/GTK2 is a Ruby binding of GTK+-2.x."
+  s.description = "Ruby/GTK2 is a Ruby binding of GTK+-2.x."
+  s.author = "The Ruby-GNOME2 Proejct Team"
+  s.email = "ruby-gnome2-devel-en@..."
+  s.homepage = "http://ruby-gnome2.sourceforge.jp/"
+  s.version = version
+  s.platform = Gem::Platform::RUBY
+  s.add_dependency("cairo", ">= 1.10.0")
+  s.add_dependency("glib2", "= #{version}")
+  s.add_dependency("pango", "= #{version}")
+  s.extensions = FileList["ext/#{package_name}/extconf.rb"]
+  s.require_paths = ["lib"]
+  s.files = FileList["ChangeLog", "README", "Rakefile", "extconf.rb",
+                     "lib/*.rb", "{ext,sample,test}/**/*"]
+end
+
+Rake::GemPackageTask.new(spec) do |pkg|
+end
+
+Rake::ExtensionTask.new(package_name, spec) do |ext|
+  ext.cross_compile = true
+  ext.cross_compiling do |spec|
+    if /mingw|mswin/ =~ spec.platform.to_s
+      win32_dir = File.join("vendor", "local")
+      win32_files = []
+      Find.find(win32_dir) do |file|
+        win32_files << file
+      end
+      spec.files += win32_files
+    end
+  end
+end
+
+namespace :win32 do
+  desc "download Windows binaries"
+  task :download do
+    $LOAD_PATH.unshift((@rb_glib2_dir + "lib").to_s)
+    require 'gnome2-win32-binary-downloader'
+    GNOME2Win32BinaryDownloader.download(:packages => ["gtk"])
+  end
+end

Copied: ruby-gnome2/trunk/gtk/ext/gtk2/extconf.rb (from rev 3810, ruby-gnome2/trunk/gtk/extconf.rb)
===================================================================
--- ruby-gnome2/trunk/gtk/ext/gtk2/extconf.rb	                        (rev 0)
+++ ruby-gnome2/trunk/gtk/ext/gtk2/extconf.rb	2010-09-22 16:05:44 UTC (rev 3812)
@@ -0,0 +1,191 @@
+=begin
+extconf.rb for Ruby/GTK extention library
+=end
+
+require 'pathname'
+
+source_dir = Pathname(__FILE__).dirname
+base_dir = source_dir.parent.parent.expand_path
+top_dir = base_dir.parent
+mkmf_gnome2_dir = top_dir + "glib" + 'lib'
+
+$LOAD_PATH.unshift(mkmf_gnome2_dir.to_s)
+
+module_name = "gtk2"
+package_id = "gtk+-2.0"
+
+require 'mkmf-gnome2'
+
+setup_win32(module_name, base_dir)
+
+PKGConfig.have_package('gthread-2.0')
+PKGConfig.have_package(package_id) or exit 1
+
+have_header("st.h")
+have_header("ruby/st.h")
+
+STDOUT.print("checking for target... ")
+STDOUT.flush
+target = PKGConfig.variable(package_id, "target")
+$defs << "-DRUBY_GTK2_TARGET=\\\"#{target}\\\""
+STDOUT.print(target, "\n")
+
+gdkincl = nil
+tmpincl = $CFLAGS.gsub(/-D\w+/, '').split(/-I/) + ['/usr/include']
+tmpincl.each do |i|
+  i.strip!
+
+  if FileTest.exist?(i + "/gdk/gdkkeysyms.h")
+    gdkincl = i + "/gdk"
+    break
+  end
+end
+raise "can't find gdkkeysyms.h" if gdkincl.nil?
+
+gtk_header = "gtk/gtk.h"
+have_func('gtk_plug_get_type', gtk_header)
+have_func('gtk_socket_get_type', gtk_header)
+have_func('pango_render_part_get_type', gtk_header)
+have_header('gtk/gtkfilesystem.h') do |src|
+  "#define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED\n#{src}"
+end
+
+xlib_header = "X11/Xlib.h"
+if target == "x11" and have_header('X11/Xlib.h') and have_library("X11")
+  have_func("XReadBitmapFileData", xlib_header)
+  have_func("XGetErrorText", xlib_header)
+end
+
+if target != "win32" and PKGConfig.have_package('gtk+-unix-print-2.0')
+  $defs.push("-DHAVE_GTK_UNIX_PRINT")
+end
+
+have_func("rb_errinfo")
+
+options = {}
+rcairo_source_dir_names = ["rcairo"]
+if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM
+  rcairo_source_dir_names.unshift("rcairo.win32")
+end
+rcairo_source_dir_names.each do |rcairo_source_dir_name|
+  rcairo_source_dir = top_dir.parent.expand_path + rcairo_source_dir_name
+  if rcairo_source_dir.exist?
+    options[:rcairo_source_dir] = rcairo_source_dir.to_s
+    break
+  end
+end
+check_cairo(options)
+
+[["glib", "glib2"],
+ ["pango", "pango"]].each do |directory, library_name|
+  build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{library_name}/#{RUBY_VERSION}"
+  options = {}
+  options[:target_build_dir] = build_dir if (top_dir + build_dir).exist?
+  add_depend_package(library_name, "#{directory}/ext/#{library_name}",
+                     top_dir.to_s, options)
+end
+
+add_distcleanfile("rbgdkkeysyms.h")
+add_distcleanfile("rbgtkinits.c")
+
+create_pkg_config_file("Ruby/GTK2", package_id, ruby_gnome2_version)
+
+class InitCreator
+  def initialize(output)
+    @output = output
+    @targets = []
+  end
+
+  def <<(target)
+    @targets << target
+  end
+
+  def run
+    inits = Hash.new
+
+    except_targets = ["Init_gtk2()", "Init_gtk_gdk()", "Init_gtk_gtk()"]
+    @targets.each do |target|
+      target.each_line do |line|
+        if /^(Init_.*\(\))(.*)/ =~ line
+          init = $1
+          unless except_targets.include?(init)
+            flag = $2
+            if flag.size > 0
+              if flag =~ /\/\*\s*(\w*)\s*\*\//
+                inits[$1] = Array.new unless inits[$1]
+                inits[$1] << init
+              end
+            else
+              inits[""] = Array.new unless inits[""]
+              inits[""] << init
+            end
+          end
+        end
+      end
+    end
+
+    print_data(inits, "", nil, true)
+    print_data(inits, "GTK_DISABLE_DEPRECATED", "ifndef", true)
+    print_data(inits, "GTK_ENABLE_BROKEN", "ifdef", true)
+
+    print "void Init_gtk_inits()\n"
+    print "{\n"
+    print_data(inits, "", nil)
+    print_data(inits, "GTK_DISABLE_DEPRECATED", "ifndef")
+    print_data(inits, "GTK_ENABLE_BROKEN", "ifdef")
+    print "}\n"
+  end
+
+  def print_data(array, type, defs, extern = false)
+    if array[type]
+      dependencies = {
+        "Init_gtk_gdk_gc()" => ["Init_gtk_gdk_draw()"],
+      }
+      extern_def = "extern void" if extern
+      print "##{defs} #{type}\n" if defs
+      sorted_array = array[type].dup
+      dependencies.each do |key, values|
+        key_index = sorted_array.index(key)
+        values.each do |value|
+          value_index = sorted_array.index(value)
+          next if value_index.nil?
+          sorted_array.delete(value)
+          sorted_array[key_index - 1, 0] = value
+          key_index = sorted_array.index(key)
+        end
+      end
+      sorted_array.each do |val|
+        print "#{extern_def}   #{val};\n"
+      end
+      print "#endif\n" if defs
+    end
+  end
+
+  def print(*args)
+    @output.print(*args)
+  end
+end
+
+rbgtkinits_c_path = Pathname("rbgtkinits.c")
+rbgtkinits_c_path.open("w") do |rbgtkinits_c|
+  init_creator = InitCreator.new(rbgtkinits_c)
+  source_dir.each_entry do |entry|
+    next unless entry.extname == ".c"
+    init_creator << (source_dir + entry)
+  end
+  init_creator.run
+end
+
+rbgdkkeysyms_h_path = Pathname("rbgdkkeysyms.h")
+rbgdkkeysyms_h_path.open("w") do |rbgdkkeysyms_h|
+  gdkkeysyms_h_path = Pathname(gdkincl) + "gdkkeysyms.h"
+  gdkkeysyms_h_path.each_line do |line|
+    if /^#define\s+(GDK_\w+)\s+\d+/ =~ line
+      define_line = "rb_define_const(mGdkKeyval, \"#{$1}\", INT2FIX(#{$1}));"
+      rbgdkkeysyms_h.puts(define_line)
+    end
+  end
+end
+
+$defs << "-DRUBY_GTK2_COMPILATION"
+create_makefile(module_name)

Modified: ruby-gnome2/trunk/gtk/ext/gtk2/gtk2.def
===================================================================
--- ruby-gnome2/trunk/gtk/src/gtk2.def	2010-09-22 14:59:58 UTC (rev 3810)
+++ ruby-gnome2/trunk/gtk/ext/gtk2/gtk2.def	2010-09-22 16:05:44 UTC (rev 3812)
@@ -20,13 +20,8 @@
     notebookpage_copy
     rbgtk_atom2selectiondata
     rbgtk_atom2selectiondata_free
-    rbgtk_clipboard_get_type DATA
-    rbgtk_get_clipboard DATA
-    rbgtk_make_clipboard DATA
     rbgtk_get_target_entry
-    rbgtk_get_tree_row_reference DATA
     rbgtk_initialize_gtkobject
     rbgtk_register_treeiter_set_value_func
-    rbgtk_tree_row_reference_get_type DATA
-    gtk_text_appearance_get_type DATA
+    gtk_text_appearance_get_type
     rbgtk_dialog_add_buttons_internal

Deleted: ruby-gnome2/trunk/gtk/ext/gtk2/makeinits.rb
===================================================================
--- ruby-gnome2/trunk/gtk/src/makeinits.rb	2010-09-22 14:59:58 UTC (rev 3810)
+++ ruby-gnome2/trunk/gtk/ext/gtk2/makeinits.rb	2010-09-22 16:05:44 UTC (rev 3812)
@@ -1,57 +0,0 @@
-except_targets = ["Init_gtk2()", "Init_gtk_gdk()", "Init_gtk_gtk()"]
-
-def print_data(array, type, defs, extern = false)
-  if array[type]
-    dependencies = {
-      "Init_gtk_gdk_gc()" => ["Init_gtk_gdk_draw()"],
-    }
-    extern_def = "extern void" if extern
-    print "##{defs} #{type}\n" if defs
-    sorted_array = array[type].dup
-    dependencies.each do |key, values|
-      key_index = sorted_array.index(key)
-      values.each do |value|
-        value_index = sorted_array.index(value)
-        next if value_index.nil?
-        sorted_array.delete(value)
-        sorted_array[key_index - 1, 0] = value
-        key_index = sorted_array.index(key)
-      end
-    end
-    sorted_array.each do |val|
-	   print "#{extern_def}   #{val};\n"
-    end
-    print "#endif\n" if defs
-  end
-end
-
-inits = Hash.new
-
-while gets
-  if ~ /^(Init_.*\(\))(.*)/
-	init = $1
-	unless except_targets.include?(init)
-	  flag = $2
-	  if flag.size > 0
-		if flag =~ /\/\*\s*(\w*)\s*\*\//
-		  inits[$1] = Array.new unless inits[$1]
-		  inits[$1] << init
-		end
-	  else
-		inits[""] = Array.new unless inits[""]
-		inits[""] << init
-	  end
-	end
-  end
-end
-
-print_data(inits, "", nil, true)
-print_data(inits, "GTK_DISABLE_DEPRECATED", "ifndef", true)
-print_data(inits, "GTK_ENABLE_BROKEN", "ifdef", true)
-
-print "void Init_gtk_inits()\n"
-print "{\n"
-print_data(inits, "", nil)
-print_data(inits, "GTK_DISABLE_DEPRECATED", "ifndef")
-print_data(inits, "GTK_ENABLE_BROKEN", "ifdef")
-print "}\n"

Deleted: ruby-gnome2/trunk/gtk/ext/gtk2/makekeysyms.rb
===================================================================
--- ruby-gnome2/trunk/gtk/src/makekeysyms.rb	2010-09-22 14:59:58 UTC (rev 3810)
+++ ruby-gnome2/trunk/gtk/ext/gtk2/makekeysyms.rb	2010-09-22 16:05:44 UTC (rev 3812)
@@ -1,5 +0,0 @@
-while gets
-  if ~ /^#define\s+(GDK_\w+)\s+\d+/
-    print %{rb_define_const(mGdkKeyval, "#$1", INT2FIX(#$1));\n}
-  end
-end

Modified: ruby-gnome2/trunk/gtk/extconf.rb
===================================================================
--- ruby-gnome2/trunk/gtk/extconf.rb	2010-09-22 16:03:44 UTC (rev 3811)
+++ ruby-gnome2/trunk/gtk/extconf.rb	2010-09-22 16:05:44 UTC (rev 3812)
@@ -1,91 +1,48 @@
-=begin
-extconf.rb for Ruby/GTK extention library
-=end
+#!/usr/bin/env ruby
 
-PACKAGE_NAME = "gtk2"
-PKG_CONFIG_ID = "gtk+-2.0"
+require 'pathname'
+require 'mkmf'
+require 'rbconfig'
+require 'fileutils'
 
-TOPDIR = File.expand_path(File.dirname(__FILE__) + '/..')
-MKMF_GNOME2_DIR = TOPDIR + '/glib/src/lib'
-SRCDIR = TOPDIR + '/gtk/src'
+package = "gtk2"
 
-$LOAD_PATH.unshift MKMF_GNOME2_DIR
+base_dir = Pathname(__FILE__).dirname.expand_path
+ext_dir = base_dir + "ext" + package
+mkmf_gnome2_dir = base_dir + 'lib'
 
-require 'mkmf-gnome2'
+ruby = File.join(RbConfig::CONFIG['bindir'],
+                 RbConfig::CONFIG['ruby_install_name'] +
+                 RbConfig::CONFIG["EXEEXT"])
 
-#
-# detect GTK+ configurations
-#
-
-PKGConfig.have_package('gthread-2.0')
-PKGConfig.have_package(PKG_CONFIG_ID) or exit 1
-setup_win32(PACKAGE_NAME)
-
-have_header("st.h")
-have_header("ruby/st.h")
-
-STDOUT.print("checking for target... ")
-STDOUT.flush
-target = PKGConfig.variable(PKG_CONFIG_ID, "target")
-$defs << "-DRUBY_GTK2_TARGET=\\\"#{target}\\\""
-STDOUT.print(target, "\n")
-
-#
-# detect location of GDK include files
-#
-gdkincl = nil
-tmpincl = $CFLAGS.gsub(/-D\w+/, '').split(/-I/) + ['/usr/include']
-tmpincl.each do |i|
-  i.strip!
-  
-  if FileTest.exist?(i + "/gdk/gdkkeysyms.h")
-    gdkincl = i + "/gdk"
-    break
-  end
+Dir.chdir(ext_dir.to_s) do
+  system(ruby, "extconf.rb", *ARGV) || exit(false)
 end
-raise "can't find gdkkeysyms.h" if gdkincl.nil?
 
-gtk_header = "gtk/gtk.h"
-have_func('gtk_plug_get_type', gtk_header)
-have_func('gtk_socket_get_type', gtk_header)
-have_func('pango_render_part_get_type', gtk_header)
-have_header('gtk/gtkfilesystem.h') do |src|
-  "#define GTK_FILE_SYSTEM_ENABLE_UNSUPPORTED\n#{src}"
-end
+create_makefile(package)
+FileUtils.mv("Makefile", "Makefile.lib")
 
-xlib_header = "X11/Xlib.h"
-if target == "x11" and have_header('X11/Xlib.h') and have_library("X11")
-  have_func("XReadBitmapFileData", xlib_header)
-  have_func("XGetErrorText", xlib_header)
-end
+File.open("Makefile", "w") do |makefile|
+  makefile.puts(<<-EOM)
+all:
+	(cd ext/#{package} && $(MAKE))
+	$(MAKE) -f Makefile.lib
 
-if PKGConfig.have_package('gtk+-unix-print-2.0')
-  $defs.push("-DHAVE_GTK_UNIX_PRINT")
-end
+install:
+	(cd ext/#{package} && $(MAKE) install)
+	$(MAKE) -f Makefile.lib install
 
-have_func("rb_errinfo")
+site-install:
+	(cd ext/#{package} && $(MAKE) site-install)
+	$(MAKE) -f Makefile.lib site-install
 
-check_cairo
+clean:
+	(cd ext/#{package} && $(MAKE) clean)
+	$(MAKE) -f Makefile.lib clean
 
-add_depend_package("glib2", "glib/src", TOPDIR)
-add_depend_package("pango", "pango/src", TOPDIR)
-
-#
-# create Makefiles
-#
-
-add_distcleanfile("rbgdkkeysyms.h")
-add_distcleanfile("rbgtkinits.c")
-
-$defs.delete("-DRUBY_GTK2_COMPILATION")
-
-create_pkg_config_file("Ruby/GTK2", PKG_CONFIG_ID, ruby_gnome2_version)
-
-create_makefile_at_srcdir(PACKAGE_NAME, SRCDIR, "-DRUBY_GTK2_COMPILATION") {
-  File.delete("rbgtkinits.c") if FileTest.exist?("rbgtkinits.c")
-  SRCDIR_QUOTED = SRCDIR.gsub(' ', '\ ')
-  system("#{$ruby} #{SRCDIR_QUOTED}/makeinits.rb #{SRCDIR_QUOTED}/*.c > rbgtkinits.c") or raise "failed to make GTK inits"
-  system("#{$ruby} #{SRCDIR_QUOTED}/makekeysyms.rb #{gdkincl}/gdkkeysyms.h > rbgdkkeysyms.h") or raise "failed to make GDK Keysyms"
-}
-
-create_top_makefile(["src"])
+distclean:
+	(cd ext/#{package} && $(MAKE) distclean)
+	$(MAKE) -f Makefile.lib distclean
+	@rm -f Makefile.lib
+EOM
+end


Property changes on: ruby-gnome2/trunk/gtk/lib
___________________________________________________________________
Added: svn:ignore
   + 1.8
1.9



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3815
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3815&view=rev
Author:   ktou
Date:     2010-09-22 16:19:11 +0000 (Wed, 22 Sep 2010)

Log Message:
-----------
* Rakefile (#guess_version): add missing atk dependency.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/Rakefile

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2010-09-22 16:18:27 UTC (rev 3814)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2010-09-22 16:19:11 UTC (rev 3815)
@@ -1,5 +1,7 @@
 2010-09-23  Kouhei Sutou  <kou@...>
 
+	* Rakefile (#guess_version): add missing atk dependency.
+
 	* ./: make buildable with rake-compiler.
 
 2010-09-22  Kouhei Sutou  <kou@...>

Modified: ruby-gnome2/trunk/gtk/Rakefile
===================================================================
--- ruby-gnome2/trunk/gtk/Rakefile	2010-09-22 16:18:27 UTC (rev 3814)
+++ ruby-gnome2/trunk/gtk/Rakefile	2010-09-22 16:19:11 UTC (rev 3815)
@@ -41,6 +41,7 @@
   s.add_dependency("cairo", ">= 1.10.0")
   s.add_dependency("glib2", "= #{version}")
   s.add_dependency("pango", "= #{version}")
+  s.add_dependency("atk", "= #{version}")
   s.extensions = FileList["ext/#{package_name}/extconf.rb"]
   s.require_paths = ["lib"]
   s.files = FileList["ChangeLog", "README", "Rakefile", "extconf.rb",


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3853
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3853&view=rev
Author:   ktou
Date:     2010-09-23 05:34:08 +0000 (Thu, 23 Sep 2010)

Log Message:
-----------
* test/run-test.rb: fix extension library path.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/test/run-test.rb

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2010-09-23 05:25:22 UTC (rev 3852)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2010-09-23 05:34:08 UTC (rev 3853)
@@ -1,5 +1,7 @@
 2010-09-23  Kouhei Sutou  <kou@...>
 
+	* test/run-test.rb: fix extension library path.
+
 	* Rakefile (#guess_version): add missing atk dependency.
 
 	* ./: make buildable with rake-compiler.

Modified: ruby-gnome2/trunk/gtk/test/run-test.rb
===================================================================
--- ruby-gnome2/trunk/gtk/test/run-test.rb	2010-09-23 05:25:22 UTC (rev 3852)
+++ ruby-gnome2/trunk/gtk/test/run-test.rb	2010-09-23 05:34:08 UTC (rev 3853)
@@ -9,16 +9,18 @@
 gdk_pixbuf_base = File.join(ruby_gnome2_base, "gdkpixbuf")
 gtk_base = File.join(ruby_gnome2_base, "gtk")
 
-$LOAD_PATH.unshift(glib_base)
-require 'test/glib-test-init'
+$LOAD_PATH.unshift(File.join(glib_base, "test"))
+require 'glib-test-init'
 
-[glib_base, atk_base, pango_base, gdk_pixbuf_base, gtk_base].each do |target|
+[[glib_base, "glib2"],
+ [atk_base, "atk"],
+ [pango_base, "pangp"],
+ [gdk_pixbuf_base, "gdk_pixbuf2"],
+ [gtk_base, "gtk2"]].each do |target, module_name|
   if system("which make > /dev/null")
-    `make -C #{target.dump} > /dev/null` or exit(1)
+    `make -C #{target.dump} > /dev/null` or exit(false)
   end
-  $LOAD_PATH.unshift(File.join(target, "src"))
-  $LOAD_PATH.unshift(File.join(target, "src", "lib"))
-  $LOAD_PATH.unshift(File.join(target))
+  $LOAD_PATH.unshift(File.join(target, "ext", module_name))
   $LOAD_PATH.unshift(File.join(target, "lib"))
 end
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3859
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3859&view=rev
Author:   ktou
Date:     2010-09-23 06:40:43 +0000 (Thu, 23 Sep 2010)

Log Message:
-----------
* test/run-test.rb: fix require order.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/test/run-test.rb

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2010-09-23 06:39:36 UTC (rev 3858)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2010-09-23 06:40:43 UTC (rev 3859)
@@ -1,5 +1,10 @@
 2010-09-23  Kouhei Sutou  <kou@...>
 
+	* test/test_gtk_builder.rb (TestGtkBuilder#test_objects): use
+	builder_name instead of name.
+
+	* test/run-test.rb: fix require order.
+
 	* test/run-test.rb: fix extension library path.
 
 	* Rakefile (#guess_version): add missing atk dependency.

Modified: ruby-gnome2/trunk/gtk/test/run-test.rb
===================================================================
--- ruby-gnome2/trunk/gtk/test/run-test.rb	2010-09-23 06:39:36 UTC (rev 3858)
+++ ruby-gnome2/trunk/gtk/test/run-test.rb	2010-09-23 06:40:43 UTC (rev 3859)
@@ -9,9 +9,6 @@
 gdk_pixbuf_base = File.join(ruby_gnome2_base, "gdkpixbuf")
 gtk_base = File.join(ruby_gnome2_base, "gtk")
 
-$LOAD_PATH.unshift(File.join(glib_base, "test"))
-require 'glib-test-init'
-
 [[glib_base, "glib2"],
  [atk_base, "atk"],
  [pango_base, "pangp"],
@@ -24,6 +21,9 @@
   $LOAD_PATH.unshift(File.join(target, "lib"))
 end
 
+$LOAD_PATH.unshift(File.join(glib_base, "test"))
+require 'glib-test-init'
+
 $LOAD_PATH.unshift(File.join(gtk_base, "test"))
 require 'gtk-test-utils'
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3867
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3867&view=rev
Author:   ktou
Date:     2010-09-23 07:01:46 +0000 (Thu, 23 Sep 2010)

Log Message:
-----------
* lib/gtk2/base.rb: support bundled Windows DLL.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/lib/gtk2/base.rb

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2010-09-23 06:59:21 UTC (rev 3866)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2010-09-23 07:01:46 UTC (rev 3867)
@@ -1,5 +1,7 @@
 2010-09-23  Kouhei Sutou  <kou@...>
 
+	* lib/gtk2/base.rb: support bundled Windows DLL.
+
 	* test/test_gtk_builder.rb (TestGtkBuilder#test_objects): use
 	builder_name instead of name.
 

Modified: ruby-gnome2/trunk/gtk/lib/gtk2/base.rb
===================================================================
--- ruby-gnome2/trunk/gtk/lib/gtk2/base.rb	2010-09-23 06:59:21 UTC (rev 3866)
+++ ruby-gnome2/trunk/gtk/lib/gtk2/base.rb	2010-09-23 07:01:46 UTC (rev 3867)
@@ -12,7 +12,18 @@
 require 'glib2'
 require 'atk'
 require 'pango'
-require 'gtk2.so'
+
+base_dir = Pathname.new(__FILE__).dirname.dirname.dirname.expand_path
+vendor_dir = base_dir + "vendor" + "local"
+vendor_bin_dir = vendor_dir + "bin"
+GLib.prepend_environment_path(vendor_bin_dir)
+begin
+  major, minor, micro, = RUBY_VERSION.split(/\./)
+  require "#{major}.#{minor}/gtk2.so"
+rescue LoadError
+  require "gtk2.so"
+end
+
 require 'gdk_pixbuf2'
 
 module Gdk


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3877
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3877&view=rev
Author:   ktou
Date:     2010-09-23 08:28:28 +0000 (Thu, 23 Sep 2010)

Log Message:
-----------
* Rakefile: don't add .zip into gem.

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/Rakefile

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2010-09-23 08:28:08 UTC (rev 3876)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2010-09-23 08:28:28 UTC (rev 3877)
@@ -1,5 +1,7 @@
 2010-09-23  Kouhei Sutou  <kou@...>
 
+	* Rakefile: don't add .zip into gem.
+
 	* lib/gtk2/base.rb: support bundled Windows DLL.
 
 	* test/test_gtk_builder.rb (TestGtkBuilder#test_objects): use

Modified: ruby-gnome2/trunk/gtk/Rakefile
===================================================================
--- ruby-gnome2/trunk/gtk/Rakefile	2010-09-23 08:28:08 UTC (rev 3876)
+++ ruby-gnome2/trunk/gtk/Rakefile	2010-09-23 08:28:28 UTC (rev 3877)
@@ -58,6 +58,7 @@
       win32_dir = File.join("vendor", "local")
       win32_files = []
       Find.find(win32_dir) do |file|
+        next if /\.zip\z/ =~ file
         win32_files << file
       end
       spec.files += win32_files


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3892
          http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=3892&view=rev
Author:   ktou
Date:     2010-09-23 22:22:41 +0000 (Thu, 23 Sep 2010)

Log Message:
-----------
* Rakefile: add missing gtk2/base.rb.
  Reported by S.Kitagawa. Thanks!!!

Modified Paths:
--------------
    ruby-gnome2/trunk/gtk/ChangeLog
    ruby-gnome2/trunk/gtk/Rakefile

Modified: ruby-gnome2/trunk/gtk/ChangeLog
===================================================================
--- ruby-gnome2/trunk/gtk/ChangeLog	2010-09-23 14:35:55 UTC (rev 3891)
+++ ruby-gnome2/trunk/gtk/ChangeLog	2010-09-23 22:22:41 UTC (rev 3892)
@@ -1,3 +1,8 @@
+2010-09-24  Kouhei Sutou  <kou@...>
+
+	* Rakefile: add missing gtk2/base.rb.
+	Reported by S.Kitagawa. Thanks!!!
+
 2010-09-23  Kouhei Sutou  <kou@...>
 
 	* Rakefile: don't add .zip into gem.

Modified: ruby-gnome2/trunk/gtk/Rakefile
===================================================================
--- ruby-gnome2/trunk/gtk/Rakefile	2010-09-23 14:35:55 UTC (rev 3891)
+++ ruby-gnome2/trunk/gtk/Rakefile	2010-09-23 22:22:41 UTC (rev 3892)
@@ -45,7 +45,7 @@
   s.extensions = FileList["ext/#{package_name}/extconf.rb"]
   s.require_paths = ["lib"]
   s.files = FileList["ChangeLog", "README", "Rakefile", "extconf.rb",
-                     "lib/*.rb", "{ext,sample,test}/**/*"]
+                     "lib/**/*.rb", "{ext,sample,test}/**/*"]
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.