gtk3 1.2.0-x86-mingw32 → 1.2.1-x86-mingw32

data/ext/gtk3/{rbgtktogglebutton.c → rbgtk-toggle-button.c}

@@ -75,7 +75,7 @@ rg_toggled(VALUE self)
     return self;
 }
 
-void 
+void
 Init_gtk_toggle_button(VALUE mGtk)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_TOGGLE_BUTTON, "ToggleButton", mGtk);

data/ext/gtk3/{rbgtktoggletoolbutton.c → rbgtk-toggle-tool-button.c}

@@ -52,7 +52,7 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-void 
+void
 Init_gtk_toggletoolbutton(VALUE mGtk)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_TOGGLE_TOOL_BUTTON, "ToggleToolButton", mGtk);

data/ext/gtk3/{rbgtktoolbutton.c → rbgtk-tool-button.c}

@@ -55,7 +55,7 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-void 
+void
 Init_gtk_toolbutton(VALUE mGtk)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_TOOL_BUTTON, "ToolButton", mGtk);

data/ext/gtk3/{rbgtktoolitem.c → rbgtk-tool-item.c}

@@ -172,7 +172,7 @@ rg_toolbar_reconfigured(VALUE self)
     return self;
 }
 
-void 
+void
 Init_gtk_toolitem(VALUE mGtk)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_TOOL_ITEM, "ToolItem", mGtk);

data/ext/gtk3/{rbgdkdisplay.c → rbgtk-tooltip-gdk-display.c}

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -30,8 +30,8 @@ rg_trigger_tooltip_query(VALUE self)
     return self;
 }
 
-void 
-Init_gdk_display(void)
+void
+Init_gtk_tooltip_gdk_display(void)
 {
     VALUE RG_TARGET_NAMESPACE = GTYPE2CLASS(GDK_TYPE_DISPLAY);
 

data/ext/gtk3/{rbgtktooltip.c → rbgtk-tooltip.c}

@@ -89,7 +89,7 @@ rg_set_custom(VALUE self, VALUE custom_widget)
     return self;
 }
 
-void 
+void
 Init_gtk_tooltip(VALUE mGtk)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_TOOLTIP, "Tooltip", mGtk);

data/ext/gtk3/{rbgtktreeiter.c → rbgtk-tree-iter.c}

@@ -235,7 +235,7 @@ rg_to_str(VALUE self)
     return result;
 }
 
-void 
+void
 Init_gtk_treeiter(VALUE mGtk)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_TREE_ITER, "TreeIter", mGtk);

data/ext/gtk3/{rbgtktreemodel.c → rbgtk-tree-model.c}

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002,2003 Masao Mutoh
  *
  *  This library is free software; you can redistribute it and/or
@@ -54,7 +54,6 @@ rg_iter_first(VALUE self)
 
     if (ret) {
         val = GTKTREEITER2RVAL(&iter);
-        G_CHILD_ADD(self, val);
     }
 
     return val;
@@ -69,17 +68,16 @@ rg_get_iter(VALUE self, VALUE path)
     GtkTreeModel* model = _SELF(self);
 
     if (TYPE(path) == T_STRING){
-        ret = gtk_tree_model_get_iter_from_string(model, &iter, 
+        ret = gtk_tree_model_get_iter_from_string(model, &iter,
                                                   RVAL2CSTR(path));
     } else {
-        ret = gtk_tree_model_get_iter(model, &iter, 
+        ret = gtk_tree_model_get_iter(model, &iter,
                                       RVAL2GTKTREEPATH(path));
-    } 
+    }
     iter.user_data3 = model;
 
     if (ret) {
         val = GTKTREEITER2RVAL(&iter);
-        G_CHILD_ADD(self, val);
     }
 
     return val;
@@ -94,7 +92,7 @@ rg_get_value(VALUE self, VALUE iter, VALUE column)
     if (G_VALUE_TYPE(&value) != G_TYPE_INVALID){
         ret = GVAL2RVAL(&value);
         g_value_unset(&value);
-    } 
+    }
     return ret;
 }
 
@@ -112,8 +110,8 @@ treemodel_foreach_func(GtkTreeModel *model,
 static VALUE
 rg_each(VALUE self)
 {
-    gtk_tree_model_foreach(_SELF(self), 
-                           (GtkTreeModelForeachFunc)treemodel_foreach_func, 
+    gtk_tree_model_foreach(_SELF(self),
+                           (GtkTreeModelForeachFunc)treemodel_foreach_func,
                            (gpointer)NULL);
     return self;
 }
@@ -208,7 +206,7 @@ signal_rows_reordered_func(G_GNUC_UNUSED guint num, const GValue *values)
     return rb_ary_new3(4, GOBJ2RVAL(model), GTKTREEPATH2RVAL(path), GTKTREEITER2RVAL(iter), orders);
 }
 
-void 
+void
 Init_gtk_treemodel(VALUE mGtk)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_INTERFACE(GTK_TYPE_TREE_MODEL, "TreeModel", mGtk);

data/ext/gtk3/{rbgtktreemodelfilter.c → rbgtk-tree-modelfilter.c}

@@ -175,7 +175,7 @@ rg_clear_cache(VALUE self)
     return self;
 }
 
