diff options
author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-08-03 04:49:20 +0000 |
---|---|---|
committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-08-03 04:49:20 +0000 |
commit | 7fc53294f27a325b15cf0dc81caa40bebb28b080 (patch) | |
tree | e00c11c55e2f655c0f453c706d702dc0cc9f6953 /ext/tk/lib | |
parent | 84fddcff2ff32077f0f90620494f68d3f3c0eb8f (diff) | |
download | ruby-7fc53294f27a325b15cf0dc81caa40bebb28b080.tar.gz |
* ext/tk/lib/tk/namespace.rb: bug fix
* ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: add Tk::TreeCtrl.loupe
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6736 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk/lib')
-rw-r--r-- | ext/tk/lib/tk/namespace.rb | 8 | ||||
-rw-r--r-- | ext/tk/lib/tkextlib/treectrl/tktreectrl.rb | 32 |
2 files changed, 30 insertions, 10 deletions
diff --git a/ext/tk/lib/tk/namespace.rb b/ext/tk/lib/tk/namespace.rb index 1ab9623692..912ed1b5d3 100644 --- a/ext/tk/lib/tk/namespace.rb +++ b/ext/tk/lib/tk/namespace.rb @@ -133,8 +133,8 @@ class TkNamespace < TkObject # <pattern> must be glob-style pattern tk_split_simplelist(tk_call('namespace', 'children', *args)).collect{|ns| # ns is fullname - if Tk_Namesapce_ID.key?(ns) - Tk_Namesapce_ID[ns] + if Tk_Namespace_ID_TBL.key?(ns) + Tk_Namespace_ID_TBL[ns] else ns end @@ -264,8 +264,8 @@ class TkNamespace < TkObject def self.parent(namespace=None) ns = tk_call('namespace', 'parent', namespace) - if Tk_Namesapce_ID.key?(ns) - Tk_Namesapce_ID[ns] + if Tk_Namespace_ID_TBL.key?(ns) + Tk_Namespace_ID_TBL[ns] else ns end diff --git a/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb b/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb index 0e57b7c194..3ea1a324cb 100644 --- a/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb +++ b/ext/tk/lib/tkextlib/treectrl/tktreectrl.rb @@ -15,7 +15,7 @@ require 'tkextlib/treectrl/setup.rb' TkPackage.require('treectrl') module Tk - class TreeCtrl_Widget < TkWindow + class TreeCtrl < TkWindow def self.package_version begin TkPackage.require('treectrl') @@ -24,17 +24,37 @@ module Tk end end + # dummy :: + # pkgIndex.tcl of TreeCtrl-1.0 doesn't support auto_load for + # 'loupe' command (probably it is bug, I think). + # So, calling a 'treectrl' command for loading the dll with + # the auto_load facility. + begin + tk_call('treectrl') + rescue + end + def self.loupe(img, x, y, w, h, zoom) + # NOTE: platform == 'unix' only + + # img => TkPhotoImage + # x, y => screen coords + # w, h => magnifier width and height + # zoom => zooming rate + Tk.tk_call_without_enc('loupe', img, x, y, w, h, zoom) + end + class NotifyEvent < TkUtil::CallbackSubst end module ConfigMethod end end + TreeCtrl_Widget = TreeCtrl end ############################################## -class Tk::TreeCtrl_Widget::NotifyEvent +class Tk::TreeCtrl::NotifyEvent # [ <'%' subst-key char>, <proc type char>, <instance var (accessor) name>] KEY_TBL = [ [ ?c, ?n, :item_num ], @@ -94,7 +114,7 @@ end ############################################## -module Tk::TreeCtrl_Widget::ConfigMethod +module Tk::TreeCtrl::ConfigMethod include TkItemConfigMethod def treectrl_tagid(key, obj) @@ -312,8 +332,8 @@ end ############################################## -class Tk::TreeCtrl_Widget - include Tk::TreeCtrl_Widget::ConfigMethod +class Tk::TreeCtrl + include Tk::TreeCtrl::ConfigMethod include Scrollable TkCommandNames = ['treectrl'.freeze].freeze @@ -321,7 +341,7 @@ class Tk::TreeCtrl_Widget WidgetClassNames[WidgetClassName] = self def install_bind(cmd, *args) - install_bind_for_event_class(Tk::TreeCtrl_Widget::NotifyEvent, cmd, *args) + install_bind_for_event_class(Tk::TreeCtrl::NotifyEvent, cmd, *args) end ######################### |