gtk3 3.4.9 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18510c4c73a54ec566d0872a4379ea844916e6c69f44efcbed43ce8726d34837
-  data.tar.gz: d56661a9d6bd65ff3a0308585b9a2fdc51e7b9f4081bbd60901f075140bb4bc9
+  metadata.gz: 9fbd7f61ea4374757cc5762d2a03cc915755fc7f0c582dccd6b1fd576be2194c
+  data.tar.gz: 80cddbe9e92172568e21df21c1eae29e49f6b7556d0a8d44eed9410ee57b77de
 SHA512:
-  metadata.gz: 8e69dbe1de57c6afa79be0e095d0caf3dcc787456d34f2cf27c1013fccb285f645876ec345a2671afb494c61bbe6bd5547843a7e2076cad3fada64ea908ed5f5
-  data.tar.gz: 7a74a321c9508a3bb93d2cfd05f8fe9f578121dfdc8b44b8398dfcf93906af871fb21255939b00286c86c427b35d0d842c8ba57e54d80a4a3af1283913a2e51b
+  metadata.gz: 7f2788da31bb6187a156d6be347da8e1e33013723eb6dfcdc4975f5090faca69b3d45c4e5bf2226e3c0970d54ec42ac9470755855d20bb389e5ac761e9d4058c
+  data.tar.gz: bf33b0b523f6f1af70945afca73f9be13014f6099027a15b6c1e419ea5206f67fd14b492e6fe374efd48db45188ab9ec842cadb100b72c5282d53c881d45e87c

data/README.md

@@ -16,9 +16,9 @@ Ruby/GTK3 is a Ruby binding of GTK+ 3.
 
 ## Tutorials, examples:
 
