gtk3 3.3.9 → 3.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04a0f7f2d95ea6a2b7666e001e53b2823203496e603beda15f2182d6272d2645
-  data.tar.gz: 2b6a83c596071e51333d8d97b73ab754b378cc36891fd2285a26bd470f3c7f39
+  metadata.gz: 46f440c547ffc229c731a6d434a278203084202d005f7bf4a2db47ae54e7521d
+  data.tar.gz: 5d9fbab7ff4fffc9fe44362a70e794d4072ed9424d0d0e6bedc6c2e32337a986
 SHA512:
-  metadata.gz: bb452074062e6f4cd5a46083daf95d414850849bb4f6361faf7dac7fbaf8cde65d3fec148560b765e5ce372577f3ffaf6775e74e789b547ed253c56f44f08b4f
-  data.tar.gz: f35a6ad707e0936758adef67d6eaa03fbf0ab649f466bb73cb5bd1e8f29200b095407e5ab64ea0d9abb149ff5ad46511f80405fc819ebeba98619136a6ac23c7
+  metadata.gz: a3ffd7c7828d9ce4b4b819158014c87c12e5274dc4446f94521b33ea3c32a5aac9fa4c74916cde4bb3ebafca16bba9ba9cdc5d3b8f77872b9b06f415cf61abfe
+  data.tar.gz: e90825bf6764ff792c210b62a097b7b4808e1bf6e82a56e2fe1464d2db10f83b6ea0325c0181e64141c4def1061d0ad489726697f2ac5afd200371a5b26c4e89

data/README.md

@@ -6,7 +6,7 @@ Ruby/GTK3 is a Ruby binding of GTK+ 3.
 
 * Ruby/GLib2, Ruby/ATK, Ruby/Pango, Ruby/GdkPixbuf2, Ruby/GIO2,
   Ruby/GDK3, Ruby/GObjectIntrospection and Ruby/GTK3 in