-void 
+void
 Init_gtk_treemodelfilter(VALUE mGtk)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_TREE_MODEL_FILTER, "TreeModelFilter", mGtk);

data/ext/gtk3/{rbgtktreemodelsort.c → rbgtk-tree-modelsort.c}

@@ -93,7 +93,7 @@ rg_iter_is_valid_p(VALUE self, VALUE iter)
     return CBOOL2RVAL(gtk_tree_model_sort_iter_is_valid(_SELF(self), RVAL2GTKTREEITER(iter)));
 }
 
-void 
+void
 Init_gtk_tmodelsort(VALUE mGtk)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_TREE_MODEL_SORT, "TreeModelSort", mGtk);

data/ext/gtk3/{rbgtktreepath.c → rbgtk-tree-path.c}

@@ -166,7 +166,7 @@ rg_descendant_p(VALUE self, VALUE ancestor)
     return CBOOL2RVAL(gtk_tree_path_is_descendant(_SELF(self), _SELF(ancestor)));
 }
 
-void 
+void
 Init_gtk_treepath(VALUE mGtk)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_TREE_PATH, "TreePath", mGtk);

data/ext/gtk3/{rbgtktreerowreference.c → rbgtk-tree-rowreference.c}

@@ -120,7 +120,7 @@ rg_s_reordered(VALUE self, VALUE rbproxy, VALUE rbpath, VALUE rbiter, VALUE rbne
     return self;
 }
 
-void 
+void
 Init_gtk_treerowreference(VALUE mGtk)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_TREE_ROW_REFERENCE, "TreeRowReference", mGtk);

data/ext/gtk3/{rbgtktreeview.c → rbgtk-tree-view.c}

@@ -645,7 +645,7 @@ rg_set_search_position_func(VALUE self)
     return self;
 }
 
-void 
+void
 Init_gtk_treeview(VALUE mGtk)
 {
     rb_mGtk = mGtk;

data/ext/gtk3/{rbgtkviewport.c → rbgtk-viewport.c}

@@ -36,7 +36,7 @@ rg_initialize(VALUE self, VALUE hadj, VALUE vadj)
     return Qnil;
 }
 
-void 
+void
 Init_gtk_viewport(VALUE mGtk)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_VIEWPORT, "Viewport", mGtk);

data/ext/gtk3/{rbgtkvolumebutton.c → rbgtk-volume-button.c}

@@ -33,7 +33,7 @@ rg_initialize(VALUE self)
     return Qnil;
 }
 
-void 
+void
 Init_gtk_volumebutton(VALUE mGtk)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_VOLUME_BUTTON, "VolumeButton", mGtk);

data/ext/gtk3/{rbgtkwidget.c → rbgtk-widget.c}

@@ -1382,7 +1382,7 @@ rg_drag_source_add_uri_targets(VALUE self)
     return self;
 }
 
-void 
+void
 Init_gtk_widget(VALUE mGtk)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_WIDGET, "Widget", mGtk);

data/ext/gtk3/{rbgtkwindowgroup.c → rbgtk-window-group.c}

@@ -67,7 +67,7 @@ rg_windows(VALUE self)
     return GOBJGLIST2RVAL(gtk_window_group_list_windows(_SELF(self)));
 }
 
-void 
+void
 Init_gtk_windowgroup(VALUE mGtk)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_WINDOW_GROUP, "WindowGroup", mGtk);

data/ext/gtk3/{rbgtkwindow.c → rbgtk-window.c}

@@ -485,7 +485,7 @@ rg_set_default_geometry(VALUE self, VALUE width, VALUE height)
     return self;
 }
 
-void 
+void
 Init_gtk_window(VALUE mGtk)
 {
     VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_WINDOW, "Window", mGtk);

data/ext/gtk3/rbgtk.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002-2006 Ruby-GNOME2 Project Team
  *  Copyright (C) 1998-2001 Yukihiro Matsumoto,
  *                          Daisuke Kanda,
@@ -99,36 +99,6 @@ rg_s_events_pending_p(G_GNUC_UNUSED VALUE self)
    return CBOOL2RVAL(gtk_events_pending());
 }
 