-* gtk3/sample/misc: a lot of simple examples.
-* gtk3/sample/gtk-demo: the ruby version of `gtk-demo`.
-* gtk3/sample/tutorial: the ruby version of the [offical Gtk3 tutorial "getting started"](https://developer.gnome.org/gtk3/stable/gtk-getting-started.html).
+* [sample/misc](/gtk3/sample/misc): a lot of simple examples.
+* [sample/gtk-demo](/gtk3/sample/gtk-demo): the ruby version of `gtk-demo`.
+* [sample/tutorial](/gtk3/sample/tutorial): the ruby version of the [offical Gtk3 tutorial "getting started"](https://developer.gnome.org/gtk3/stable/gtk-getting-started.html).
 * a well written tutorial [on how to create a todo application](http://iridakos.com/tutorials/2018/01/25/creating-a-gtk-todo-application-with-ruby)
 
 ## License

data/ext/gtk3/rb-gtk3-accel-map.c

@@ -0,0 +1,76 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2022  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
+ */
+
+#include "rb-gtk3-private.h"
+
+static void
+accel_map_foreach_func(gpointer data,
+                       const gchar *path,
+                       guint key,
+                       GdkModifierType accel_mods,
+                       gboolean changed)
+{
+    VALUE block = (VALUE)data;
+    ID id_call;
+    CONST_ID(id_call, "call");
+    rb_funcall(block,
+               id_call,
+               4,
+               CSTR2RVAL(path),
+               UINT2NUM(key),
+               GFLAGS2RVAL(accel_mods, GDK_TYPE_MODIFIER_TYPE),
+               CBOOL2RVAL(changed));
+}
+
+static VALUE
+rg_s_each(int argc, VALUE *args, VALUE self)
+{
+    RETURN_ENUMERATOR(self, argc, args);
+
+    VALUE options = Qnil;
+    VALUE block = Qnil;
+    rb_scan_args(argc, args, ":&", &options, &block);
+
+    ID keywords[1];
+    VALUE values[1];
+    CONST_ID(keywords[0], "filter");
+    rb_get_kwargs(options, keywords, 0, 1, values);
+
+    VALUE filter = values[0];
+    if (filter == RUBY_Qundef || RB_NIL_P(filter)) {
+        filter = RUBY_Qtrue;
+    }
+    if (RB_TEST(filter)) {
+        gtk_accel_map_foreach((gpointer)block, accel_map_foreach_func);
+    } else {
+        gtk_accel_map_foreach_unfiltered((gpointer)block,
+                                         accel_map_foreach_func);
+    }
+    return self;
+}
+
+void
+rbgtk3_accel_map_init(void)
+{
+    VALUE mGtk = rb_const_get(rb_cObject, rb_intern("Gtk"));
+    VALUE RG_TARGET_NAMESPACE = rb_const_get(mGtk, rb_intern("AccelMap"));
+
+    RG_DEF_SMETHOD(each, -1);
+}

data/ext/gtk3/rb-gtk3-container.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2015  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2015-2022  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
@@ -100,43 +100,17 @@ set_child_prop_func(GtkContainer *container,
                GOBJ2RVAL(child), GVAL2RVAL(value));
 }
 
-static void
-class_init_func(gpointer g_class, gpointer class_data)
+static VALUE
+rg_s_init(VALUE klass)
 {
-    GtkContainerClass *g_container_class = GTK_CONTAINER_CLASS(g_class);
-
-    rbgobj_class_init_func(g_class, class_data);
+    rb_call_super(0, NULL);
 
+    GType type = CLASS2GTYPE(klass);
+    GtkContainerClass *g_container_class =
+        GTK_CONTAINER_CLASS(g_type_class_ref(type));
     g_container_class->set_child_property = set_child_prop_func;
     g_container_class->get_child_property = get_child_prop_func;
-
-    rbgtk3_class_init_func(g_class, class_data);
-}
-
-static VALUE
-rg_initialize(int argc, VALUE *argv, VALUE self)
-{
-    rb_call_super(argc, argv);
-    rbgtk3_initialize(self);
-    return Qnil;
-}
-
-static VALUE
-rg_s_type_register(int argc, VALUE *argv, VALUE klass)
-{
-    VALUE type_name;
-
-    rb_scan_args(argc, argv, "01", &type_name);
-
-    rbgobj_register_type(klass, type_name, class_init_func);
-
-    {
-        VALUE initialize_module;
-        initialize_module = rb_define_module_under(klass, "ContainerHook");
-        rbg_define_method(initialize_module,
-                          "initialize", rg_initialize, -1);
-        rb_include_module(klass, initialize_module);
-    }
+    g_type_class_unref(g_container_class);
 
     return Qnil;
 }
@@ -155,5 +129,5 @@ rbgtk3_container_init(void)
 
     rbgobj_register_mark_func(GTK_TYPE_CONTAINER, rb_gtk3_container_mark);
 
-    RG_DEF_SMETHOD(type_register, -1);
+    RG_DEF_SMETHOD(init, 0);
 }

data/ext/gtk3/rb-gtk3-private.h

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2015-2018  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2015-2022  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
@@ -24,17 +24,13 @@
 /*
  * CentOS 6: No GTK+ 3
  * CentOS 7: GTK+ 3.22
- * Ubuntu 14.04: GTK+ 3.10
- * Ubuntu 16.04: GTK+ 3.18
  * Ubuntu 18.04: GTK+ 3.22
  */
-#define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_10
+#define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_22
 
 #include "rb-gtk3.h"
 
-G_GNUC_INTERNAL void rbgtk3_class_init_func(gpointer g_class, gpointer class_data);
-G_GNUC_INTERNAL void rbgtk3_initialize(VALUE self);
-
+G_GNUC_INTERNAL void rbgtk3_accel_map_init(void);
 G_GNUC_INTERNAL void rbgtk3_cell_layout_init(void);
 G_GNUC_INTERNAL void rbgtk3_container_init(void);
 G_GNUC_INTERNAL void rbgtk3_spin_button_init(void);

data/ext/gtk3/rb-gtk3-widget.c

@@ -25,37 +25,15 @@
 #define RG_TARGET_NAMESPACE cWidget
 #define _SELF(self) (RVAL2GTKWIDGET(self))
 
-static void
-class_init_func(gpointer g_class, gpointer class_data)
-{
-    rbgobj_class_init_func(g_class, class_data);
-    rbgtk3_class_init_func(g_class, class_data);
-}
-
-static VALUE
-rg_initialize(int argc, VALUE *argv, VALUE self)
-{
-    rb_call_super(argc, argv);
-    rbgtk3_initialize(self);
-    return Qnil;
-}
-
 static VALUE
-rg_s_type_register(int argc, VALUE *argv, VALUE klass)
+rg_initialize_post(VALUE self)
 {
-    VALUE type_name;
+    GObject *object = RVAL2GOBJ(self);
+    g_object_ref_sink(object);
 
-    rb_scan_args(argc, argv, "01", &type_name);
-
-    rbgobj_register_type(klass, type_name, class_init_func);
-
-    {
-        VALUE initialize_module;
-        initialize_module = rb_define_module_under(klass, "WidgetHook");
-        rbg_define_method(initialize_module,
-                          "initialize", rg_initialize, -1);
-        rb_include_module(klass, initialize_module);
-    }
+    ID id_initialize_template;
+    CONST_ID(id_initialize_template, "initialize_template");
+    rb_funcall(self, id_initialize_template, 0);
 
     return Qnil;
 }
@@ -93,7 +71,7 @@ rbgtk3_widget_init(void)
     mGtk = rb_const_get(rb_cObject, rb_intern("Gtk"));
     RG_TARGET_NAMESPACE = rb_const_get(mGtk, rb_intern("Widget"));
 
-    RG_DEF_SMETHOD(type_register, -1);
+    RG_DEF_PRIVATE_METHOD(initialize_post, 0);
 
     rbgobj_set_signal_call_func(RG_TARGET_NAMESPACE,
                                 "draw",

data/ext/gtk3/rb-gtk3-window.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2017  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2017-2022  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,6 @@ static const rb_data_type_t toplevel_window_marker_type = {
     {
         toplevel_window_marker_mark,
         toplevel_window_marker_free,
-        NULL,
-        {
-            NULL,
-            NULL,
-        },
     },
     NULL,
     NULL,
@@ -61,16 +56,9 @@ static const rb_data_type_t toplevel_window_marker_type = {
 void
 rbgtk3_window_init(void)
 {
-    VALUE mGtk;
-    VALUE toplevel_window_marker_class;
-    VALUE toplevel_window_marker;
     ToplevelWindowMarkerData *data;
-
-    mGtk = rb_const_get(rb_cObject, rb_intern("Gtk"));
-    toplevel_window_marker_class =
-        rb_define_class_under(mGtk, "ToplevelWindowMarker", rb_cData);
-    toplevel_window_marker =
-        TypedData_Make_Struct(toplevel_window_marker_class,
+    VALUE toplevel_window_marker =
+        TypedData_Make_Struct(rb_cObject,
                               ToplevelWindowMarkerData,
                               &toplevel_window_marker_type,
                               data);

data/ext/gtk3/rb-gtk3.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2015-2018  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2015-2022  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
@@ -573,26 +573,6 @@ rb_gtk3_text_tag_table_mark(gpointer object)
     gtk_text_tag_table_foreach(table, rb_gtk3_text_tag_table_mark_body, NULL);
 }
 
-void
-rbgtk3_class_init_func(gpointer g_class, G_GNUC_UNUSED gpointer class_data)
-{
-    VALUE rb_class;
-
-    rb_class = GTYPE2CLASS(G_TYPE_FROM_CLASS(g_class));
-    rb_funcall(rb_class, rb_intern("init"), 0);
-}
-
-void
-rbgtk3_initialize(VALUE self)
-{
-    GObject *object;
-
-    object = RVAL2GOBJ(self);
-    g_object_ref_sink(object);
-
-    rb_funcall(self, rb_intern("initialize_post"), 0);
-}
-
 void
 Init_gtk3(void)
 {
@@ -615,6 +595,7 @@ Init_gtk3(void)
     rbgobj_register_mark_func(GTK_TYPE_TEXT_TAG_TABLE,
                               rb_gtk3_text_tag_table_mark);
 
+    rbgtk3_accel_map_init();
     rbgtk3_cell_layout_init();
     rbgtk3_container_init();
     rbgtk3_spin_button_init();

data/gtk3.gemspec

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2018  Ruby-GNOME Project Team
+# Copyright (C) 2018-2022  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
@@ -42,9 +42,6 @@ Gem::Specification.new do |s|
   s.files += Dir.glob("sample/**/*")
   s.files += Dir.glob("test/**/*")
 
-  s.add_runtime_dependency("gio2", "= #{s.version}")
   s.add_runtime_dependency("atk", "= #{s.version}")
-  s.add_runtime_dependency("pango", "= #{s.version}")
-  s.add_runtime_dependency("gdk_pixbuf2", "= #{s.version}")
   s.add_runtime_dependency("gdk3", "= #{s.version}")
 end

data/lib/gtk3/label.rb

@@ -39,7 +39,7 @@ module Gtk
       if options == true or options == false or options.nil?
         mnemonic = options
         warn "Gtk::Label#set_markup(text, mnemonic) style has been deprecated. " +
-             "Use Gtk::Label#set_marup(text, {:use_underline => #{mnemonic}}) style instead."
+             "Use Gtk::Label#set_markup(text, {:use_underline => #{mnemonic}}) style instead."
         options = {
           :use_underline => mnemonic,
         }

data/lib/gtk3/loader.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2020  Ruby-GNOME Project Team
+# Copyright (C) 2014-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
@@ -31,6 +31,7 @@ module Gtk
       call_init_function(repository, namespace)
       define_stock_module
       define_version_module
+      define_methods_modules
       setup_pending_constants
     end
 
@@ -54,6 +55,36 @@ module Gtk
       @base_module.const_set("Version", @version_module)
     end
 
+    def define_methods_modules
+      @stock_singleton_methods_module =
+        define_methods_module(:StockSingletonMethods)
+      @widget_methods_module =
+        define_methods_module(:WidgetMethods)
+      @gdk_drag_context_methods_module =
+        define_methods_module(:GdkDragContextMethods)
+      @icon_size_class_methods_module =
+        define_methods_module(:IconSizeClassMethods)
+      @accel_group_class_methods_module =
+        define_methods_module(:AccelGroupClassMethods)
+      @gdk_event_methods_module =
+        define_methods_module(:GdkEventMethods)
+    end
+
+    def apply_methods_modules
+      apply_methods_module(@stock_singleton_methods_module,
+                           @base_module::Stock.singleton_class)
+      apply_methods_module(@widget_methods_module,
+                           @base_module::Widget)
+      apply_methods_module(@gdk_drag_context_methods_module,
+                           Gdk::DragContext)
+      apply_methods_module(@icon_size_class_methods_module,
+                           @base_module::IconSize.singleton_class)
+      apply_methods_module(@accel_group_class_methods_module,
+                           @base_module::AccelGroup.singleton_class)
+      apply_methods_module(@gdk_event_methods_module,
+                           Gdk::Event)
+    end
+
     def level_bar_class
       @level_bar_class ||= @base_module.const_get(:LevelBar)
     end
@@ -64,6 +95,7 @@ module Gtk
 
     def post_load(repository, namespace)
       apply_pending_constants
+      apply_methods_modules
       require_extension
       require_libraries
     end
@@ -170,32 +202,34 @@ module Gtk
       when "init", /_get_type\z/
         # ignore
       when /\Astock_/
-        stock_module = @base_module.const_get(:Stock)
         method_name = rubyish_method_name(info, :prefix => "stock_")
-        define_singleton_method(stock_module, method_name, info)
+        define_module_function(@stock_singleton_methods_module,
+                               method_name,
+                               info)
       when /\Adrag_(?:source_|dest_|get_data\z|(?:un)highlight\z|begin|check_threshold\z)/
         # For OS X. It may be broken. It's not tested.
-        widget_class = @base_module.const_get(:Widget)
         method_name = rubyish_method_name(info)
-        define_method(info, widget_class, method_name)
+        define_method(info, @widget_methods_module, method_name)
       when /\Adrag_/
         method_name = rubyish_method_name(info,
                                           :prefix => "drag_",
                                           :n_in_args_offset => -1)
-        define_method(info, Gdk::DragContext, method_name)
+        define_method(info, @gdk_drag_context_methods_module, method_name)
       when /\Abinding_/
         # Ignore because singleton methods are defined.
       when /\Aicon_size_/
-        icon_size_class = @base_module.const_get(:IconSize)
         method_name = rubyish_method_name(info, :prefix => "icon_size_")
-        define_singleton_method(icon_size_class, method_name, info)
+        define_module_function(@icon_size_class_methods_module,
+                               method_name,
+                               info)
       when /\Atest_widget_/
         name = $POSTMATCH
-        define_method(info, Gtk::Widget, name)
+        define_method(info, @widget_methods_module, name)
       when /\Aaccel_groups_/
-        accel_group_class = @base_module.const_get(:AccelGroup)
         method_name = rubyish_method_name(info, :prefix => "accel_groups_")
-        define_singleton_method(accel_group_class, method_name, info)
+        define_module_function(@accel_group_class_methods_module,
+                               method_name,
+                               info)
       else
         super
       end
@@ -206,11 +240,17 @@ module Gtk
       when "Gtk"
         case name
         when "get_event_widget"
-          define_gdk_event_widget(info)
+          define_method(info, @gdk_event_methods_module, "widget")
           return
         when "events_pending"
           name = "events_pending?"
         end
+      when "Gtk::AccelMap"
+        case name
+        when "each", "foreach_unfiltered"
+          # Implemented in C
+          return
+        end
       when "Gtk::Widget"
         case name
         when "default_style"
@@ -222,10 +262,6 @@ module Gtk
       super(klass, name, info)
     end
 
-    def define_gdk_event_widget(info)
-      define_method(info, Gdk::Event, "widget")
-    end
-
     def define_enum(info)
       case info.name
       when /\AArrow/

data/lib/gtk3/widget.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2020  Ruby-GNOME Project Team
+# Copyright (C) 2015-2022  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
@@ -17,9 +17,6 @@
 module Gtk
   class Widget
     class << self
-      def init
-      end
-
       def have_template?
         @have_template ||= false
       end
@@ -144,8 +141,19 @@ module Gtk
       @style_context ||= style_context_raw
     end
 
+    alias_method :insert_action_group_raw, :insert_action_group
+    def insert_action_group(name, group)
+      insert_action_group_raw(name, group)
+      @action_groups ||= {}
+      if group.nil?
+        @action_groups.delete(name)
+      else
+        @action_groups[name] = group
+      end
+    end
+
     private
-    def initialize_post
+    def initialize_template
       klass = self.class
       return unless klass.have_template?
       return unless respond_to?(:init_template)

data/sample/gtk-demo/toolpalette.rb

@@ -344,14 +344,12 @@ class ToolpaletteDemo
     group = Gtk::ToolItemGroup.new("Radio Item")
     @palette.add(group)
 
-    toggle_group = nil
-
+    item = nil
     (1..10).each do |i|
       label = "##{i}"
-      item = Gtk::RadioToolButton.new(toggle_group)
+      item = Gtk::RadioToolButton.new(item)
       item.label = label
-      group .insert(item, -1)
-      toggle_group = item.group
+      group.insert(item, -1)
     end
   end
 

data/test/test-gtk-accel-map.rb

@@ -0,0 +1,103 @@
+# Copyright (C) 2022  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
+
+class TestGtkAccelMap < Test::Unit::TestCase
+  class << self
+    def startup
+      Gtk::AccelMap.add_entry("<category1>/a",
+                              Gdk::Keyval::KEY_a,
+                              0)
+      Gtk::AccelMap.add_entry("<category2>/b",
+                              Gdk::Keyval::KEY_b,
+                              0)
+      Gtk::AccelMap.add_filter("*category1*")
+    end
+  end
+
+  sub_test_case("#each") do
+    def test_default
+      values = []
+      Gtk::AccelMap.each do |*args|
+        values << args
+      end
+      assert_equal([
+                     [
+                       "<category2>/b",
+                       Gdk::Keyval::KEY_b,
+                       Gdk::ModifierType.new(0),
+                       false,
+                     ],
+                   ],
+                   values)
+    end
+
+    test("filter: true") do
+      values = []
+      Gtk::AccelMap.each(filter: true) do |*args|
+        values << args
+      end
+      assert_equal([
+                     [
+                       "<category2>/b",
+                       Gdk::Keyval::KEY_b,
+                       Gdk::ModifierType.new(0),
+                       false,
+                     ],
+                   ],
+                   values)
+    end
+
+    test("filter: false") do
+      values = []
+      Gtk::AccelMap.each(filter: false) do |*args|
+        values << args
+      end
+      assert_equal([
+                     [
+                       "<category2>/b",
+                       Gdk::Keyval::KEY_b,
+                       Gdk::ModifierType.new(0),
+                       false,
+                     ],
+                     [
+                       "<category1>/a",
+                       Gdk::Keyval::KEY_a,
+                       Gdk::ModifierType.new(0),
+                       false,
+                     ],
+                   ],
+                   values)
+    end
+
+    def test_enumerator
+      assert_equal([
+                     [
+                       "<category2>/b",
+                       Gdk::Keyval::KEY_b,
+                       Gdk::ModifierType.new(0),
+                       false,
+                     ],
+                     [
+                       "<category1>/a",
+                       Gdk::Keyval::KEY_a,
+                       Gdk::ModifierType.new(0),
+                       false,
+                     ],
+                   ],
+                   Gtk::AccelMap.each(filter: false).to_a)
+    end
+  end
+end

data/test/test-gtk-builder.rb

@@ -250,15 +250,6 @@ EOX
 EOX
   end
 
-  def ui_definition_with_signal
-    <<-EOX
-<interface>
-  <object class="GtkWindow" id="main-window">
-  </object>
-</interface>
-EOX
-  end
-
   def ui_definition_file
     xml = Tempfile.new("Gtk::Builder")
     xml.print(ui_definition)

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

@@ -8,11 +8,13 @@ class TestGtkIconTheme < Test::Unit::TestCase
   def test_choose_icon
     assert_nil(@theme.choose_icon("non-existent", 100))
 
-    icon = @theme.choose_icon("face-cool", 10)
+    icon = @theme.choose_icon("face-cool-symbolic", 10)
     assert_not_nil(icon)
-    assert_match(/face-cool/, icon.filename)
+    assert_match(/face-cool-symbolic/, icon.filename)
 
-    assert_not_nil(@theme.choose_icon("face-cool", 29, [:use_builtin, :no_svg]))
+    assert_not_nil(@theme.choose_icon("face-cool-symbolic",
+                                      29,
+                                      [:use_builtin]))
   end
 
   def test_contexts
@@ -21,7 +23,7 @@ class TestGtkIconTheme < Test::Unit::TestCase
 
   class TestIcons < self
     def test_no_argument
-      assert_operator(@theme.icons, :include?, "face-cool")
+      assert_operator(@theme.icons, :include?, "face-cool-symbolic")
     end
 
     def test_context

data/test/test-gtk-widget.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2020  Ruby-GNOME Project Team
+# Copyright (C) 2008-2022  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
@@ -242,7 +242,13 @@ class TestGtkWidget < Test::Unit::TestCase
         type_register "BindTemplateChildNothing"
 
         singleton_class.send(:define_method, :init) do
+          super()
           set_template(:data => data)
+          set_connect_func do |handler_name|
+            lambda do
+              # Do nothing
+            end
+          end
         end
       end
       widget = widget_class.new
@@ -255,8 +261,14 @@ class TestGtkWidget < Test::Unit::TestCase
         type_register "BindTemplateChildBind"
 
         singleton_class.send(:define_method, :init) do
+          super()
           set_template(:data => data)
           bind_template_child(:label)
+          set_connect_func do |handler_name|
+            lambda do
+              # Do nothing
+            end
+          end
         end
       end
       widget = widget_class.new
@@ -278,6 +290,7 @@ class TestGtkWidget < Test::Unit::TestCase
         type_register "SetConnectFunc"
 
         singleton_class.send(:define_method, :init) do
+          super()
           set_template(:data => data)
           bind_template_child(:label)
           set_connect_func do |handler_name|
@@ -292,4 +305,23 @@ class TestGtkWidget < Test::Unit::TestCase
       assert_equal(["on_move_cursor"], handler_names)
     end
   end
+
+  def test_gc_action_group
+    GC.start
+    n_alive_action_groups_before =
+      ObjectSpace.each_object(Gio::SimpleActionGroup) {}
+    n_tries = 100
+    n_tries.times do |i|
+      action_prefix = "test#{i}"
+      action_group = Gio::SimpleActionGroup.new
+      @widget.insert_action_group(action_prefix, action_group)
+    end
+    GC.start
+    n_alive_action_groups_after =
+      ObjectSpace.each_object(Gio::SimpleActionGroup) {}
+    n_alive_action_groups =
+      n_alive_action_groups_after -
+      n_alive_action_groups_before
+    assert_equal(n_tries, n_alive_action_groups)
+  end
 end

metadata

@@ -1,85 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: gtk3
 version: !ruby/object:Gem::Version
-  version: 3.4.9
+  version: 4.0.0
 platform: ruby
 authors:
 - The Ruby-GNOME Project Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-10 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: gio2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.4.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.4.9
 - !ruby/object:Gem::Dependency
   name: atk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.4.9
-- !ruby/object:Gem::Dependency
-  name: pango
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.4.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.4.9
-- !ruby/object:Gem::Dependency
-  name: gdk_pixbuf2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.4.9
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.9
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: gdk3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.9
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.9
+        version: 4.0.0
 description: Ruby/GTK3 is a Ruby binding of GTK+-3.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -92,6 +50,7 @@ files:
 - Rakefile
 - ext/gtk3/depend
 - ext/gtk3/extconf.rb
+- ext/gtk3/rb-gtk3-accel-map.c
 - ext/gtk3/rb-gtk3-cell-layout.c
 - ext/gtk3/rb-gtk3-container.c
 - ext/gtk3/rb-gtk3-private.h
@@ -553,6 +512,7 @@ files:
 - test/test-gtk-about-dialog.rb
 - test/test-gtk-accel-group.rb
 - test/test-gtk-accel-key.rb
+- test/test-gtk-accel-map.rb
 - test/test-gtk-accessible.rb
 - test/test-gtk-action-bar.rb
 - test/test-gtk-action-group.rb
@@ -639,7 +599,7 @@ homepage: https://ruby-gnome2.osdn.jp/
 licenses:
 - LGPL-2.1+
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -654,8 +614,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
-signing_key: 
+rubygems_version: 3.4.0.dev
+signing_key:
 specification_version: 4
 summary: Ruby/GTK3 is a Ruby binding of GTK+-3.x.
 test_files: []