From c58dc636862b79c97d32d056d816c24f2aa13d58 Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 17 Jun 2013 05:21:16 +0000
Subject: * ext/tk/extconf.rb: support s390x (Thanks to bkabrda) [ruby-trunk -
 Bug #5465] * ext/tk/extconf.rb: apply [Backport87 - Backport #5048] *
 ext/tk/lib/tk/canvas.rb, ext/tk/sample/demos-{en,jp}/{tree.rb,widget}: fix
 bug (Thanks to zzak) [ruby-trunk - Bug #8319]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41347 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/lib/tk/canvas.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'ext/tk/lib')

diff --git a/ext/tk/lib/tk/canvas.rb b/ext/tk/lib/tk/canvas.rb
index 7d3d71675c..af404213e7 100644
--- a/ext/tk/lib/tk/canvas.rb
+++ b/ext/tk/lib/tk/canvas.rb
@@ -85,11 +85,16 @@ class Tk::Canvas<TkWindow
 
   # create a canvas item without creating a TkcItem object
   def create(type, *args)
-    type = TkcItem.type2class(type.to_s) unless type.kind_of?(TkcItem)
+    if type.kind_of?(Class) && type < TkcItem
+      # do nothing
+    elsif TkcItem.type2class(type.to_s)
+      type = TkcItem.type2class(type.to_s)
+    else
+      fail ArgumentError, "type must a subclass of TkcItem class, or a string in CItemTypeToClass"
+    end
     type.create(self, *args)
   end
 
-
   def addtag(tag, mode, *args)
     mode = mode.to_s
     if args[0] && mode =~ /^(above|below|with(tag)?)$/
-- 
cgit v1.2.3