-static VALUE
-gtk_m_function_body(VALUE data)
-{
-    callback_info_t *info = (callback_info_t *)data;
-    VALUE ret = rb_funcall(info->callback, id_call, 0);
-
-    if (info->key && !ret)
-        G_REMOVE_RELATIVE(RG_TARGET_NAMESPACE, info->key, UINT2NUM(info->id));
-    return ret;
-}
-
-static gboolean
-gtk_m_function(gpointer data)
-{ 
-    return RVAL2CBOOL(G_PROTECT_CALLBACK(gtk_m_function_body, data));
-}
-
-static VALUE
-gtk_m_function2_body(gpointer proc)
-{
-    rb_funcall((VALUE)proc, id_call, 0);
-    return Qnil;
-}
-
-static void
-gtk_m_function2(gpointer proc)
-{
-    G_PROTECT_CALLBACK(gtk_m_function2_body, proc);
-}
-
 /* deprecated
 static VALUE
 rg_s_set_locale(G_GNUC_UNUSED VALUE self)
@@ -378,7 +348,7 @@ rg_s_check_version_p(G_GNUC_UNUSED VALUE self, VALUE major, VALUE minor, VALUE m
     return CBOOL2RVAL(ret == NULL);
 }
 
-void 
+void
 Init_gtk(void)
 {
     id_call = rb_intern("call");
@@ -422,6 +392,11 @@ Init_gtk(void)
 
     rb_define_const(RG_TARGET_NAMESPACE, "PRIORITY_RESIZE", INT2FIX(GTK_PRIORITY_RESIZE));
 
+    Init_gtk_gdk_event();
+    Init_gtk_drag_gdk_drag_context();
+    Init_gtk_style_context_gdk_screen();
+    Init_gtk_tooltip_gdk_display();
+
     Init_gtk_aboutdialog(RG_TARGET_NAMESPACE);
     Init_gtk_accelerator(RG_TARGET_NAMESPACE);
     Init_gtk_accel_group(RG_TARGET_NAMESPACE);

data/ext/gtk3/rbgtk3private.h

@@ -72,10 +72,11 @@ G_GNUC_INTERNAL GtkTargetEntry *rbgtk_rval2gtktargetentries(VALUE value, long *n
 #define RVAL2GTKTARGETENTRIES_ACCEPT_NIL(value, n) rbgtk_rval2gtktargetentries_accept_nil(value, n)
 G_GNUC_INTERNAL GtkTargetEntry *rbgtk_rval2gtktargetentries_accept_nil(VALUE value, long *n);
 
-G_GNUC_INTERNAL void Init_gdk_display(void);
-G_GNUC_INTERNAL void Init_gdk_dragcontext(void);
-G_GNUC_INTERNAL void Init_gdk_event(void);
-G_GNUC_INTERNAL void Init_gdk_screen(void);
+G_GNUC_INTERNAL void Init_gtk_gdk_event(void);
+G_GNUC_INTERNAL void Init_gtk_drag_gdk_drag_context(void);
+G_GNUC_INTERNAL void Init_gtk_style_context_gdk_screen(void);
+G_GNUC_INTERNAL void Init_gtk_tooltip_gdk_display(void);
+
 G_GNUC_INTERNAL void Init_gtk(void);
 G_GNUC_INTERNAL void Init_gtk_aboutdialog(VALUE mGtk);
 G_GNUC_INTERNAL void Init_gtk_accelerator(VALUE mGtk);

data/test/test_gtk_list_store.rb

@@ -1,3 +1,20 @@
+# Copyright (C) 2013  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301  USA
+
 class TestGtkListStore < Test::Unit::TestCase
   include GtkTestUtils
 
@@ -62,4 +79,30 @@ class TestGtkListStore < Test::Unit::TestCase
     end
     assert_equal([2, 'she'], [iter[ID], iter[NAME]])
   end
+
+  def test_iter_gc
+    n_iterators = count_objects(Gtk::TreeIter)
+    50.times do |i|
+      iter = @store.append
+      iter[ID] = i
+      iter[NAME] = i.to_s
+    end
+    100.times do
+      @store.iter_first
+    end
+    iter = @store.iter_first
+    while @store.remove(iter); end
+    iter = nil
+    assert_equal(0, @store.to_enum(:each).to_a.size)
+    GC.start
+    assert_equal(n_iterators, count_objects(Gtk::TreeIter))
+  end
+
+  private
+  def count_objects(klass)
+    n_objects = ObjectSpace.each_object(Gtk::TreeIter) do
+      # do nothing
+    end
+    n_objects
+  end
 end