-  [Ruby-GNOME2](https://ruby-gnome2.osdn.jp/)
+  [Ruby-GNOME](https://ruby-gnome2.osdn.jp/)
 * [rcairo](https://github.com/rcairo/rcairo)
 * [GTK+](http://www.gtk.org/) 3.4.2 or later
 
@@ -23,7 +23,7 @@ Ruby/GTK3 is a Ruby binding of GTK+ 3.
 
 ## License
 
-Copyright (c) 2002-2018 Ruby-GNOME2 Project Team
+Copyright (c) 2002-2020 Ruby-GNOME Project Team
 
 This program is free software. You can distribute/modify this program
 under the terms of the GNU LESSER GENERAL PUBLIC LICENSE Version 2.1.

data/lib/gtk3/dialog.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2020  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -56,21 +56,20 @@ module Gtk
 
     alias_method :add_button_raw, :add_button
     def add_button(text, response_id)
-      case response_id
-      when Symbol
-        response_id = ResponseType.new(response_id)
-      end
-      add_button_raw(text, response_id)
+      add_button_raw(text, ResponseType.resolve(response_id))
     end
 
     alias_method :get_widget_for_response_raw, :get_widget_for_response
     def get_widget_for_response(response_id)
-      case response_id
-      when Symbol
-        response_id = ResponseType.new(response_id)
-      end
-      get_widget_for_response_raw(response_id)
+      get_widget_for_response_raw(ResponseType.resolve(response_id))
+    end
+
+    alias_method :set_default_response_raw, :set_default_response
+    def set_default_response(response_id)
+      set_default_response_raw(ResponseType.resolve(response_id))
     end
+    alias_method :default_response_raw=, :default_response=
+    alias_method :default_response=, :set_default_response
 
     if method_defined?(:use_header_bar)
       alias_method :use_header_bar_raw, :use_header_bar

data/lib/gtk3/loader.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019  Ruby-GNOME2 Project Team
+# Copyright (C) 2014-2020  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -114,6 +114,7 @@ module Gtk
       require "gtk3/radio-action"
       require "gtk3/radio-button"
       require "gtk3/recent-chooser-dialog"
+      require "gtk3/response-type"
       require "gtk3/scale-button"
       require "gtk3/scrolled-window"
       require "gtk3/search-bar"

data/lib/gtk3/response-type.rb

@@ -0,0 +1,30 @@
+# Copyright (C) 2020  Ruby-GNOME 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
+
+module Gtk
+  class ResponseType
+    class << self
+      def resolve(id)
+        case id
+        when Symbol
+          new(id)
+        else
+          id
+        end
+      end
+    end
+  end
+end

data/lib/gtk3/widget.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2018  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2020  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -82,6 +82,24 @@ module Gtk
     alias_method :events_raw=, :events=
     alias_method :events=, :set_events
 
+    alias_method :set_size_request_raw, :set_size_request
+    def set_size_request(*args)
+      case args.size
+      when 1
+        options = args[0]
+        raise ArgumentError, ":width is missing" unless options.key?(:width)
+        width = options[:width]
+        raise ArgumentError, ":height is missing" unless options.key?(:height)
+        height = options[:height]
+      when 2
+        width, height = args
+      else
+        message = "wrong number of arguments (given #{args.size}, expected 1..2)"
+        raise ArgumentError, message
+      end
+      set_size_request_raw(width, height)
+    end
+
     alias_method :drag_source_set_raw, :drag_source_set
     def drag_source_set(flags, targets, actions)
       targets = ensure_drag_targets(targets)
@@ -97,6 +115,9 @@ module Gtk
     alias_method :style_get_property_raw, :style_get_property
     def style_get_property(name)
       property = self.class.find_style_property(name)
+      if property.nil?
+        raise ArgumentError, "unknown style: #{name.inspect}"
+      end
       value = GLib::Value.new(property.value_type)
       style_get_property_raw(name, value)
       value.value

data/sample/gtk-demo/README

@@ -1,7 +1,12 @@
-gtk-demo for Ruby/GTK
+# gtk-demo for Ruby/GTK
 
 To run, do
 
     ruby main.rb
 
 in this directory.
+
+NOTE: `glib-compile-resources` program must be in the PATH.
+On Windows, try the following command.
+
+    ridk exec ruby main.rb

data/sample/misc/aboutdialog.rb

@@ -2,8 +2,8 @@
 =begin
   aboutdialog.rb - Ruby/GTK sample script.
 
-  Copyright (c) 2005-2018 Ruby-GNOME2 Project Team
-  This program is licenced under the same licence as Ruby-GNOME2.
+  Copyright (c) 2005-2020 Ruby-GNOME Project Team
+  This program is licenced under the same licence as Ruby-GNOME.
 =end
 
 require "gtk3"
@@ -17,15 +17,15 @@ a = Gtk::AboutDialog.new
 a.artists            = ["Artist 1 <no1@foo.bar.com>", "Artist 2 <no2@foo.bar.com>"]
 a.authors            = ["Author 1 <no1@foo.bar.com>", "Author 2 <no2@foo.bar.com>"]
 a.comments           = "This is a sample script for Gtk::AboutDialog"
-a.copyright          = "Copyright (C) 2005 Ruby-GNOME2 Project"
+a.copyright          = "Copyright (C) 2020 Ruby-GNOME Project"
 a.documenters        = ["Documenter 1 <no1@foo.bar.com>", "Documenter 2 <no2@foo.bar.com>"]
-a.license            = "This program is licenced under the same licence as Ruby-GNOME2."
+a.license            = "This program is licenced under the same licence as Ruby-GNOME."
 a.logo               = GdkPixbuf::Pixbuf.new(:file => File.join(__dir__, "gnome-logo-icon.png"))
 a.program_name       = "Gtk::AboutDialog sample"
 a.translator_credits = "Translator 1\nTranslator 2\n"
 a.version            = "1.0.0"
 a.website            = "https://ruby-gnome2.osdn.jp"
-a.website_label      = "Ruby-GNOME2 Project Website"
+a.website_label      = "Ruby-GNOME Project Website"
 
 a.signal_connect("activate-link") do |_widget, uri|
   p _widget.class

data/sample/misc/aboutdialog2.rb

@@ -2,8 +2,8 @@
 =begin
   aboutdialog2.rb - Ruby/GTK sample script.
 
-  Copyright (c) 2005-2015 Ruby-GNOME2 Project Team
-  This program is licenced under the same licence as Ruby-GNOME2.
+  Copyright (c) 2005-2020 Ruby-GNOME Project Team
+  This program is licenced under the same licence as Ruby-GNOME.
 =end
 require "gtk3"
 
@@ -12,19 +12,24 @@ unless Gtk::Version.or_later?(3, 4, 2)
   exit
 end
 
-Gtk::AboutDialog.show(nil,
-		      "artists" => ["Artist 1 <no1@foo.bar.com>", "Artist 2 <no2@foo.bar.com>"],
-		      "authors" => ["Author 1 <no1@foo.bar.com>", "Author 2 <no2@foo.bar.com>"],
-		      "comments" => "This is a sample script for Gtk::AboutDialog",
-		      "copyright" => "Copyright (C) 2005 Ruby-GNOME2 Project",
-		      "documenters" => ["Documenter 1 <no1@foo.bar.com>", "Documenter 2 <no2@foo.bar.com>"],
-		      "license" => "This program is licenced under the same licence as Ruby-GNOME2.",
-		      "logo_icon_name" => "gtk-home",
-		      "program_name" => "Gtk::AboutDialog sample",
-		      "translator_credits" => "Translator 1 <no1@foo.bar.com>\nTranslator 2 <no2@foo.bar.com>\n",
-		      "version" => "1.0.0",
-		      "website" => "https://ruby-gnome2.osdn.jp",
-		      "website_label" => "Ruby-GNOME2 Project Website"
-		      )
+about_dialog = Gtk::AboutDialog.show(
+  nil,
+  "artists" => ["Artist 1 <no1@foo.bar.com>", "Artist 2 <no2@foo.bar.com>"],
+  "authors" => ["Author 1 <no1@foo.bar.com>", "Author 2 <no2@foo.bar.com>"],
+  "comments" => "This is a sample script for Gtk::AboutDialog",
+  "copyright" => "Copyright (C) 2005-2020 Ruby-GNOME Project",
+  "documenters" => ["Documenter 1 <no1@foo.bar.com>", "Documenter 2 <no2@foo.bar.com>"],
+  "license" => "This program is licenced under the same licence as Ruby-GNOME.",
+  "logo_icon_name" => "gtk-home",
+  "program_name" => "Gtk::AboutDialog sample",
+  "translator_credits" => "Translator 1 <no1@foo.bar.com>\nTranslator 2 <no2@foo.bar.com>\n",
+  "version" => "1.0.0",
+  "website" => "https://ruby-gnome2.osdn.jp",
+  "website_label" => "Ruby-GNOME Project Website"
+)
+
+about_dialog.signal_connect('delete_event') do
+  Gtk.main_quit
+end
 
 Gtk.main

data/sample/misc/builder.rb

@@ -5,8 +5,10 @@
   Copyright (c) 2015 Ruby-GNOME2 Project Team
   This program is licenced under the same licence as Ruby-GNOME2.
 =end
+
 require "gtk3"
-ui_file = "#{File.expand_path(File.dirname(__FILE__))}/builder.ui"
+
+ui_file = File.expand_path("builder.ui", __dir__)
 builder = Gtk::Builder.new
 builder.add_from_file(ui_file)
 

data/sample/misc/button2.rb

@@ -2,8 +2,8 @@
 =begin
   button2.rb - Ruby/GTK2 sample script.
 
-  Copyright (c) 2002-2015 Ruby-GNOME2 Project Team
-  This program is licenced under the same licence as Ruby-GNOME2.
+  Copyright (c) 2002-2020 Ruby-GNOME2 Project Team
+  This program is licenced under the same licence as Ruby-GNOME.
 =end
 
 require "gtk3"
@@ -12,7 +12,7 @@ window = Gtk::Window.new("Gtk::Button sample")
 
 button1 = Gtk::Button.new(:mnemonic => "_HELLO")
 button2 = Gtk::Button.new(:label => "_HELLO")
-button3 = Gtk::Button.new(:stock_id => Gtk::Stock::QUIT)  
+button3 = Gtk::Button.new(:stock_id => Gtk::Stock::QUIT)
 
 button3.signal_connect("clicked"){ Gtk.main_quit }
 
@@ -22,7 +22,7 @@ box.add(button2)
 box.add(button3)
 
 window.add(box)
-window.set_default_size(100,100)
+window.set_default_size(100, 100)
 window.show_all
 
 Gtk.main

data/sample/misc/cairo-cursor.rb

@@ -1,8 +1,8 @@
 =begin
   cairo_cursor.rb Ruby/GTK3 script
   Adapted from https://developer.gnome.org/gtk3/stable/ch25s02.html#id-1.6.3.4.5
-  Copyright (c) 2015 Ruby-GNOME2 Project Team
-  This program is licenced under the same licence as Ruby-GNOME2.
+  Copyright (c) 2015-2020 Ruby-GNOME Project Team
+  This program is licenced under the same licence as Ruby-GNOME.
 =end
 
 require "gtk3"
@@ -20,7 +20,7 @@ cr.arc(3, 3, 3, 0, 2 * Math::PI)
 cr.fill
 cr.destroy
 
-pixbuf = surface.to_pixbuf(0, 0, 6, 6)
+pixbuf = surface.to_pixbuf(src_x: 0, src_y: 0, width: 6, heihgt: 6)
 cursor = Gdk::Cursor.new(pixbuf, 0, 0)
 
 # generate the underlaying GDK resource associated with the window widget.

data/sample/misc/calendar.rb

@@ -1,8 +1,8 @@
 =begin
   calendar.rb - Gtk::Calendar sample script.
 
-  Copyright (c) 2002-2018 Ruby-GNOME2 Project Team
-  This program is licenced under the same licence as Ruby-GNOME2.
+  Copyright (c) 2002-2020 Ruby-GNOME Project Team
+  This program is licenced under the same licence as Ruby-GNOME.
 =end
 
 require "gtk3"
@@ -21,11 +21,7 @@ date = Time.new
 cal.select_month(date.month, date.year)
 cal.select_day(date.day)
 cal.mark_day(date.day)
-#cal.clear_marks
-
-#
-# Gtk::CalendarDisplayOptions::WEEK_START_MONDAY does not exist anymore
-#
+# cal.clear_marks
 
 cal.set_display_options(Gtk::CalendarDisplayOptions::SHOW_HEADING |
                         Gtk::CalendarDisplayOptions::SHOW_DAY_NAMES |

data/sample/misc/cursor.rb

@@ -2,8 +2,8 @@
   cursor.rb - Gdk::Cursor sample script.
 
   Copyright (C) 2001-2006 Masao Mutoh
-  Copyright (c) 2002-2015 Ruby-GNOME2 Project Team
-  This program is licenced under the same licence as Ruby-GNOME2.
+  Copyright (c) 2002-2020 Ruby-GNOME Project Team
+  This program is licenced under the same licence as Ruby-GNOME.
 =end
 
 require "gtk3"
@@ -15,20 +15,20 @@ window.realize
 button = Gtk::Button.new(:label => "Click!")
 button.use_underline = false
 
-cursors = Gdk::CursorType.values - [Gdk::CursorType::CURSOR_IS_PIXMAP]
-cursors -= [Gdk::CursorType::LAST_CURSOR]
+cursors = Gdk::CursorType.values -
+          [Gdk::CursorType::CURSOR_IS_PIXMAP] -
+          [Gdk::CursorType::LAST_CURSOR]
+cursors = cursors.cycle
 
-cnt = 0
 button.signal_connect('clicked') do
-  cursor = cursors[cnt]
-p cursor.inspect
+  cursor = cursors.next
+  p cursor
   button.set_label(cursor.inspect)
   window.window.set_cursor(Gdk::Cursor.new(cursor))
-  cnt += 1
-  cnt = 0 if cnt == cursors.size
 end
+
 window.add(button)
-window.set_default_size(400,100)
+window.set_default_size(400, 100)
 window.show_all
 
 Gtk.main

data/sample/misc/dndtreeview.rb

@@ -2,8 +2,8 @@
   dndtreeview.rb - Drag and Drop sample script.
 
   Copyright (C) 2003-2015 Masao Mutoh
-  Copyright (c) 2003-2015 Ruby-GNOME2 Project Team
-  This program is licenced under the same licence as Ruby-GNOME2.
+  Copyright (c) 2003-2020 Ruby-GNOME Project Team
+  This program is licenced under the same licence as Ruby-GNOME.
 =end
 
 require "gtk3"
@@ -27,8 +27,8 @@ class TestWindow < Gtk::Window
     model = Gtk::ListStore.new(String, String)
     view = Gtk::TreeView.new(model)
     renderer = Gtk::CellRendererText.new
-    col1 = Gtk::TreeViewColumn.new("Data", renderer, { :text => 0 })
-    col2 = Gtk::TreeViewColumn.new("Data", renderer, { :text => 1 })
+    col1 = Gtk::TreeViewColumn.new("English", renderer, { :text => 0 })
+    col2 = Gtk::TreeViewColumn.new("Japanese", renderer, { :text => 1 })
     view.append_column(col1)
     view.append_column(col2)
 

data/sample/misc/drawing.rb

@@ -1,8 +1,8 @@
 =begin
   drawing.rb - Ruby/GTK version of gtk+/examples/drawing.c.
   https://git.gnome.org/browse/gtk+/tree/examples/drawing.c?h=gtk-3-16
-  Copyright (c) 2015 Ruby-GNOME2 Project Team
-  This program is licenced under the same licence as Ruby-GNOME2.
+  Copyright (c) 2015-2020 Ruby-GNOME Project Team
+  This program is licenced under the same licence as Ruby-GNOME.
 =end
 
 require "gtk3"
@@ -24,7 +24,7 @@ def draw_brush(widget, surface, x, y)
   widget.queue_draw_area(x - 3, y - 3, 6, 6)
 end
 
-myapp = Gtk::Application.new "org.gtk.example", :flags_none 
+myapp = Gtk::Application.new "org.gtk.example", :flags_none
 
 myapp.signal_connect "activate" do |app|
   win = Gtk::ApplicationWindow.new app
@@ -69,7 +69,7 @@ myapp.signal_connect "activate" do |app|
   drawing_area.signal_connect "motion-notify-event" do |da, ev|
     return false unless surface
 
-    if ((ev.state & Gdk::EventMask::BUTTON_PRESS_MASK.to_i) != 0)
+    if (ev.state & Gdk::EventMask::BUTTON_PRESS_MASK.to_i) != 0
       draw_brush(da, surface, ev.x, ev.y)
     end
   end
@@ -77,9 +77,10 @@ myapp.signal_connect "activate" do |app|
   drawing_area.signal_connect "button-press-event" do |da, ev|
     return false unless surface
 
-    if (ev.button == Gdk::BUTTON_PRIMARY)
+    case ev.button
+    when Gdk::BUTTON_PRIMARY
       draw_brush(da, surface, ev.x, ev.y)
-    elsif (ev.button == Gdk::BUTTON_SECONDARY)
+    when Gdk::BUTTON_SECONDARY
       clear_surface(surface)
       da.queue_draw
     end

data/sample/misc/eventbox.rb

@@ -1,8 +1,8 @@
 =begin
   eventbox.rb - Ruby/GTK sample script.
 
-  Copyright (c) 2015 Ruby-GNOME2 Project Team
-  This program is licenced under the same licence as Ruby-GNOME2.
+  Copyright (c) 2015-2020 Ruby-GNOME Project Team
+  This program is licenced under the same licence as Ruby-GNOME.
 =end
 
 # https://developer.gnome.org/gtk3/unstable/GtkEventBox.html
@@ -31,7 +31,9 @@ cr.set_source_rgb(0, 0, 1)
 cr.rectangle(*r3)
 cr.fill
 
-image = Gtk::Image.new(:pixbuf => surface.to_pixbuf(0, 0, 265, 95))
+image = Gtk::Image.new(
+  pixbuf: surface.to_pixbuf(src_x: 0, src_y: 0, width: 265, height: 95)
+)
 
 event_box = Gtk::EventBox.new
 
@@ -40,11 +42,11 @@ event_box.add(image)
 event_box.signal_connect "button-press-event" do |_widget, event|
   if event.y >= 10 && event.y <= 85
     if event.x >= 10 && event.x <= 85
-      puts "red x = #{event.x} y = #{event.y}"
+      puts "red   x = #{event.x} \t y = #{event.y}"
     elsif event.x >= 95 && event.x <= 180
-      puts "green x = #{event.x} y = #{event.y}"
+      puts "green x = #{event.x} \t y = #{event.y}"
     elsif event.x >= 190 && event.x <= 255
-      puts "blue x = #{event.x} y = #{event.y}"
+      puts "blue  x = #{event.x} \t y = #{event.y}"
     end
   end
 end

data/sample/misc/filechooser.rb

@@ -2,16 +2,16 @@
 =begin
   filechooser.rb - Ruby/GTK2 sample script.
 
-  Copyright (c) 2004-2015 Ruby-GNOME2 Project Team
-  This program is licenced under the same licence as Ruby-GNOME2.
+  Copyright (c) 2004-2020 Ruby-GNOME Project Team
+  This program is licenced under the same licence as Ruby-GNOME.
 =end
 
 require "gtk3"
 
-dialog =  Gtk::FileChooserDialog.new(:title => "Gtk::FileChooser sample", 
-				     :action => Gtk::FileChooserAction::OPEN,                                 
-				     :buttons => [[Gtk::Stock::OPEN, Gtk::ResponseType::ACCEPT],
-				     [Gtk::Stock::CANCEL, Gtk::ResponseType::CANCEL]])
+dialog = Gtk::FileChooserDialog.new(:title => "Gtk::FileChooser sample",
+                                    :action => :open,
+                                    :buttons => [[Gtk::Stock::OPEN, :accept],
+                                                 [Gtk::Stock::CANCEL, :cancel]])
 
 extra_button = Gtk::Button.new(:label => "Extra button")
 extra_button.signal_connect("clicked") do

data/sample/misc/flowbox.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 #
 # Copyright (c)  2014  Gian Mario Tagliaretti
-# Copyright (c)  2015-2018  Ruby-GNOME2 Project Team
+# Copyright (c)  2015-2020  Ruby-GNOME Project Team
 #
 # Permission is granted to copy, distribute and/or modify this document
 # under the terms of the GNU Free Documentation License, Version 1.3
@@ -44,7 +44,7 @@ class FlowBoxWindow < Gtk::Window
     set_titlebar(header)
 
     scrolled = Gtk::ScrolledWindow.new
-    scrolled.set_policy(Gtk::PolicyType::NEVER, Gtk::PolicyType::AUTOMATIC)
+    scrolled.set_policy(:never, :automatic)
 
     flowbox = Gtk::FlowBox.new
     flowbox.valign = :start
@@ -73,7 +73,7 @@ class FlowBoxWindow < Gtk::Window
     area.signal_connect("draw") do |_, context|
       context.set_source_rgba(color)
       context.paint
-    end 
+    end
 
     button.add(area)
   end

data/sample/misc/image.rb

@@ -2,42 +2,28 @@
 =begin
   image.rb - Ruby/GTK sample script.
 
-  Copyright (c) 2002-2015 Ruby-GNOME2 Project Team
-  This program is licenced under the same licence as Ruby-GNOME2.
+  Copyright (c) 2002-2020 Ruby-GNOME Project Team
+  This program is licenced under the same licence as Ruby-GNOME.
 =end
 
 require "gtk3"
 
 window = Gtk::Window.new("Image")
-window.signal_connect("destroy") do
-  Gtk.main_quit
-end
-window.border_width = 0
-
-box1 = Gtk::Box.new(:vertical, 10)
-box1.border_width = 10
+window.signal_connect("destroy") { Gtk.main_quit }
+window.border_width = 10
 
 button = Gtk::Button.new
-box1.add(button)
 
-label = Gtk::Label.new("Gtk::Image\ntest")
+label = Gtk::Label.new("Gtk::Image")
 image = Gtk::Image.new(:file => "test.xpm")
 
-box2 = Gtk::Box.new(:horizontal, 5)
-box2.add(image)
-box2.add(label)
-
-button.add(box2)
-
-box1.add(Gtk::Separator.new(:horizontal))
+box = Gtk::Box.new(:horizontal, 5)
+box.add(image)
+box.add(label)
 
-button = Gtk::Button.new(:label => "close")
-button.signal_connect("clicked") do
-  Gtk.main_quit
-end
-box1.add(button)
+button.add(box)
 
-window.add(box1)
+window.add(button)
 window.show_all
 
 Gtk.main

data/sample/misc/linkbutton.rb

@@ -2,8 +2,8 @@
 =begin
   linkbutton.rb - Gtk::LinkButton sample.
 
-  Copyright (c) 2006-2015 Ruby-GNOME2 Project Team
-  This program is licenced under the same licence as Ruby-GNOME2.
+  Copyright (c) 2006-2020 Ruby-GNOME Project Team
+  This program is licenced under the same licence as Ruby-GNOME.
 =end
 
 require "gtk3"
@@ -22,7 +22,7 @@ vbox.pack_start(button1)
 
 # URI with a label
 button2 = Gtk::LinkButton.new("https://ruby-gnome2.osdn.jp/",
-			      "Ruby-GNOME2 Website")
+                              "Ruby-GNOME Website")
 button2.signal_connect("clicked") do
   puts button2.uri
 end

data/sample/misc/misc-button.rb

@@ -2,8 +2,8 @@
 =begin
   misc_button.rb - Ruby/GTK sample script.
 
-  Copyright (c) 2004-2015 Ruby-GNOME2 Project Team
-  This program is licenced under the same licence as Ruby-GNOME2.
+  Copyright (c) 2004-2020 Ruby-GNOME Project Team
+  This program is licenced under the same licence as Ruby-GNOME.
 =end
 
 require "gtk3"
@@ -25,8 +25,7 @@ end
 box.add(fontbutton)
 
 # Gtk::FileChooserButton
-filebutton = Gtk::FileChooserButton.new("Gtk::FileChooserButton",
-                                    Gtk::FileChooserAction::OPEN)
+filebutton = Gtk::FileChooserButton.new("Gtk::FileChooserButton", :open)
 filebutton.filename = GLib.home_dir
 filebutton.signal_connect("current-folder-changed") do |w, e|
   p filebutton.filename

data/sample/misc/recentchooserdialog.rb

@@ -2,15 +2,15 @@
 =begin
   recentchooserdialog.rb - Ruby/GTK sample script.
 
-  Copyright (c) 2006-2015 Ruby-GNOME2 Project Team
-  This program is licenced under the same licence as Ruby-GNOME2.
+  Copyright (c) 2006-2020 Ruby-GNOME Project Team
+  This program is licenced under the same licence as Ruby-GNOME.
 =end
 
 require "gtk3"
 
 dialog = Gtk::RecentChooserDialog.new(:title => "Recent Chooser Dialog Sample",
-                                      :buttons => [["_Cancel", Gtk::ResponseType::CANCEL],
-                                                   ["_Accept", Gtk::ResponseType::ACCEPT]])
+                                      :buttons => [["_Cancel", :cancel],
+                                                   ["_Accept", :accept]])
 
 dialog.signal_connect("response") do |_widget, response|
   case response
@@ -40,7 +40,7 @@ dialog.signal_connect("response") do |_widget, response|
       puts info.exist?
     end
   else
-    p "Close"
+    puts "Close"
     dialog.destroy
     Gtk.main_quit
   end

data/sample/misc/scalebutton.rb

@@ -2,8 +2,8 @@
 =begin
   scalebutton.rb - Very simple Gtk::ScaleButton example.
 
-  Copyright (c) 2007-2015 Ruby-GNOME2 Project Team
-  This program is licenced under the same licence as Ruby-GNOME2.
+  Copyright (c) 2007-2020 Ruby-GNOME Project Team
+  This program is licenced under the same licence as Ruby-GNOME.
 =end
 
 require "gtk3"
@@ -12,8 +12,8 @@ window = Gtk::Window.new
 window.set_size_request(300, 300)
 scale = Gtk::ScaleButton.new
 scale.set_value(30)
-scale.set_valign(Gtk::Align::END)
-scale.set_halign(Gtk::Align::END)
+scale.set_valign(:end)
+scale.set_halign(:end)
 box = Gtk::Box.new(:vertical)
 box.add(scale)
 box.vexpand = true

data/sample/misc/stock.rb

@@ -2,8 +2,8 @@
   stock.rb - Gtk::Stock sample script.
 
   Copyright (C) 2001-2006 Masao Mutoh
-  Copyright (c) 2001-2015 Ruby-GNOME2 Project Team
-  This program is licenced under the same licence as Ruby-GNOME2.
+  Copyright (c) 2001-2020 Ruby-GNOME Project Team
+  This program is licenced under the same licence as Ruby-GNOME.
 =end
 
 require "gtk3"
@@ -11,26 +11,22 @@ require "gtk3"
 window = Gtk::Window.new("Gtk::Stock sample")
 window.signal_connect("destroy") { Gtk.main_quit }
 
-stocks = Gtk::Stock.constants.sort
+stocks = Gtk::Stock.constants.sort.cycle
 
 image = Gtk::Image.new(:stock => Gtk::Stock::OK, :size => :dialog)
 label = Gtk::Label.new("Gtk::Stock::OK")
 button = Gtk::Button.new(:label => "Click!")
-cnt = 0
+
 button.signal_connect("clicked") do
-  stock_name = "Gtk::Stock::#{stocks[cnt]}"
+  stock = stocks.next
+  stock_name = "Gtk::Stock::#{stock}"
   label.set_text(stock_name)
   image.set_stock(eval(stock_name))
-  if cnt < stocks.size - 1
-    cnt += 1
-  else
-    cnt = 0
-  end
 end
 
 box = Gtk::Box.new(:vertical, 0)
-box.add(image)
-box.add(label)
+box.add(image, :expand => true)
+box.add(label, :expand => true)
 box.add(button)
 window.add(box)
 window.set_default_size(200, 200)

data/sample/tutorial/README.md

@@ -391,7 +391,7 @@ Here is the "window.ui" file that contains the template of the window:
   </template>
 </interface>
 ```
-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).
+Unlike regular interface descriptions, in template XML descriptions, a`<template>` tag is expected as a direct child of the toplevel `<interface>` tag. The `<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.
 

data/test/gtk-test-utils.rb

@@ -17,6 +17,9 @@
 require "tempfile"
 require "fileutils"
 
+require "gtk3"
+Gtk.init
+
 module GtkTestUtils
   private
   def only_gtk_version(major, minor, micro=nil)
@@ -52,6 +55,7 @@ module GtkTestUtils
   end
 
   def fixture_path(*components)
-    File.join(File.dirname(__FILE__), "fixture", *components)
+    File.expand_path(File.join(*components),
+                     ENV["GTK3_FIXTURE_DIR"] || File.join("test", "fixture"))
   end
 end

data/test/run-test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2013-2017  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2021  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -16,51 +16,20 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-ruby_gnome2_base = File.join(File.dirname(__FILE__), "..", "..")
-ruby_gnome2_base = File.expand_path(ruby_gnome2_base)
-
-glib_base = File.join(ruby_gnome2_base, "glib2")
-gobject_introspection_base = File.join(ruby_gnome2_base, "gobject-introspection")
-atk_base = File.join(ruby_gnome2_base, "atk")
-cairo_gobject_base = File.join(ruby_gnome2_base, "cairo-gobject")
-pango_base = File.join(ruby_gnome2_base, "pango")
-gdk_pixbuf_base = File.join(ruby_gnome2_base, "gdk_pixbuf2")
-gio2_base = File.join(ruby_gnome2_base, "gio2")
-gdk3_base = File.join(ruby_gnome2_base, "gdk3")
-gtk3_base = File.join(ruby_gnome2_base, "gtk3")
-
-[
-  [glib_base, "glib2"],
-  [gobject_introspection_base, "gobject-introspection"],
-  [atk_base, "atk"],
-  [cairo_gobject_base, "cairo-gobject"],
-  [pango_base, "pango"],
-  [gdk_pixbuf_base, "gdk_pixbuf2"],
-  [gio2_base, "gio2"],
-  [gdk3_base, "gdk3"],
-  [gtk3_base, "gtk3"]
-].each do |target, module_name|
-  if File.exist?(File.join(target, "Makefile"))
-    if system("which make > /dev/null")
-      `make -C #{target.dump} > /dev/null` or exit(false)
-    end
-    $LOAD_PATH.unshift(File.join(target, "ext", module_name))
-  end
-  $LOAD_PATH.unshift(File.join(target, "lib"))
+require_relative "../../glib2/test/run-test"
+
+run_test(__dir__,
+         [
+           "glib2",
+           "gobject-introspection",
+           "atk",
+           "cairo-gobject",
+           "gdk_pixbuf2",
+           "gio2",
+           "pango",
+           "gdk3",
+           "gtk3",
+         ]) do |context|
+  ENV["GTK3_FIXTURE_DIR"] = context[:build_fixture_dir]
+  require_relative "gtk-test-utils"
 end
-
-Dir.chdir(File.join(gtk3_base, "test", "fixture")) do
-  system("rake") or exit(false)
-end
-
-$LOAD_PATH.unshift(File.join(glib_base, "test"))
-require 'glib-test-init'
-
-$LOAD_PATH.unshift(File.join(gtk3_base, "test"))
-require 'gtk-test-utils'
-
-require 'gtk3'
-
-Gtk.init
-
-exit Test::Unit::AutoRunner.run(true, File.join(gtk3_base, "test"))

data/test/test-gtk-toggle-action.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2018  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2019  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -46,11 +46,9 @@ class TestGtkToggleAction < Test::Unit::TestCase
 
     sub_test_case("#active=") do
       def test_nil
-        if (GObjectIntrospection::BUILD_VERSION <=> [1, 42, 0]) < 0
-          omit("require GObjectIntrospection 1.42.0 or later.")
-        end
-        assert_raise(ArgumentError) do
-          @action.active = nil
+        @action.active = nil
+        assert do
+          not @action.active?
         end
       end
 

data/test/test-gtk-widget.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2016  Ruby-GNOME2 Project Team
+# Copyright (C) 2008-2020  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -130,10 +130,56 @@ class TestGtkWidget < Test::Unit::TestCase
     end
   end
 
-  test "#style_get_property" do
-    entry = Gtk::Entry.new
-    assert do
-      entry.style_get_property("focus-padding").is_a?(Integer)
+  sub_test_case "#set_size_request" do
+    test("{width:, height:}") do
+      entry = Gtk::Entry.new
+      entry.set_size_request(width: 50, height: 100)
+      assert_equal([50, 100], entry.size_request)
+    end
+
+    test("{width:}") do
+      entry = Gtk::Entry.new
+      assert_raise(ArgumentError.new(":height is missing")) do
+        entry.set_size_request(width: 50)
+      end
+    end
+
+    test("{height:}") do
+      entry = Gtk::Entry.new
+      assert_raise(ArgumentError.new(":width is missing")) do
+        entry.set_size_request(height: 100)
+      end
+    end
+
+    test("(width, height)") do
+      entry = Gtk::Entry.new
+      entry.set_size_request(50, 100)
+      assert_equal([50, 100], entry.size_request)
+    end
+
+    test("nothing") do
+      entry = Gtk::Entry.new
+      assert_raise(ArgumentError.new("wrong number of arguments " +
+                                     "(given 0, expected 1..2)")) do
+        entry.set_size_request
+      end
+    end
+  end
+
+  sub_test_case "#style_get_property" do
+    test("existent") do
+      entry = Gtk::Entry.new
+      assert do
+        entry.style_get_property("focus-padding").is_a?(Integer)
+      end
+    end
+
+    test("nonexistent") do
+      entry = Gtk::Entry.new
+      name = "nonexistent"
+      assert_raise(ArgumentError.new("unknown style: #{name.inspect}")) do
+        entry.style_get_property(name)
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gtk3
 version: !ruby/object:Gem::Version
-  version: 3.3.9
+  version: 3.4.4
 platform: ruby
 authors:
 - The Ruby-GNOME Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-10 00:00:00.000000000 Z
+date: 2021-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gio2
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.9
+        version: 3.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.9
+        version: 3.4.4
 - !ruby/object:Gem::Dependency
   name: atk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.9
+        version: 3.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.9
+        version: 3.4.4
 - !ruby/object:Gem::Dependency
   name: pango
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.9
+        version: 3.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.9
+        version: 3.4.4
 - !ruby/object:Gem::Dependency
   name: gdk_pixbuf2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.9
+        version: 3.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.9
+        version: 3.4.4
 - !ruby/object:Gem::Dependency
   name: gdk3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.9
+        version: 3.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.9
+        version: 3.4.4
 description: Ruby/GTK3 is a Ruby binding of GTK+-3.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -147,6 +147,7 @@ files:
 - lib/gtk3/radio-action.rb
 - lib/gtk3/radio-button.rb
 - lib/gtk3/recent-chooser-dialog.rb
+- lib/gtk3/response-type.rb
 - lib/gtk3/scale-button.rb
 - lib/gtk3/scrolled-window.rb
 - lib/gtk3/search-bar.rb
@@ -537,7 +538,6 @@ files:
 - sample/tutorial/exampleapp9/window.ui
 - test/fixture/Rakefile
 - test/fixture/gnome-logo-icon.png
-- test/fixture/image.gresource
 - test/fixture/image.gresource.xml
 - test/fixture/simple_window.gresource.xml
 - test/fixture/simple_window.ui
@@ -654,8 +654,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.3.0.dev
 signing_key: 
 specification_version: 4
 summary: Ruby/GTK3 is a Ruby binding of GTK+-3.x.