gtk3 3.0.7 → 3.0.8

data/lib/gtk3/box.rb

@@ -36,5 +36,27 @@ module Gtk
       padding = options[:padding] || 0
       pack_end_raw(child, expand, fill, padding)
     end
+
+    alias_method :set_child_packing_raw, :set_child_packing
+    def set_child_packing(child, options={})
+      expand    = options[:expand]
+      fill      = options[:fill]
+      padding   = options[:padding]
+      pack_type = options[:pack_type]
+
+      old_expand, old_fill, old_padding, old_pack_type =
+        query_child_packing(child)
+
+      expand    = old_expand    if expand.nil?
+      fill      = old_fill      if fill.nil?
+      padding   = old_padding   if padding.nil?
+      pack_type = old_pack_type if pack_type.nil?
+
+      set_child_packing_raw(child,
+                            expand,
+                            fill,
+                            padding,
+                            pack_type)
+    end
   end
 end

data/lib/gtk3/builder.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2016  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -16,6 +16,51 @@
 
 module Gtk
   class Builder
+    class << self
+      def connect_signal(builder,
+                         object,
+                         signal_name,
+                         handler_name,
+                         connect_object,
+                         flags,
+                         &block)
+        handler_name = normalize_handler_name(handler_name)
+        if connect_object
+          handler = connect_object.method(handler_name)
+        else
+          handler = block.call(handler_name)
+        end
+
+        unless handler
+          $stderr.puts("Undefined handler: #{handler_name}") if $DEBUG
+          return
+        end
+
+        if flags.is_a?(Integer)
+          flags = GLib::ConnectFlags.new(flags)
+        end
+
+        if flags.after?
+          signal_connect_method = :signal_connect_after
+        else
+          signal_connect_method = :signal_connect
+        end
+
+        if handler.arity.zero?
+          object.__send__(signal_connect_method, signal_name) do
+            handler.call
+          end
+        else
+          object.__send__(signal_connect_method, signal_name, &handler)
+        end
+      end
+
+      private
+      def normalize_handler_name(name)
+        name.gsub(/[-\s]+/, "_")
+      end
+    end
+
     alias_method :initialize_raw, :initialize
     def initialize(options={})
       path      = options[:path] || options[:file]
@@ -100,34 +145,10 @@ module Gtk
       self
     end
 
-    private
-    def normalize_handler_name(name)
-      name.gsub(/[-\s]+/, "_")
-    end
-
-    def __connect_signals__(connector, object, signal_name,
-                            handler_name, connect_object, flags)
-      handler_name = normalize_handler_name(handler_name)
-      if connect_object
-        handler = connect_object.method(handler_name)
-      else
-        handler = connector.call(handler_name)
-      end
-      unless handler
-        $stderr.puts("Undefined handler: #{handler_name}") if $DEBUG
-        return
-      end
-
-      if flags.after?
-        signal_connect_method = :signal_connect_after
-      else
-        signal_connect_method = :signal_connect
-      end
-
-      if handler.arity.zero?
-        object.send(signal_connect_method, signal_name) {handler.call}
-      else
-        object.send(signal_connect_method, signal_name, &handler)
+    alias_method :connect_signals_raw, :connect_signals
+    def connect_signals(&block)
+      connect_signals_raw do |*args|
+        self.class.connect_signal(*args, &block)
       end
     end
   end

data/lib/gtk3/deprecated.rb

@@ -569,6 +569,13 @@ module Gtk
 
   class MenuItem
     extend GLib::Deprecatable
+
+    define_deprecated_method_by_hash_args :initialize,
+        "label, use_underline=false",
+        ":label => label, :use_underline => use_underline" do |_self, label, use_underline|
+      [{:label => label, :use_underline => use_underline}]
+    end
+
     define_deprecated_method :remove_submenu, :warn => "Use '#{self}#set_submenu'." do |_self|
       _self.set_submenu(nil)
     end

data/lib/gtk3/entry-buffer.rb

@@ -0,0 +1,28 @@
+# Copyright (C) 2015  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module Gtk
+  class EntryBuffer
+    alias_method :initialize_raw, :initialize
+    def initialize(text=nil)
+      if text.nil?
+        initialize_raw(nil, -1)
+      else
+        initialize_raw(text, text.size)
+      end
+    end
+  end
+end

data/lib/gtk3/list-store.rb

@@ -24,25 +24,6 @@ module Gtk
       initialize_raw(columns)
     end
 
-    def set_values(iter, values)
-      columns = []
-      _values = []
-      if values.is_a?(Hash)
-        values.each do |column_id, value|
-          type = get_column_type(column_id)
-          columns << column_id
-          _values << GLib::Value.new(type, value)
-        end
-      else
-        values.each_with_index do |value, i|
-          type = get_column_type(i)
-          columns << i
-          _values << GLib::Value.new(type, value)
-        end
-      end
-      set(iter, columns, _values)
-    end
-
     alias_method :append_raw, :append
     def append
       iter = append_raw
