gtk3 3.0.8 → 3.0.9

data/sample/misc/combobox.rb

@@ -32,7 +32,7 @@ end
 #
 # Icon and text
 #
-model = Gtk::ListStore.new(Gdk::Pixbuf, String)
+model = Gtk::ListStore.new(GdkPixbuf::Pixbuf, String)
 [[Gtk::Stock::QUIT, "quit"],
  [Gtk::Stock::CANCEL, "cancel"],
  [Gtk::Stock::OK, "ok"]].each do |stock, name|

data/sample/misc/dnd.rb

@@ -2,7 +2,7 @@
   dnd.rb - Drag and Drop sample script.
 
   Copyright (C) 2002-2015 Masao Mutoh
-  Copyright (c) 2002-2015 Ruby-GNOME2 Project Team
+  Copyright (c) 2002-2016 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
 =end
 
@@ -44,9 +44,9 @@ class DestWindow < Gtk::Window
       context.targets.each do |target|
         if target.name == "test" ||
            selection_data.type == Gdk::Selection::TYPE_STRING
-          data_len = selection_data.data[1]
+          data_len = selection_data.data.size
           puts "drag-data-received signal:"
-          puts selection_data.data[0].pack("C#{data_len}")
+          puts selection_data.data.pack("C#{data_len}")
           puts selection_data.text
         else
           next

data/sample/misc/icons-theme-viewer.rb

@@ -9,7 +9,7 @@
 require "gtk3"
 
 def fill_model(icons)
-  model = Gtk::ListStore.new(String, Gdk::Pixbuf)
+  model = Gtk::ListStore.new(String, GdkPixbuf::Pixbuf)
   icons.each do |icon|
     pixbuf = Gtk::IconTheme.default.load_icon(icon, 32, 0)
     iter = model.append

data/sample/misc/iconview.rb

@@ -11,7 +11,7 @@ require "gtk3"
 TEXT_COLUMN   = 0
 PIXBUF_COLUMN = 1
 
-model = Gtk::ListStore.new(String, Gdk::Pixbuf)
+model = Gtk::ListStore.new(String, GdkPixbuf::Pixbuf)
 
 iv = Gtk::IconView.new
 iv.set_model(model)
@@ -21,7 +21,7 @@ iv.pixbuf_column = PIXBUF_COLUMN
 Dir.glob("#{File.expand_path(File.dirname(__FILE__))}/../gtk-demo/gnome*.png").each do |f|
   iter = model.append
   iter[TEXT_COLUMN]   = File.basename(f)
-  iter[PIXBUF_COLUMN] = Gdk::Pixbuf.new(f)
+  iter[PIXBUF_COLUMN] = GdkPixbuf::Pixbuf.new(:file => f)
 end
 
 iv.signal_connect("item_activated") do |iv, path|

data/sample/misc/textbuffer-serialize.rb

@@ -84,16 +84,18 @@ button_color = Gtk::ToolButton.new(:icon_widget => nil, :label => "Color the reg
 button_color.signal_connect "clicked" do 
   dialog = Gtk::ColorChooserDialog.new(:title => "Color the region", :parent => window)
   if dialog.run == Gtk::ResponseType::OK
-    bounds = buffer.selection_bounds # returns an array [Gtk::TextIter, Gtk::TextIter]
-    rgba = dialog.rgba
-    color = Gdk::Color.new(rgba.red*65535, rgba.green*65535, rgba.blue*65535)
-    tag_name = color.to_s 
-    unless tag = buffer.tag_table.lookup(tag_name)
-      tag = Gtk::TextTag.new(tag_name)
-      tag.set_foreground_gdk(color)
+    bounds = buffer.selection_bounds # returns an array [Gtk::TextIter, Gtk::TextIter] or nil
+    if bounds
+      rgba = dialog.rgba
+      color = Gdk::Color.new(rgba.red*65535, rgba.green*65535, rgba.blue*65535)
+      tag_name = color.to_s 
+      unless tag = buffer.tag_table.lookup(tag_name)
+        tag = Gtk::TextTag.new(tag_name)
+        tag.set_foreground_gdk(color)
+      end
+      buffer.tag_table.add(tag)
+      buffer.apply_tag(tag, bounds[0], bounds[1])
     end
-    buffer.tag_table.add(tag)
-    buffer.apply_tag(tag, bounds[0], bounds[1])
   end
   dialog.destroy  
 end
@@ -103,12 +105,14 @@ button_font.signal_connect "clicked" do
   dialog = Gtk::FontChooserDialog.new(:label => "Set font to the region", :parent => window)
   if dialog.run == Gtk::ResponseType::OK
     bounds = buffer.selection_bounds
-    font = dialog.font
-    unless tag = buffer.tag_table.lookup(font)
-      tag = Gtk::TextTag.new(font).set_font(font)
+    if bounds
+      font = dialog.font
+      unless tag = buffer.tag_table.lookup(font)
+        tag = Gtk::TextTag.new(font).set_font(font)
+      end
+      buffer.tag_table.add(tag)
+      buffer.apply_tag(tag, bounds[0], bounds[1])
     end
-    buffer.tag_table.add(tag)
-    buffer.apply_tag(tag, bounds[0], bounds[1])
   end
   dialog.destroy  
 end

data/sample/misc/to-drawable.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 =begin
-  to_drawable.rb - Gdk::Pixbuf(GDK methods) sample script.
+  to_drawable.rb - GdkPixbuf::Pixbuf(GDK methods) sample script.
 
   Copyright (c) 2002-2015 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
@@ -13,7 +13,7 @@ filename = "#{File.expand_path(File.dirname(__FILE__))}/gnome-logo-icon.png"
 window = Gtk::Window.new("Drawable sample")
 window.set_border_width(10)
 
-pixbuf = Gdk::Pixbuf.new(filename)
+pixbuf = GdkPixbuf::Pixbuf.new(:file => filename)
 
 drawing_area = Gtk::DrawingArea.new
 window.add(drawing_area)

data/sample/misc/tooltips.rb

@@ -41,6 +41,7 @@ def textview_query_tooltip(textview, keyboard_tip, x, y, tooltip, tag)
   else
     bx, by = textview.window_to_buffer_coords(Gtk::TextWindowType::TEXT, x, y)
     iter, = textview.get_iter_at_position(bx, by)
+    return false if iter.nil?
   end
   if iter.has_tag?(tag)
     tooltip.text = 'Tooltip on text tag'

data/sample/misc/treeview.rb

@@ -10,7 +10,7 @@ require "gtk3"
 window = Gtk::Window.new("Gtk::TreeView sample")
 
 # Create data
-model = Gtk::TreeStore.new(String, String, Gdk::RGBA, Float, Gdk::Pixbuf)
+model = Gtk::TreeStore.new(String, String, Gdk::RGBA, Float, GdkPixbuf::Pixbuf)
 
 # column 1
 root_iter = model.append(nil)

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!