diff options
author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-11-21 17:34:12 +0000 |
---|---|---|
committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-11-21 17:34:12 +0000 |
commit | 63e6a0a91f3705d5c9977ac5c4952b23eef480c6 (patch) | |
tree | 759ef0a75363c7e9d6337fe9cbf19d60f71c422c | |
parent | 1ce26d09fe53acce08905ead8e5ebee39d82456a (diff) | |
download | ruby-63e6a0a91f3705d5c9977ac5c4952b23eef480c6.tar.gz |
* ext/tk/lib/tkextlib/tile.rb: bug fix (Tk::Tile::USE_TTK_NAMESPACE
is not defined).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9581 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/tk/ChangeLog.tkextlib | 5 | ||||
-rw-r--r-- | ext/tk/lib/tkextlib/SUPPORT_STATUS | 2 | ||||
-rw-r--r-- | ext/tk/lib/tkextlib/tile.rb | 6 |
4 files changed, 16 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Tue Nov 22 02:31:53 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> + + * ext/tk/lib/tkextlib/tile.rb: bug fix (Tk::Tile::USE_TTK_NAMESPACE + is not defined). + Tue Nov 22 01:45:21 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> * file.c (rb_file_s_basename): DOSISH_UNC is defined on cygwin but diff --git a/ext/tk/ChangeLog.tkextlib b/ext/tk/ChangeLog.tkextlib index 56a5cd70fa..5f3f9d7369 100644 --- a/ext/tk/ChangeLog.tkextlib +++ b/ext/tk/ChangeLog.tkextlib @@ -1,3 +1,8 @@ +2005-11-22 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> + + * lib/tkextlib/tile.rb: bug fix (Tk::Tile::USE_TTK_NAMESPACE + is not defined). + 2005-11-19 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * sample/tkextlib/treectrl/demo.rb: remove dependency on Ruby's diff --git a/ext/tk/lib/tkextlib/SUPPORT_STATUS b/ext/tk/lib/tkextlib/SUPPORT_STATUS index 33eded5050..d7d9b31a57 100644 --- a/ext/tk/lib/tkextlib/SUPPORT_STATUS +++ b/ext/tk/lib/tkextlib/SUPPORT_STATUS @@ -1,7 +1,7 @@ [ current support status of Tcl/Tk extensions ] - *******<<< RELEASE_DATE of the libraries : 2005/10/23 >>>******* + *******<<< RELEASE_DATE of the libraries : 2005/11/22 >>>******* The following list shows *CURRENT* status when this file was modifyed at last. If you want to add other Tcl/Tk extensions to the planed list diff --git a/ext/tk/lib/tkextlib/tile.rb b/ext/tk/lib/tkextlib/tile.rb index de079ca53d..690f93f029 100644 --- a/ext/tk/lib/tkextlib/tile.rb +++ b/ext/tk/lib/tkextlib/tile.rb @@ -14,6 +14,7 @@ require 'tkextlib/tile/setup.rb' # load package # TkPackage.require('tile', '0.4') # TkPackage.require('tile', '0.6') +# TkPackage.require('tile', '0.7') verstr = TkPackage.require('tile') ver = verstr.split('.') if ver[0].to_i == 0 && ver[1].to_i <= 4 @@ -21,6 +22,7 @@ if ver[0].to_i == 0 && ver[1].to_i <= 4 module Tk module Tile USE_TILE_NAMESPACE = true + USE_TTK_NAMESPACE = false TILE_SPEC_VERSION_ID = 0 end end @@ -29,6 +31,7 @@ elsif ver[0].to_i == 0 && ver[1].to_i <= 6 module Tk module Tile USE_TILE_NAMESPACE = true + USE_TTK_NAMESPACE = true TILE_SPEC_VERSION_ID = 5 end end @@ -37,6 +40,7 @@ else module Tk module Tile USE_TILE_NAMESPACE = false + USE_TTK_NAMESPACE = true TILE_SPEC_VERSION_ID = 7 end end @@ -61,7 +65,7 @@ module Tk end def self.__Import_Tile_Widgets__! - Tk.tk_call('namespace', 'import', 'ttk::*') + Tk.tk_call('namespace', 'import', '-force', 'ttk::*') end def self.load_images(imgdir, pat=TkComm::None) |