diff options
| author | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-31 14:55:37 +0000 |
|---|---|---|
| committer | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-31 14:55:37 +0000 |
| commit | 2551dfd368996153c8d0f0c2580b30d728087c3a (patch) | |
| tree | 5e58a4b207192a4eeece4736cddde29980d062ce | |
| parent | 51e9f71a1d3c786ff1b7dc4675254c2aa02196c0 (diff) | |
* 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/branches/ruby_1_8@8233 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/tk/sample/tkextlib/treectrl/demo.rb | 7 | ||||
| -rw-r--r-- | ext/tk/sample/tkextlib/treectrl/random.rb | 2 |
3 files changed, 14 insertions, 3 deletions
@@ -1,3 +1,11 @@ +Thu Mar 31 23:54:36 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> + + * 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. + Thu Mar 31 22:23:51 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/mkmf.rb (SRC_EXT): exclude just case different suffixes on case 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 |