[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@fe99633 [master] gtk3: support Container#add_child(child) again

[Kouhei S. <nu...@co...>]

Kouhei Sutou	2017-12-12 22:37:03 +0900 (Tue, 12 Dec 2017)

  New Revision: fe996336adbfa1a5fa73772fce7d787a1b631dd8
  https://github.com/ruby-gnome2/ruby-gnome2/commit/fe996336adbfa1a5fa73772fce7d787a1b631dd8

  Message:
    gtk3: support Container#add_child(child) again

  Modified files:
    gtk3/lib/gtk3/container.rb
    gtk3/sample/gtk-demo/combobox.rb

  Modified: gtk3/lib/gtk3/container.rb (+4 -4)
===================================================================
--- gtk3/lib/gtk3/container.rb    2017-12-12 22:30:32 +0900 (e8c933a6f)
+++ gtk3/lib/gtk3/container.rb    2017-12-12 22:37:03 +0900 (63a6653b6)
@@ -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
 

  Modified: gtk3/sample/gtk-demo/combobox.rb (+1 -1)
===================================================================
--- gtk3/sample/gtk-demo/combobox.rb    2017-12-12 22:30:32 +0900 (94e6b70fb)
+++ gtk3/sample/gtk-demo/combobox.rb    2017-12-12 22:37:03 +0900 (bc30aaefe)
@@ -100,7 +100,7 @@ class ComboboxDemo
     entry.mask = "^([0-9]*|One|Two|2\302\275|Three)$"
 
     combo.remove_child(combo.child)
-    combo.add(entry)
+    combo.add_child(entry)
 
     # A combobox with string IDs
     frame = Gtk::Frame.new("String IDs")