@@ -58,9 +39,10 @@ module Gtk
     end
 
     alias_method :insert_raw, :insert
-    def insert(index)
+    def insert(index, values=nil)
       iter = insert_raw(index)
       setup_iter(iter)
+      set_values(iter, values) if values
       iter
     end
 

data/lib/gtk3/loader.rb

@@ -107,6 +107,7 @@ module Gtk
       require "gtk3/container"
       require "gtk3/css-provider"
       require "gtk3/dialog"
+      require "gtk3/entry-buffer"
       require "gtk3/file-chooser-dialog"
       require "gtk3/font-chooser-dialog"
       require "gtk3/gesture-multi-press"
@@ -337,6 +338,11 @@ module Gtk
           # Ignore deprecated methods
           return
         end
+      when "Gtk::TreePath"
+        case method_name
+        when "next", "prev", "up", "down"
+          method_name += "!"
+        end
       when "Gtk::TreeSelection"
         case method_name
         when "selected_foreach"

data/lib/gtk3/menu-item.rb

@@ -17,16 +17,17 @@
 module Gtk
   class MenuItem
     alias_method :initialize_raw, :initialize
-    def initialize(*args)
-      if args.size == 1
-        label = args.first
-        if label.nil?
-          initialize_raw
+    def initialize(options={})
+      label = options[:label]
+
+      if label
+        if options[:use_underline]
+          initialize_new_with_mnemonic(label)
         else
-          initialize_raw(label)
+          initialize_new_with_label(label)
         end
       else
-        initialize_raw(*args)
+        initialize_raw
       end
     end
   end

data/lib/gtk3/tree-iter.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2014-2016 Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -45,6 +45,10 @@ module Gtk
       @model.get_path(self)
     end
 
+    def previous!
+      @model.iter_previous(self)
+    end
+
     def next!
       @model.iter_next(self)
     end
@@ -53,6 +57,26 @@ module Gtk
       @model.iter_parent(self)
     end
 
+    def has_child?
+      @model.iter_has_child(self)
+    end
+
+    def n_children
+      @model.iter_n_children(self)
+    end
+
+    def nth_child(n)
+      @model.iter_nth_child(self, n)
+    end
+
+    def children
+      @model.iter_children(self)
+    end
+
+    def first_child
+      nth_child(0)
+    end
+
     def ==(other)
       other.is_a?(self.class) and
         @model == other.model and

data/lib/gtk3/tree-model.rb

@@ -59,6 +59,47 @@ module Gtk
       get_value_raw(iter, column).value
     end
 
+    alias_method :iter_nth_child_raw, :iter_nth_child
+    def iter_nth_child(iter, n)
+      got, iter = iter_nth_child_raw(iter, n)
+      if got
+        setup_iter(iter)
+        iter
+      else
+        nil
+      end
+    end
+
+    alias_method :iter_children_raw, :iter_children
+    def iter_children(iter)
+      got, iter = iter_children_raw(iter)
+      if got
+        setup_iter(iter)
+        iter
+      else
+        nil
+      end
+    end
+
+    def set_values(iter, values)
+      columns = []
+      _values = []
+      if values.is_a?(Hash)
+        values.each do |column_id, value|
+          type = get_column_type(column_id)
+          columns << column_id
+          _values << GLib::Value.new(type, value)
+        end
+      else
+        values.each_with_index do |value, i|
+          type = get_column_type(i)
+          columns << i
+          _values << GLib::Value.new(type, value)
+        end
+      end
+      set(iter, columns, _values)
+    end
+
     private
     def setup_iter(iter)
       iter.model = self

data/lib/gtk3/tree-store.rb

@@ -22,37 +22,38 @@ module Gtk
     end
 
     alias_method :insert_raw, :insert
-    def insert(parent, position)
+    def insert(parent, position, values=nil)
       iter = insert_raw(parent, position)
-      iter.model = self
+      setup_iter(iter)
+      set_values(iter, values) if values
       iter
     end
 
     alias_method :insert_before_raw, :insert_before
     def insert_before(parent, sibling)
       iter = insert_before_raw(parent, sibling)
-      iter.model = self
+      setup_iter(iter)
       iter
     end
 
     alias_method :insert_after_raw, :insert_after
     def insert_after(parent, sibling)
       iter = insert_after_raw(parent, sibling)
-      iter.model = self
+      setup_iter(iter)
       iter
     end
 
     alias_method :prepend_raw, :prepend
     def prepend(parent)
       iter = prepend_raw(parent)
