summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authornagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-06-08 14:42:06 +0000
committernagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-06-08 14:42:06 +0000
commite1885a0079bc61b610842783fe4dd1a2a84d8a81 (patch)
treeb1b729115cb88e5fc4694209ba668c0b9e949f75 /ext
parentc2e1ef22b91caab1167893f67ded18a747c581bb (diff)
* ext/tk/lib/tkextlib/ICONS/icons.rb: fail to create instances of
Tk::ICONS [ruby-dev:26305]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/tk/ChangeLog.tkextlib5
-rw-r--r--ext/tk/lib/tkextlib/ICONS/icons.rb6
2 files changed, 10 insertions, 1 deletions
diff --git a/ext/tk/ChangeLog.tkextlib b/ext/tk/ChangeLog.tkextlib
index dc04585985..325fd99ac1 100644
--- a/ext/tk/ChangeLog.tkextlib
+++ b/ext/tk/ChangeLog.tkextlib
@@ -1,3 +1,8 @@
+2005-06-08 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * lib/tkextlib/ICONS/icons.rb: fail to create instances of
+ Tk::ICONS [ruby-dev:26305].
+
2005-06-07 ocean <ocean@ruby-lang.org>
* sample/tkextlib/tile/themes/kroc.{rb,tcl}: also support tile 0.4.
diff --git a/ext/tk/lib/tkextlib/ICONS/icons.rb b/ext/tk/lib/tkextlib/ICONS/icons.rb
index 68e7656945..8a37e35ebf 100644
--- a/ext/tk/lib/tkextlib/ICONS/icons.rb
+++ b/ext/tk/lib/tkextlib/ICONS/icons.rb
@@ -76,7 +76,11 @@ module Tk
##########################################
def self.new(name, keys=nil)
- Tk_IMGTBL["::icon::#{name}"] || super
+ unless obj = Tk_IMGTBL["::icon::#{name}"]
+ obj = allocate()
+ obj.instance_eval{initialize(name, keys)}
+ end
+ obj
end
def initialize(name, keys=nil)