From 7738391d237112db43bb47f793fc0939fb561d00 Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 26 Mar 2005 13:58:11 +0000
Subject: * ext/tk/lib/tk.rb (_callback_entry_class?): add for checking whether
   a class is available for a callback entry. * ext/tk/lib/tk.rb
 (after_cancel): add Tk.after_cancel(afterID) method. * ext/tk/lib/tk.rb
 (array2tk_list): change from private module method   of TkComm to public
 module method. * ext/tk/lib/tk.rb (cget): add check that slot argument is not
 empty string. * ext/tk/lib/tk.rb (configinfo): ditto. *
 ext/tk/lib/tk/itemconfig.rb (itemcget): add check that slot argument   is not
 empty string. * ext/tk/lib/tk/itemconfig.rb (itemconfiginfo): ditto. *
 ext/tk/lib/tk/entry.rb: add TkEntry#icursor and icursor= (alias of   cursor
 and cursor= method). * ext/tk/lib/tk/font.rb: improve font treatment when the
 font name is   empty string. * ext/tk/lib/tk/variable.rb: add :variable,
 :window and :procedure type. * ext/tk/lib/tk/variable.rb: improve treatment
 of array-type tkvariable. * ext/tk/lib/tkextlib/blt.rb: add commands for
 zooming. * ext/tk/lib/tkextlib/blt/*: bug fix. *
 ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: bug fix and add methods   to call
 TreeCtrl commands for bindings. * ext/tk/sample/tkextlib/blt/*: new sample
 scritps. * ext/tk/sample/tkextlib/treectrl/*: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8195 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/lib/tk/itemconfig.rb | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'ext/tk/lib/tk/itemconfig.rb')

diff --git a/ext/tk/lib/tk/itemconfig.rb b/ext/tk/lib/tk/itemconfig.rb
index f0f13e63bd..72225e7522 100644
--- a/ext/tk/lib/tk/itemconfig.rb
+++ b/ext/tk/lib/tk/itemconfig.rb
@@ -6,6 +6,8 @@ require 'tkutil'
 require 'tk/itemfont.rb'
 
 module TkItemConfigOptkeys
+  include TkUtil
+
   def __item_numval_optkeys(id)
     []
   end
@@ -119,8 +121,13 @@ module TkItemConfigMethod
   ################################################
 
   def itemcget(tagOrId, option)
+    orig_opt = option
     option = option.to_s
 
+    if option.length == 0
+      fail ArgumentError, "Invalid option `#{orig_opt.inspect}'"
+    end
+
     if ( method = _symbolkey2str(__item_methodcall_optkeys(tagid(tagOrId)))[option] )
       return self.__send__(method, tagOrId)
     end
@@ -204,7 +211,12 @@ module TkItemConfigMethod
       end
 
     else
+      orig_slot = slot
       slot = slot.to_s
+      if slot.length == 0
+        fail ArgumentError, "Invalid option `#{orig_slot.inspect}'"
+      end
+
       if ( conf = __item_keyonly_optkeys(tagid(tagOrId)).find{|k, v| k.to_s == slot } )
         defkey, undefkey = conf
         if value
@@ -229,7 +241,7 @@ module TkItemConfigMethod
 
   def itemconfiginfo(tagOrId, slot = nil)
     if TkComm::GET_CONFIGINFO_AS_ARRAY
-      if (slot.to_s =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/)
+      if (slot && slot.to_s =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/)
         fontkey  = $2
         conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{fontkey}"))))
         conf[__item_configinfo_struct(tagid(tagOrId))[:key]] = 
@@ -487,7 +499,7 @@ module TkItemConfigMethod
       end
 
     else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
-      if (slot.to_s =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/)
+      if (slot && slot.to_s =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/)
         fontkey  = $2
         conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{fontkey}"))))
         conf[__item_configinfo_struct(tagid(tagOrId))[:key]] = 
-- 
cgit v1.2.3