From 4b7cc65b81f23a2191f53f9836074a9b686b1639 Mon Sep 17 00:00:00 2001
From: ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 31 Mar 2005 14:55:37 +0000
Subject: * ext/tk/sample/tkextlib/treectrl/demo.rb: should use Hash#index.

* ext/tk/sample/tkextlib/treectrl/demo.rb: TkImage was not cached properly.

* ext/tk/sample/tkextlib/treectrl/random.rb: fixed typo.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8233 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/sample/tkextlib/treectrl/demo.rb   | 7 +++++--
 ext/tk/sample/tkextlib/treectrl/random.rb | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'ext/tk')

diff --git a/ext/tk/sample/tkextlib/treectrl/demo.rb b/ext/tk/sample/tkextlib/treectrl/demo.rb
index acb5fcc192..892b5a62c7 100644
--- a/ext/tk/sample/tkextlib/treectrl/demo.rb
+++ b/ext/tk/sample/tkextlib/treectrl/demo.rb
@@ -7,6 +7,10 @@ $ScriptDir = File.dirname(File.expand_path(__FILE__))
 
 $HasColumnCreate = Tk::TreeCtrl::HasColumnCreateCommand
 
+class Hash
+  alias key index
+end
+
 class TkTreeCtrl_demo
   def initialize(dir)
     @ScriptDir = dir || '.'
@@ -102,9 +106,8 @@ class TkTreeCtrl_demo
 
   def init_pics(*args)
     args.each{|pat|
-      pat = "#{pat}.gif"
       unless TkImage.names.find{|img| (name = @images.key(img)) && File.fnmatch(pat, name)}
-        Dir.glob(File.join(@ScriptDir, 'pics', pat)).each{|file|
+        Dir.glob(File.join(@ScriptDir, 'pics', "#{pat}.gif")).each{|file|
           name = File.basename(file, '.gif')
           img = TkPhotoImage.new(:file=>file)
           @images[name] = img
diff --git a/ext/tk/sample/tkextlib/treectrl/random.rb b/ext/tk/sample/tkextlib/treectrl/random.rb
index 05b6c21236..96cf31277d 100644
--- a/ext/tk/sample/tkextlib/treectrl/random.rb
+++ b/ext/tk/sample/tkextlib/treectrl/random.rb
@@ -184,7 +184,7 @@ def randomButton1(t, x, y)
 
   elsif id[0] == 'header'
     # Click in header
-    Tk::TreeCtrl::BindCallback.buttonPress1(w, x, y)
+    Tk::TreeCtrl::BindCallback.buttonPress1(t, x, y)
 
   else
     # Click in item
-- 
cgit v1.2.3