-      iter.model = self
+      setup_iter(iter)
       iter
     end
 
     alias_method :append_raw, :append
     def append(parent)
       iter = append_raw(parent)
-      iter.model = self
+      setup_iter(iter)
       iter
     end
   end

data/lib/gtk3/widget.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2016  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -54,6 +54,13 @@ module Gtk
       def style_properties
         style_properties_raw[0]
       end
+
+      alias_method :set_connect_func_raw, :set_connect_func
+      def set_connect_func(&block)
+        set_connect_func_raw do |*args|
+          Builder.connect_signal(*args, &block)
+        end
+      end
     end
 
     alias_method :events_raw, :events
@@ -106,6 +113,16 @@ module Gtk
       render_icon_pixbuf_raw(stock_id, size)
     end
 
+    alias_method :translate_coordinates_raw, :translate_coordinates
+    def translate_coordinates(widget, x, y)
+      translated, x, y = translate_coordinates_raw(widget, x, y)
+      if translated
+        [x, y]
+      else
+        nil
+      end
+    end
+
     private
     def initialize_post
       klass = self.class

data/sample/gtk-demo/TODO

@@ -1,69 +1,75 @@
-# C version (3.18.0) versus Ruby version
+# C version (3.19.1) versus Ruby version
 
 C version             Ruby version    Updated
 application.c           no              no
-assistant.c             no              no
-builder.c               ok              no
+assistant.c             ok              ok
+builder.c               ok              ok
 button_box.c            ok              ok
 changedisplay.c         ok              no
 clipboard.c             ok              no
-colorsel.c              ok              no
+colorsel.c              ok              ok
 combobox.c              no              no
-css_accordion.c         ok              no
-css_basics.c            ok              no
-css_multiplebgs.c       no              no
-css_pixbufs.c           no              no
-css_shadows.c           no              no
-cursors.c               no              no
-dialog.c                ok              no
+css_accordion.c         ok              ok
+css_basics.c            ok              ok
+css_multiplebgs.c       ok              ok
+css_pixbufs.c           ok              ok
+css_shadows.c           ok              ok
+cursors.c               ok              ok
+dialog.c                ok              ok
 drawingarea.c           ok              no
 editable_cells.c        ok              no
-entry_buffer.c          no              no
-entry_completion.c      ok              no
+entry_buffer.c          ok              ok
+entry_completion.c      ok              ok
 event_axes.c            no              no
-expander.c              ok              no
-filtermodel.c           no              no
-font_features.c         no              no
+expander.c              ok              ok
+filtermodel.c           ok              ok
+flowbox.c               no              no
+font_features.c         ok              ok
 gestures.c              no              no
 glarea.c                no              no
-headerbar.c             no              no
+headerbar.c             ok              ok
 hypertext.c             ok              no
 iconview.c              ok              no
-iconview_edit.c         no              no
+iconview_edit.c         ok              ok
 images.c                ok              no
-infobar.c               ok              no
-links.c                 ok              no
+infobar.c               ok              ok
+links.c                 ok              ok
 listbox.c               no              no
-flowbox.c               no              no
 list_store.c            ok              no
-markup.c                no              no
-menus.c                 ok              no
+markup.c                ok              ok
+menus.c                 ok              ok
+modelbutton.c           ok              ok
 offscreen_window.c      no              no
 offscreen_window2.c     no              no
-overlay.c               no              no
-overlay2.c              no              no
-panes.c                 ok              no
-pickers.c               no              no
+overlay.c               ok              ok
+overlay2.c              ok              ok
+panes.c                 ok              ok
+pickers.c               ok              ok
 pixbufs.c               ok              no
-popover.c               no              no
-printing.c              ok              no
-revealer.c              no              no
+popover.c               ok              ok
+printing.c              ok              ok
+revealer.c              ok              ok
 rotated_text.c          ok              no
-scale.c                 no              no
+scale.c                 ok              ok
 search_entry.c          no              no
-search_entry2.c         no              no
-sidebar.c               no              no
-sizegroup.c             ok              no
+search_entry2.c         ok              ok
+shortcuts.c             no              no
+sidebar.c               ok              ok
+sizegroup.c             ok              ok
 spinbutton.c            no              no
-spinner.c               ok              no
-stack.c                 no              no
-textmask.c              no              no
-textview.c              ok              no
+spinner.c               ok              ok
+stack.c                 ok              ok
+textmask.c              ok              ok
 textscroll.c            no              no
-theming_style_classes.c ok              no
+textview.c              ok              no
+theming_style_classes.c ok              ok
 toolpalette.c           no              no
 transparent.c           no              no
 tree_store.c            ok              no
 
 # Ruby version
 Check all the ruby demos that doesn't correspond to a C version.
+
+# Demo that are not to be done
+pagesetup.c
+