gtk3 3.2.1-x64-mingw32 → 3.2.2-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9753f764ea9ad7ecf87d8fafd089e51c0ba9fb3a
-  data.tar.gz: 2727e021d8ebda4b295289c2abea131599f0b689
+SHA256:
+  metadata.gz: dce1c32cebc18c88a7cdd63eafee8050923b850e99828b5fa8d956cddb4066f6
+  data.tar.gz: 851f0e4ceae97ebbf3cbb06a01cf5583101679487fe18c8fddd5442799f8291e
 SHA512:
-  metadata.gz: 54cf12ec1e484e2299ec913a8e177b76e7d04c3d244f783f55fac8ba54b1b2364efbe3b9a2421ab3949b4dfb50162d9b3b815792bbf253917be6dd044db95e75
-  data.tar.gz: 8772cf6fadcd14eeeb2f467d0c8b19c762246f5084ced6868fe1aa572015f4c55558344a05102b8d08d389a3b5545c16907c98251c22877354be77dd97878e44
+  metadata.gz: 1c1b737caf604e3c896e074e60c76dc0e439b619fc96f86ebceb591d1f938c13c90a30fa0820102a9e22f6c69603adb97d20a545cb7f2d2d632733dca83aa144
+  data.tar.gz: fd47ca5da62134b439fc8654953c468a5844247fc853f170f955caabd96082159b8859f2cbd42bf6f5b22dbed1f3861e0834107ee1330f6a4c6ca0d6ac937bc3

data/lib/gtk3.rb

@@ -60,7 +60,6 @@ module Gtk
         remove_method(:const_missing)
         remove_method(:method_missing)
       end
-      Gio.init if Gio.respond_to?(:init)
       Gdk.init if Gdk.respond_to?(:init)
       loader = Loader.new(self, argv)
       loader.load

data/lib/gtk3/action-group.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2017  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
@@ -80,7 +80,7 @@ module Gtk
                                   :label    => translate_string(label),
                                   :tooltip  => translate_string(tooltip),
                                   :stock_id => stock_id)
-        action.active = is_active
+        action.active = true if is_active
         action.signal_connect("activate") do
           callback.call(self, action)
         end

data/lib/gtk3/container.rb

@@ -31,11 +31,11 @@ module Gtk
     end
     alias_method :<<, :add
 
-    def add_child(*args, &block)
-      if defined?(super)
-        super
+    def add_child(*args)
+      if args.size == 1
+        add(*args)
       else
-        add(*args, &block)
+        super
       end
     end
 

data/lib/gtk3/loader.rb

@@ -179,7 +179,9 @@ module Gtk
         method_name = rubyish_method_name(info)
         define_method(info, widget_class, method_name)
       when /\Adrag_/
-        method_name = rubyish_method_name(info, :prefix => "drag_")
+        method_name = rubyish_method_name(info,
+                                          :prefix => "drag_",
+                                          :n_in_args_offset => -1)
         define_method(info, Gdk::DragContext, method_name)
       when /\Abinding_/
         # Ignore because singleton methods are defined.

data/lib/gtk3/widget.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2018  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
@@ -118,6 +118,11 @@ module Gtk
       end
     end
 
+    alias_method :style_context_raw, :style_context
+    def style_context
+      @style_context ||= style_context_raw
+    end
+
     private
     def initialize_post
       klass = self.class

data/sample/gtk-demo/TODO

@@ -60,6 +60,8 @@ css_blendmodes.c	ok		ok
 fishbowl.c		ok		ok
 flowbox.c               ok              ok
 tree_store.c            ok              ok
+toolpalette.c           ok              ok
+shortcuts.c             ok              ok
 
 Remains :
 
@@ -67,8 +69,6 @@ application.c           no              no
 changedisplay.c         ok              no
 foreigndrawing          no              no
 gestures.c              no              no
-shortcuts.c             no              no
-toolpalette.c           no              no
 
 # Ruby version
 Check all the ruby demos that doesn't correspond to a C version.

data/sample/gtk-demo/drawingarea.rb

@@ -74,7 +74,7 @@ class DrawingareaDemo
       j = spacing
       ycount = xcount % 2 # start with even/odd depending on row
       while j < da.allocated_height
-        if ycount % 2
+        if ycount % 2 == 0
           cr.set_source_rgb(0.45777, 0, 0.45777)
         else
           cr.set_source_rgb(1, 1, 1)
