gtk3 3.0.8-x86-mingw32 → 3.0.9-x86-mingw32

data/sample/tutorial/README.md

@@ -16,7 +16,7 @@ Here is the most basic example that illustrate the principles of widget hierarch
 require "gtk3"
 
 window = Gtk::Window.new("First example")
-window.set_request_size(400, 400)
+window.set_size_request(400, 400)
 window.set_border_width(10)
 
 button = Gtk::Button.new(:label => "Say hello")
@@ -157,7 +157,7 @@ app.signal_connect "activate" do |application|
   window.set_title("Window")
   window.set_border_width(10)
 
-  # Here we construct the container that is going pack our buttons 
+  # Here we construct the container that is going pack our buttons
   grid = Gtk::Grid.new
 
   # Pack the container in the window
@@ -281,7 +281,7 @@ Here is the "builder.ui" file that describes the interface:
 The usage of the `Gtk::Builder` is really easy, we just create an instance from the
 file "builder.ui" with `Gtk::Builder.new(:file => builder_file)`. Then you can access every widget or part of the interface thanks to its name: `window = builder.get_object("window")`. Note that `Gtk::Builder` can also be used to construct objects that are not widgets, such as tree models, adjustments, etc.
 
-The XML definition of the interface can be loaded from a file, a string or a path in a gresource binary. More informations related to this XML definition can be found [here](https://developer.gnome.org/gtk3/stable/GtkBuilder.html#BUILDER-UI). Those files are generally built with [glade](https://glade.gnome.org/). 
+The XML definition of the interface can be loaded from a file, a string or a path in a gresource binary. More informations related to this XML definition can be found [here](https://developer.gnome.org/gtk3/stable/GtkBuilder.html#BUILDER-UI). Those files are generally built with [glade](https://glade.gnome.org/).
 
 
 ## Building applications
@@ -296,7 +296,7 @@ require "gtk3"
 class ExampleAppWindow < Gtk::ApplicationWindow
 
   def open(file)
-    
+
   end
 end
 
@@ -318,7 +318,7 @@ class ExampleApp < Gtk::Application
       end
 
       files.each { |file| win.open(file) }
-        
+
       win.present
     end
   end
@@ -393,7 +393,7 @@ Here is the "window.ui" file that contains the template of the window:
 ```
 Unlike regular interface descriptions, in template XML descriptions, a`<template>` tag is expected as a direct child of the toplevel `<interface>` tag. Yhe `<template>` tag must specify the "*class*" attribute which must be the class name of the widget. Optionally, the "*parent*" attribute may be specified to indicate the direct parent class (superclass).
 
-More informations can be found in the part [building composite widgets from template XML](https://developer.gnome.org/gtk3/stable/GtkWidget.html#GtkWidget.description) of the `Gtk::Widget` documentation. 
+More informations can be found in the part [building composite widgets from template XML](https://developer.gnome.org/gtk3/stable/GtkWidget.html#GtkWidget.description) of the `Gtk::Widget` documentation.
 
 #### Link a template to a custom class widget.
 
@@ -411,7 +411,7 @@ class ExampleAppWindow < Gtk::ApplicationWindow
   end
 
   def open(file)
-    
+
   end
 end
 ```
@@ -482,7 +482,7 @@ This new way to access the stack widget is used in the following code. We have p
 ```ruby
 class ExampleAppWindow < Gtk::ApplicationWindow
   def open(file)
-    
+
   end
 end
 
@@ -500,7 +500,7 @@ class ExampleApp < Gtk::Application
       end
 
       files.each { |file| win.open(file) }
-        
+
       win.present
     end
   end
@@ -526,14 +526,14 @@ def open(file)
   view.buffer.text = stream.read
 end
 ```
-Each file is opened and loaded in a `Gtk::TextView` with 
+Each file is opened and loaded in a `Gtk::TextView` with
 
 ```ruby
   stream = file.read
   view.buffer.text = stream.read
 ```
 
-We get the basename, of the file in argument, that will be used as title for each tab of the stack widget: 
+We get the basename, of the file in argument, that will be used as title for each tab of the stack widget:
 
 ```
 stack.add_titled(scrolled, basename, basename)
@@ -611,7 +611,7 @@ application.add_action(action)
 
 #### Add accelerators for action.
 
-An accelerator is just a keys combination that acts as a shortcut for an action. 
+An accelerator is just a keys combination that acts as a shortcut for an action.
 
 ```ruby
 quit_accels = ["<Ctrl>Q"]
@@ -655,7 +655,7 @@ We are going to use `Gio::Settings` to store our preferences. `Gio::Settings` re
 </schemalist>
 ```
 
-Before we can make use of this schema in our application, we need to compile it into the binary form that `Gio::Settings` expects. 
+Before we can make use of this schema in our application, we need to compile it into the binary form that `Gio::Settings` expects.
 
 ```ruby
 system("glib-compile-schemas", data_path)
@@ -670,12 +670,12 @@ Gio::SettingsSchemaSource.new(data_path,
                               false)
 
 ```
-This is the corresponding method to the function [g_settings_schema_source_new_from_directory](https://developer.gnome.org/gio/stable/gio-GSettingsSchema-GSettingsSchemaSource.html#g-settings-schema-source-new-from-directory). 
+This is the corresponding method to the function [g_settings_schema_source_new_from_directory](https://developer.gnome.org/gio/stable/gio-GSettingsSchema-GSettingsSchemaSource.html#g-settings-schema-source-new-from-directory).
 
 As an alternative, our schema  can just be loaded by using the `GSETTINGS_SCHEMA_DIR` environment variable.
 
 ```ruby
-ENV["GSETTINGS_SCHEMA_DIR"] = data_path 
+ENV["GSETTINGS_SCHEMA_DIR"] = data_path
 ```
 More informations on the use of gschemas can be found [here](https://developer.gnome.org/gio/stable/gio-GSettingsSchema-GSettingsSchemaSource.html)
 
@@ -842,11 +842,11 @@ def open(file)
   stream = file.read
   buffer = view.buffer
   buffer.text = stream.read
-  tag = buffer.create_tag() 
+  tag = buffer.create_tag()
   @settings.bind("font", tag, "font", Gio::SettingsBindFlags::DEFAULT)
   buffer.apply_tag(tag, buffer.start_iter, buffer.end_iter)
 end
-``` 
+```
 
 ### Adding a search bar
 https://developer.gnome.org/gtk3/stable/ch01s04.html#id-1.2.3.12.10
@@ -1297,4 +1297,4 @@ Our application already uses a `Gtk::HeaderBar`, but so far it still gets a 'nor
 </interface>
 ```
 
-A small extra bonus of using a header bar is that we get a fallback application menu for free. 
+A small extra bonus of using a header bar is that we get a fallback application menu for free.

data/test/test-gtk-clipboard.rb

@@ -66,7 +66,7 @@ class TestGtkClipboard < Test::Unit::TestCase
       received_image = image
       loop.quit
     end
-    image = Gdk::Pixbuf.new(fixture_path("gnome-logo-icon.png"))
+    image = GdkPixbuf::Pixbuf.new(:file => fixture_path("gnome-logo-icon.png"))
     @clipboard.image = image
     loop.run
 

data/test/test-gtk-combo-box.rb

@@ -27,7 +27,7 @@ class TestGtkComboBox < Test::Unit::TestCase
       end
 
       test ":model" do
-        model = Gtk::ListStore.new(Gdk::Pixbuf, String)
+        model = Gtk::ListStore.new(GdkPixbuf::Pixbuf, String)
         combo_box = Gtk::ComboBox.new(:entry => true, :model => model)
         assert do
           combo_box.has_entry?
@@ -55,7 +55,7 @@ class TestGtkComboBox < Test::Unit::TestCase
       end
 
       test ":model" do
-        model = Gtk::ListStore.new(Gdk::Pixbuf, String)
+        model = Gtk::ListStore.new(GdkPixbuf::Pixbuf, String)
         combo_box = Gtk::ComboBox.new(:model => model)
         assert do
           not combo_box.has_entry?

data/test/test-gtk-icon-view.rb

@@ -41,7 +41,7 @@ class TestGtkIconView < Test::Unit::TestCase
   class TestGetCellRect < self
     def setup
       only_gtk_version(3, 6, 0)
-      model = Gtk::ListStore.new(String, Gdk::Pixbuf)
+      model = Gtk::ListStore.new(String, GdkPixbuf::Pixbuf)
       iter = model.append
       model.set_values(iter, ["label", nil])
       @path = iter.path
@@ -53,7 +53,7 @@ class TestGtkIconView < Test::Unit::TestCase
     end
 
     def test_not_found
-      indices, _ = @path.indices
+      indices = @path.indices
       not_found_path = Gtk::TreePath.new
       not_found_path.append_index(indices.last + 1)
       assert_nil(@icon_view.get_cell_rect(not_found_path))

data/test/test-gtk-image.rb

@@ -40,13 +40,13 @@ class TestGtkImage < Test::Unit::TestCase
     end
 
     test "resource" do
+      only_gtk_version(3, 18, 0)
       resource = Gio::Resource.load(fixture_path("image.gresource"))
       Gio::Resources.register(resource)
       begin
         resource_path = "/org/ruby/gnome/gnome-logo-icon.png"
         image = Gtk::Image.new(:resource => resource_path,
                                :size => :dialog)
-        omit("GTK+ 3.16 doesn't support getting resource path. See GitHub#461.")
         assert_equal(resource_path,
                      image.resource)
       ensure

data/test/test-gtk-list-store.rb

@@ -194,20 +194,26 @@ class TestGtkListStore < Test::Unit::TestCase
     test "iter" do
       GC.start
       n_iterators = count_objects(Gtk::TreeIter)
-      50.times do |i|
+      n_items = 50
+      n_iterators_created = 100
+      n_iterators_for_remove = 1
+
+      n_items.times do |i|
         iter = @store.append
         iter[ID] = i
         iter[NAME] = i.to_s
       end
-      100.times do
+      n_iterators_created.times do
         @store.iter_first
       end
       iter = @store.iter_first
       while @store.remove(iter); end
       assert_equal(0, @store.to_enum(:each).to_a.size)
+
       GC.start
       assert do
-        count_objects(Gtk::TreeIter) <= n_iterators + 1
+        count_objects(Gtk::TreeIter) <
+          (n_iterators + n_items + n_iterators_created + n_iterators_for_remove)
       end
     end
 

data/test/test-gtk-text-view.rb

@@ -0,0 +1,64 @@
+# Copyright (C) 2016  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 TestGtkTextView < Test::Unit::TestCase
+  include GtkTestUtils
+
+  sub_test_case "instance methods" do
+    def setup
+      only_gtk_version(3, 14)
+      @text_buffer = Gtk::TextBuffer.new
+      @text_buffer.text = "Hello"
+      @text_view = Gtk::TextView.new(@text_buffer)
+    end
+
+    sub_test_case "#get_iter_at" do
+      test ":location" do
+        iter = @text_view.get_iter_at(:location => [0, 0])
+        assert_equal("H", iter.char)
+      end
+
+      test ":position" do
+        iter, trailing = @text_view.get_iter_at(:position => [0, 0])
+        assert_equal(["H", 0],
+                     [iter.char, trailing])
+      end
+    end
+
+    sub_test_case "#get_iter_at_location" do
+      test "found" do
+        iter = @text_view.get_iter_at_location(0, 0)
+        assert_equal("H", iter.char)
+      end
+
+      test "not found" do
+        assert_nil(@text_view.get_iter_at_location(100, 0))
+      end
+    end
+
+    sub_test_case "#get_iter_at_position" do
+      test "found" do
+        iter, trailing = @text_view.get_iter_at_position(0, 0)
+        assert_equal(["H", 0],
+                     [iter.char, trailing])
+      end
+
+      test "not found" do
+        assert_nil(@text_view.get_iter_at_position(100, 0))
+      end
+    end
+  end
+end

data/test/test-gtk-tree-path.rb

@@ -30,9 +30,7 @@ class TestGtkTreePath < Test::Unit::TestCase
   end
 
   def test_indices
-    indices, depth = tree_path("2").indices
-    assert_equal([[2], 1],
-                 [indices, depth])
+    assert_equal([2], tree_path("2").indices)
   end
 
   def test_down!

data/test/test-gtk-tree-view.rb

@@ -87,6 +87,67 @@ class TestGtkTreeView < Test::Unit::TestCase
                    normalized_data)
     end
 
+    sub_test_case "#expand_row" do
+      setup do
+        @parent = @store.append(nil)
+        @parent[0] = "parent"
+        @child = @store.append(@parent)
+        @child[0] = "child"
+        @grand_child = @store.append(@child)
+        @grand_child[0] = "grand child"
+      end
+
+      test "default" do
+        @view.expand_row(@parent.path)
+        assert do
+          @view.row_expanded?(@parent.path)
+        end
+        assert do
+          @view.row_expanded?(@child.path)
+        end
+      end
+
+      test "true" do
+        @view.expand_row(@parent.path, true)
+        assert do
+          @view.row_expanded?(@parent.path)
+        end
+        assert do
+          @view.row_expanded?(@child.path)
+        end
+      end
+
+      test "false" do
+        @view.expand_row(@parent.path, false)
+        assert do
+          @view.row_expanded?(@parent.path)
+        end
+        assert do
+          not @view.row_expanded?(@child.path)
+        end
+      end
+
+      test ":open_all => true" do
+        @view.expand_row(@parent.path, :open_all => true)
+        assert do
+          @view.row_expanded?(@parent.path)
+        end
+        assert do
+          @view.row_expanded?(@child.path)
+        end
+      end
+
+      test ":open_all => false" do
+        @view.expand_row(@parent.path, :open_all => false)
+        assert do
+          @view.row_expanded?(@parent.path)
+        end
+        assert do
+          not @view.row_expanded?(@child.path)
+        end
+      end
+    end
+
     test "#row_expanded?" do
       parent = @store.append(nil)
       parent[0] = "Hello"
@@ -129,4 +190,40 @@ class TestGtkTreeView < Test::Unit::TestCase
       end
     end
   end
+
+  sub_test_case "signal" do
+    def setup
+      @store = Gtk::TreeStore.new(String)
+      @view = Gtk::TreeView.new(@store)
+
+      root = @store.append(nil)
+      root[0] = "root"
+      child = @store.append(root)
+      child[0] = "child"
+      grand_child = @store.append(child)
+      grand_child[0] = "grand child"
+    end
+
+    test "row-collapsed" do
+      @view.expand_all
+
+      values = []
+      @view.signal_connect("row-collapsed") do |_, iter, path|
+        values << iter[0]
+      end
+      @view.collapse_row(Gtk::TreePath.new("0:0"))
+      assert_equal(["child"], values)
+    end
+
+    test "row-expanded" do
+      @view.collapse_all
+
+      values = []
+      @view.signal_connect("row-expanded") do |_, iter, path|
+        values << iter[0]
+      end
+      @view.expand_row(Gtk::TreePath.new("0"))
+      assert_equal(["root", "child"], values)
+    end
+  end
 end

data/test/test-gtk-window.rb

@@ -26,8 +26,8 @@ class TestGtkWindow < Test::Unit::TestCase
       @window.icon = fixture_path("gnome-logo-icon.png")
     end
 
-    test "Gdk::Pixbuf" do
-      icon = Gdk::Pixbuf.new(fixture_path("gnome-logo-icon.png"))
+    test "GdkPixbuf::Pixbuf" do
+      icon = GdkPixbuf::Pixbuf.new(:file => fixture_path("gnome-logo-icon.png"))
       @window.icon = icon
     end
   end

data/test/test-pango-context.rb

@@ -0,0 +1,56 @@
+# Copyright (C) 2016  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 TestPangoContext < Test::Unit::TestCase
+  include GtkTestUtils
+
+  def test_set_shape_renderer
+    text = "this is a test"
+    label = Gtk::Label.new(text)
+    layout = label.layout
+
+    last_block_arguments = nil
+    layout.context.set_shape_renderer do |cr, attr, do_path|
+      last_block_arguments = [cr.class, attr.class, do_path]
+    end
+
+    metrics = layout.context.get_metrics(layout.font_description)
+    ascent = metrics.ascent
+    logical_rect = Pango::Rectangle.new(0, -ascent, ascent, ascent)
+    ink_rect = logical_rect.dup
+    attrs = Pango::AttrList.new
+    attr = Pango::AttrShape.new(ink_rect, logical_rect, "a")
+    attr.start_index = text[0, text.index("a")].bytesize
+    attr.end_index = attr.start_index + "a".bytesize
+    attrs.insert(attr)
+    label.attributes = attrs
+
+    window = Gtk::Window.new
+    window.signal_connect("destroy") do
+      Gtk.main_quit
+    end
+    window.add(label)
+    GLib::Timeout.add(1000) do
+      window.destroy
+      GLib::Source::REMOVE
+    end
+    window.show_all
+    Gtk.main
+
+    assert_equal([Cairo::Context, Pango::AttrShape, false],
+                 last_block_arguments)
+  end
+end