@@ -83,10 +83,10 @@ class DrawingareaDemo
         cr.rectangle(i, j, check_size, check_size)
         cr.fill
         j += check_size + spacing
-        ++ycount
+        ycount += 1
       end
       i += check_size + spacing
-      ++xcount
+      xcount += 1
     end
   end
 

data/sample/gtk-demo/glarea.rb

@@ -6,11 +6,19 @@
 
  GtkGLArea is a widget that allows custom drawing using OpenGL calls.
 =end
-require "opengl"
+
+begin
+  require "opengl"
+rescue LoadError
+  puts("opengl-bindings gem is required")
+  raise
+end
+
 OpenGL.load_lib
-include OpenGL
 
 class GlareaDemo
+  include OpenGL
+
   X_AXIS, Y_AXIS, Z_AXIS = (0..2).to_a
   # The object we are drawing
   VERTEX_DATA = [0.0, 0.5, 0.0, 1.0,

data/sample/gtk-demo/main.rb

@@ -197,7 +197,7 @@ def select_treeview_item(treeview, filename)
     end
   end
   treeview.expand_to_path(to_select)
-  treeview.set_cursor(to_select, treeview.columns[FILENAME_COLUMN])
+  treeview.set_cursor(to_select, nil, false)
 end
 
 class Demo < Gtk::Application
@@ -313,7 +313,7 @@ class Demo < Gtk::Application
     action.signal_connect "activate" do |_action, _parameter|
       selection = @treeview.selection
       iter = selection.selected
-      filename = iter[1]
+      filename = iter[FILENAME_COLUMN]
       if filename
         begin
           run_demo_from_file(filename, windows.first)
@@ -362,7 +362,7 @@ class Demo < Gtk::Application
 
     @treeview.signal_connect "row-activated" do |_tree_view, path, _column|
       iter = model.get_iter(path)
-      filename = iter[1]
+      filename = iter[FILENAME_COLUMN]
       begin
         demo = run_demo_from_file(filename, windows.first)
       rescue => error
@@ -370,9 +370,9 @@ class Demo < Gtk::Application
         report_error(error)
       else
         if demo
-          iter[2] = Pango::Style::ITALIC
+          iter[STYLE_COLUMN] = Pango::Style::ITALIC
           demo.signal_connect "destroy" do
-            iter[2] = Pango::Style::NORMAL
+            iter[STYLE_COLUMN] = Pango::Style::NORMAL
           end
         end
       end
@@ -382,8 +382,8 @@ class Demo < Gtk::Application
     treeview_selection.signal_connect "changed" do |selection, _model|
       iter = selection.selected
       if iter
-        filename = iter[1]
-        title = iter[0]
+        filename = iter[FILENAME_COLUMN]
+        title = iter[TITLE_COLUMN]
         load_file(filename) if filename
         headerbar.set_title(title)
       end

data/sample/gtk-demo/shortcuts.rb

@@ -0,0 +1,110 @@
+# Copyright (c) 2017 Ruby-GNOME2 Project Team
+# This program is licenced under the same licence as Ruby-GNOME2.
+#
+=begin
+=  Shortcuts Window
+
+ GtkShortcutsWindow is a window that provides a help overlay
+ for shortcuts and gestures in an application.
+=end
+class ShortcutsDemo
+  def initialize(main_window)
+    @icons_added = false
+    unless @icons_added
+      theme = Gtk::IconTheme.default
+      theme.add_resource_path("/icons")
+      @icons_added = true
+    end
+
+    ui = "/shortcuts/shortcuts.ui"
+    @builder = Gtk::Builder.new(:resource => ui)
+    builder_add_callback_symbols
+    @builder.connect_signals {}
+
+    @window = @builder["window1"]
+    @window.screen = main_window.screen
+  end
+
+  def run
+    if !@window.visible?
+      @window.show_all
+    else
+      @window.destroy
+    end
+    @window
+  end
+
+  private
+
+  def builder_add_callback_symbols
+    @builder.connect_signals do |name|
+      case name
+      when "builder_shortcuts"
+        builder_shortcuts
+      when "gedit_shortcuts"
+        gedit_shortcuts
+      when "clocks_shortcuts"
+        clocks_shortcuts
+      when "clocks_shortcuts_stopwatch"
+        clocks_shortcuts_stopwatch
+      when "boxes_shortcuts"
+        boxes_shortcuts
+      when "boxes_shortcuts_wizard"
+        boxes_shortcuts_wizard
+      when "boxes_shortcuts_display"
+        boxes_shortcuts_display
+      end
+    end
+  end
+
+  def show_shortcuts(id, view)
+    path = "/shortcuts/#{id}.ui"
+    builder = Gtk::Builder.new(:resource => path)
+    overlay = builder[id]
+    overlay.set_transient_for(@window)
+    overlay.view_name = view if view
+    overlay.show
+  end
+
+  def builder_shortcuts
+    proc do
+      show_shortcuts("shortcuts-builder", nil)
+    end
+  end
+
+  def gedit_shortcuts
+    proc do
+      show_shortcuts("shortcuts-gedit", nil)
+    end
+  end
+
+  def clocks_shortcuts
+    proc do
+      show_shortcuts("shortcuts-clocks", nil)
+    end
+  end
+
+  def clocks_shortcuts_stopwatch
+    proc do
+      show_shortcuts("shortcuts-clocks", "stopwatch")
+    end
+  end
+
+  def boxes_shortcuts
+    proc do
+      show_shortcuts("shortcuts-boxes", nil)
+    end
+  end
+
+  def boxes_shortcuts_wizard
+    proc do
+      show_shortcuts("shortcuts-boxes", "wizard")
+    end
+  end
+
+  def boxes_shortcuts_display
+    proc do
+      show_shortcuts("shortcuts-boxes", "display")
+    end
+  end
+end

data/sample/gtk-demo/shortcuts.ui

@@ -14,49 +14,49 @@
           <object class="GtkButton">
             <property name="visible">1</property>
             <property name="label">Builder</property>
-            <signal name="clicked" handler="builder_shortcuts" swapped="1" object="window1"/>
+            <signal name="clicked" handler="builder_shortcuts" swapped="1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
             <property name="visible">1</property>
             <property name="label">GEdit</property>
-            <signal name="clicked" handler="gedit_shortcuts" swapped="1" object="window1"/>
+            <signal name="clicked" handler="gedit_shortcuts" swapped="1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
             <property name="visible">1</property>
             <property name="label">Clocks - All</property>
-            <signal name="clicked" handler="clocks_shortcuts" swapped="1" object="window1"/>
+            <signal name="clicked" handler="clocks_shortcuts" swapped="1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
             <property name="visible">1</property>
             <property name="label">Clocks - Stopwatch</property>
-            <signal name="clicked" handler="clocks_shortcuts_stopwatch" swapped="1" object="window1"/>
+            <signal name="clicked" handler="clocks_shortcuts_stopwatch" swapped="1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
             <property name="visible">1</property>
             <property name="label">Boxes</property>
-            <signal name="clicked" handler="boxes_shortcuts" swapped="1" object="window1"/>
+            <signal name="clicked" handler="boxes_shortcuts" swapped="1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
             <property name="visible">1</property>
             <property name="label">Boxes - Wizard</property>
-            <signal name="clicked" handler="boxes_shortcuts_wizard" swapped="1" object="window1"/>
+            <signal name="clicked" handler="boxes_shortcuts_wizard" swapped="1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
             <property name="visible">1</property>
             <property name="label">Boxes - Display</property>
-            <signal name="clicked" handler="boxes_shortcuts_display" swapped="1" object="window1"/>
+            <signal name="clicked" handler="boxes_shortcuts_display" swapped="1"/>
           </object>
         </child>
       </object>

data/sample/gtk-demo/toolpalette.rb

@@ -0,0 +1,455 @@
+# Copyright (c) 2017 Ruby-GNOME2 Project Team
+# This program is licenced under the same licence as Ruby-GNOME2.
+#
+=begin
+=  Tool Palette
+
+ A tool palette widget shows groups of toolbar items as a grid of icons
+ or a list of names.
+=end
+class ToolpaletteDemo
+  def initialize(main_window)
+    @window = Gtk::Window.new(:toplevel)
+    @window.screen = main_window.screen
+    @window.title = "Tool Palette"
+    @window.set_default_size(200, 600)
+    @canvas_items = []
+
+    # Add widgets to control the ToolPalette appearance
+    @box = Gtk::Box.new(:vertical, 6)
+    @box.margin = 6
+    @window.add(@box)
+
+    create_orientation_combobox
+    create_style_combobox
+
+    # Add hbox.
+    @hbox = Gtk::Box.new(:horizontal, 5)
+    @box.pack_start(@hbox, :expand => true, :fill => true, :padding => 0)
+
+    create_and_fill_the_toolpalette
+    add_comboboxes_signals
+
+    # Notebook
+    create_and_fill_the_notebook
+  end
+
+  def run
+    if !@window.visible?
+      @window.show_all
+    else
+      @window.destroy
+    end
+    @window
+  end
+
+  private
+
+  def create_style_combobox
+    style_model = Gtk::ListStore.new(String, Integer)
+    iter = style_model.append
+    iter[0] = "Text"
+    iter[1] = Gtk::ToolbarStyle::TEXT.to_i
+    iter = style_model.append
+    iter[0] = "Both"
+    iter[1] = Gtk::ToolbarStyle::BOTH.to_i
+    iter = style_model.append
+    iter[0] = "Both: Horizontal"
+    iter[1] = Gtk::ToolbarStyle::BOTH_HORIZ.to_i
+    iter = style_model.append
+    iter[0] = "Icons"
+    iter[1] = Gtk::ToolbarStyle::ICONS.to_i
+    iter = style_model.append
+    iter[0] = "Default"
+    iter[1] = -1 # A custom meaning for this demo.
+    @combo_style = Gtk::ComboBox.new(:model => style_model)
+    cell_renderer = Gtk::CellRendererText.new
+    @combo_style.pack_start(cell_renderer, true)
+    @combo_style.set_attributes(cell_renderer, "text" => 0)
+    @combo_style.active_iter = iter
+    @box.pack_start(@combo_style, :expand => false,
+                                  :fill => false,
+                                  :padding => 0)
+  end
+
+  def create_orientation_combobox
+    orientation_model = Gtk::ListStore.new(String, Integer)
+    iter = orientation_model.append
+    iter[0] = "Horizontal"
+    iter[1] = Gtk::Orientation::HORIZONTAL
+    iter = orientation_model.append
+    iter[0] = "Vertical"
+    iter[1] = Gtk::Orientation::VERTICAL
+
+    @combo_orientation = Gtk::ComboBox.new(:model => orientation_model)
+    cell_renderer = Gtk::CellRendererText.new
+    @combo_orientation.pack_start(cell_renderer, true)
+    @combo_orientation.set_attributes(cell_renderer, "text" => 0)
+    @combo_orientation.active_iter = iter
+    @box.pack_start(@combo_orientation, :expand => false,
+                                        :fill => false,
+                                        :padding => 0)
+  end
+
+  def create_and_fill_the_toolpalette
+    @palette = Gtk::ToolPalette.new
+    load_icon_items
+    load_toggle_items
+    load_special_items
+
+    palette_scroller = Gtk::ScrolledWindow.new
+    palette_scroller.set_policy(:never, :automatic)
+    palette_scroller.margin = 6
+    palette_scroller.hexpand = true
+    palette_scroller.add(@palette)
+    @hbox.add(palette_scroller)
+    @box.show_all
+    add_dnd_for_tool_items_to_palette
+  end
+
+  def add_dnd_for_tool_items_to_palette
+    @palette.signal_connect "drag-data-received" do |widget, context, x, y|
+      drag_item = @drag_palette.drag_item
+      drop_group = widget.get_drop_group(x, y)
+
+      if drag_item.class == Gtk::ToolItemGroup
+        palette_drop_group(drag_palette, drag_item, drop_group)
+      elsif drag_item.class == Gtk::ToolButton && drop_group
+        allocation = drop_group.allocation
+        palette_drop_item(drag_item, drop_group, x - allocation.x, y - allocation.y)
+      end
+    end
+
+    @palette.add_drag_dest(@palette,
+                           Gtk::DestDefaults::ALL,
+                           [Gtk::ToolPaletteDragTargets::ITEMS,
+                            Gtk::ToolPaletteDragTargets::GROUPS],
+                           Gdk::DragAction::COPY)
+  end
+
+  def add_comboboxes_signals
+    @combo_orientation.signal_connect "changed" do |widget|
+      on_combo_orientation_changed(widget)
+    end
+
+    @combo_style.signal_connect "changed" do |widget|
+      on_combo_style_changed(widget)
+    end
+
+    # Kepp the widgets in sync
+    on_combo_orientation_changed(@combo_orientation)
+  end
+
+  def create_passive_contents
+    @passive_contents = Gtk::DrawingArea.new
+    @passive_contents.signal_connect "draw" do |widget, cr|
+      canvas_draw(widget, cr)
+    end
+    @passive_contents.signal_connect "drag-data-received" do |widget, _context, x, y, selection, _info, _time|
+      tool_item = @palette.get_drag_item(selection)
+
+      # append a new canvas item when a tool button was found
+      if tool_item.class == Gtk::ToolButton
+        canvas_item = CanvasItem.new(widget, tool_item, x, y)
+        @canvas_items << canvas_item
+        widget.queue_draw
+      end
+    end
+  end
+
+  def create_interactive_contents
+    @interactive_contents = Gtk::DrawingArea.new
+    @interactive_contents.signal_connect "draw" do |widget, cr|
+      canvas_draw(widget, cr)
+    end
+
+    @interactive_contents.signal_connect "drag-motion" do |widget, context, x, y, time|
+      if @drop_item
+        # already have a drop indicator - just update position
+        @drop_item.x = x
+        @drop_item.y = y
+        widget.queue_draw
+        Gdk.drag_status(context, Gdk::DragAction::COPY, time)
+      else
+        # request DnD data for creating a drop indicator
+        target = widget.drag_dest_find_target(context, nil)
+        return false unless target
+        @drag_data_requested_for_drop = false
+        widget.drag_get_data(context, target, time)
+      end
+      true
+    end
+
+    @interactive_contents.signal_connect "drag-data-received" do |widget, context, x, y, selection, _info, time|
+      # find the tool button which is the source of this DnD operation
+      tool_item = @palette.get_drag_item(selection)
+
+      if tool_item.class == Gtk::ToolButton
+        item = CanvasItem.new(widget, tool_item, x, y)
+
+        # Either create a new item or just create a preview item, depending on
+        # why the drag data was requested.
+        if @drag_data_requested_for_drop
+          @canvas_items << item
+          context.finish(:success => true, :delete => false, :time => time)
+          @drop_item = nil
+        else
+          @drop_item = item
+          Gdk.drag_status(context, Gdk::DragAction::COPY, time)
+        end
+        widget.queue_draw
+      end
+    end
+
+    @interactive_contents.signal_connect "drag-leave" do |widget|
+      @drop_item = nil if @drop_item
+      widget.queue_draw
+    end
+
+    @interactive_contents.signal_connect "drag-drop" do |widget, context, _x, _y, time|
+      target = widget.drag_dest_find_target(context, nil)
+      if target
+        @drag_data_requested_for_drop = true
+        widget.drag_get_data(context, target, time)
+      end
+      false
+    end
+  end
+
+  def create_and_fill_the_notebook
+    notebook = Gtk::Notebook.new
+    notebook.margin = 6
+    @hbox.pack_end(notebook, :expand => false, :fill => false, :padding => false)
+
+    # Passive DnD dest
+    create_passive_contents
+    @palette.add_drag_dest(@passive_contents, Gtk::DestDefaults::ALL,
+                                     [Gtk::ToolPaletteDragTargets::ITEMS],
+                                     Gdk::DragAction::COPY)
+    contents_scroller = Gtk::ScrolledWindow.new
+    contents_scroller.set_policy(:automatic, :always)
+    contents_scroller.add(@passive_contents)
+    notebook.append_page(contents_scroller, Gtk::Label.new("Passive DnD Mode"))
+    contents_scroller.margin = 6
+
+    # Interactive DnD dest
+    create_interactive_contents
+    @palette.add_drag_dest(@interactive_contents, Gtk::DestDefaults::HIGHLIGHT,
+                           [Gtk::ToolPaletteDragTargets::ITEMS],
+                           Gdk::DragAction::COPY)
+    contents_scroller = Gtk::ScrolledWindow.new
+    contents_scroller.set_policy(:automatic, :always)
+    contents_scroller.add(@interactive_contents)
+    notebook.append_page(contents_scroller, Gtk::Label.new("Interactive DnD Mode"))
+  end
+
+  def canvas_draw(widget, cr)
+    cr.set_source_rgb(1, 1, 1)
+    cr.paint
+
+    @canvas_items.each do |canvas_item|
+      canvas_item.draw(cr, false)
+    end
+
+    @drop_item.draw(cr, true) if @drop_item
+  end
+
+  def palette_drop_group(drag_palette, drag_group, drop_group)
+    drop_position = -1
+
+    drop_position = drag_palette.get_group_position(drop_group) if drop_group
+    drag_palette.set_group_position(drag_group, drop_position)
+  end
+
+  def palette_drop_item(drag_item, drop_group, x, y)
+    drag_group = drag_item.parent
+    drop_item = drop_group.get_drop_item(x, y)
+    drop_position = -1
+
+    drop_position = drop_gropu.get_item_position(drop_item) if drop_item
+
+    if drag_group != drop_group
+      homogeneous = drag_group.child_get_property(drag_item, "homogeneous")
+      expand = drag_group.child_get_property(drag_item, "expand")
+      fill = drag_group.child_get_property(drag_item, "fill")
+      new_row = drag_group.child_get_property(drag_item, "new-row")
+      drop_group.insert(drag_item, drop_position)
+      drop_group.child_set(drag_item, "homogeneous" => homogeneous,
+                                      "expand" => expand,
+                                      "fill" => fill,
+                                      "new-row" => new_row)
+    else
+      drop_group.set_item_position(drag_item, drop_position)
+    end
+  end
+
+  def on_combo_orientation_changed(combo_box)
+    sw = @palette.parent
+    iter = combo_box.active_iter
+    return unless iter
+
+    @palette.orientation = iter[1]
+
+    if @palette.orientation == Gtk::Orientation::HORIZONTAL
+      sw.set_policy(:automatic, :never)
+    else
+      sw.set_policy(:never, :automatic)
+    end
+  end
+
+  def on_combo_style_changed(combo_box)
+    iter = combo_box.active_iter
+    return unless iter
+
+    if iter[1] == -1
+      @palette.unset_style
+    else
+      @palette.style = iter[1]
+    end
+  end
+
+  def load_icon_items
+    max_icons = 10
+    icons_count = 0
+    icon_theme = Gtk::IconTheme.get_for_screen(@palette.screen)
+    contexts = icon_theme.contexts
+    contexts.each do |context|
+      group = Gtk::ToolItemGroup.new(context)
+      @palette.add(group)
+
+      next if context == "Animations"
+      puts "Got context '#{context}"
+
+      icon_names = icon_theme.icons(context)
+      icon_names.sort
+
+      icon_names.each do |icon_name|
+        next if icon_name == "emblem-desktop"
+        next if icon_name =~ /^.*-symbolic$/
+        puts "Got icon name '#{icon_name}'"
+
+        item = Gtk::ToolButton.new
+        item.icon_name = icon_name
+        item.tooltip_text = icon_name
+        group.insert(item, -1)
+
+        # Prevent us having an insane number of icons
+        icons_count += 1
+        break if icons_count >= max_icons
+      end
+    end
+  end
+
+  def load_toggle_items
+    group = Gtk::ToolItemGroup.new("Radio Item")
+    @palette.add(group)
+
+    toggle_group = nil
+
+    (1..10).each do |i|
+      label = "##{i}"
+      item = Gtk::RadioToolButton.new(toggle_group)
+      item.label = label
+      group .insert(item, -1)
+      toggle_group = item.group
+    end
+  end
+
+  def create_entry_item(text)
+    entry = Gtk::Entry.new
+    entry.text = text
+    entry.width_chars = 5
+
+    item = Gtk::ToolItem.new
+    item.add(entry)
+    item
+  end
+
+  def load_special_items
+    group = Gtk::ToolItemGroup.new("Advanced Features group")
+    label_button = Gtk::Button.new(:label => "Advanced Features")
+    label_button.show
+    group.label_widget = label_button
+    @palette.add(group)
+
+    item = create_entry_item("homogeneous=FALSE")
+    group.insert(item, -1)
+    group.child_set_property(item, "homogeneous", false)
+
+    item = create_entry_item("homogeneous=FALSE, expand=TRUE")
+    group.insert(item, -1)
+    group.child_set_property(item, "homogeneous", false)
+    group.child_set_property(item, "expand", true)
+
+    item = create_entry_item("homogeneous=FALSE, expand=TRUE, fill=FALSE")
+    group.insert(item, -1)
+    group.child_set_property(item, "homogeneous", false)
+    group.child_set_property(item, "expand", true)
+    group.child_set_property(item, "fill", false)
+
+    item = create_entry_item("homogeneous=FALSE, expand=TRUE, new-row=TRUE")
+    group.insert(item, -1)
+    group.child_set_property(item, "homogeneous", false)
+    group.child_set_property(item, "expand", true)
+    group.child_set_property(item, "new-row", true)
+
+    item = Gtk::ToolButton.new
+    item.icon_name = "go-up"
+    item.tooltip_text = "Show on vertical palettes only"
+    group.insert(item, -1)
+    item.visible_horizontal = false
+
+    item = Gtk::ToolButton.new
+    item.icon_name = "go-next"
+    item.tooltip_text = "Show on horizontal palettes only"
+    group.insert(item, -1)
+    item.visible_vertical = false
+
+    item = Gtk::ToolButton.new
+    item.icon_name = "edit-delete"
+    item.tooltip_text = "Do not show at all"
+    group.insert(item, -1)
+    item.no_show_all = true
+
+    item = Gtk::ToolButton.new
+    item.icon_name = "view-fullscreen"
+    item.tooltip_text = "Expanded this item"
+    group.insert(item, -1)
+    group.child_set_property(item, "homogeneous", false)
+    group.child_set_property(item, "expand", true)
+
+    item = Gtk::ToolButton.new
+    item.icon_name = "help-browser"
+    item.tooltip_text = "A regular item"
+    group.insert(item, -1)
+  end
+end
+
+class CanvasItem
+  attr_reader :pixbuf
+  attr_accessor :x, :y
+
+  def initialize(widget, button, x, y)
+    icon_name = button.icon_name
+    icon_theme = Gtk::IconTheme.get_for_screen(widget.screen)
+    width, _height = Gtk::IconSize.lookup(:dialog)
+    @pixbuf = icon_theme.load_icon(icon_name,
+                                   width,
+                                   Gtk::IconLookupFlags::GENERIC_FALLBACK)
+    return nil unless @pixbuf
+    @x = x
+    @y = y
+  end
+
+  def draw(cr, preview)
+    cx = @pixbuf.width
+    cy = @pixbuf.height
+    cr.set_source_pixbuf(@pixbuf, @x - cx * 0.5, @y - cy * 0.5)
+
+    if preview
+      cr.paint(0.6)
+    else
+      cr.paint
+    end
+  end
+end

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2017  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
@@ -38,4 +38,32 @@ class TestGtkToggleAction < Test::Unit::TestCase
       assert_equal("gtk-add", action.stock_id)
     end
   end
+
+  sub_test_case("instance methods") do
+    def setup
+      @action = Gtk::ToggleAction.new("add")
+    end
+
+    sub_test_case("#active=") do
+      def test_nil
+        assert_raise(ArgumentError) do
+          @action.active = nil
+        end
+      end
+
+      def test_true
+        @action.active = true
+        assert do
+          @action.active?
+        end
+      end
+
+      def test_false
+        @action.active = false
+        assert do
+          not @action.active?
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gtk3
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: x64-mingw32
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-19 00:00:00.000000000 Z
+date: 2018-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glib2
@@ -16,112 +16,112 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: gio2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: atk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: pango
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: gdk_pixbuf2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: gdk3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: gobject-introspection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: rsvg2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.2
 description: Ruby/GTK3 is a Ruby binding of GTK+-3.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -145,6 +145,7 @@ files:
 - lib/2.2/gtk3.so
 - lib/2.3/gtk3.so
 - lib/2.4/gtk3.so
+- lib/2.5/gtk3.so
 - lib/gtk3.rb
 - lib/gtk3/about-dialog.rb
 - lib/gtk3/action-group.rb
@@ -401,6 +402,7 @@ files:
 - sample/gtk-demo/shortcuts-builder.ui
 - sample/gtk-demo/shortcuts-clocks.ui
 - sample/gtk-demo/shortcuts-gedit.ui
+- sample/gtk-demo/shortcuts.rb
 - sample/gtk-demo/shortcuts.ui
 - sample/gtk-demo/sidebar.rb
 - sample/gtk-demo/sizegroup.rb
@@ -417,6 +419,7 @@ files:
 - sample/gtk-demo/textview.rb
 - sample/gtk-demo/theming.ui
 - sample/gtk-demo/theming_style_classes.rb
+- sample/gtk-demo/toolpalette.rb
 - sample/gtk-demo/transparent.rb
 - sample/gtk-demo/tree_store.rb
 - sample/gtk-demo/vertical_text_cursor.png
@@ -678,10 +681,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.2'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -689,7 +692,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby/GTK3 is a Ruby binding of GTK+-3.x.