diff options
author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-10-22 22:16:33 +0000 |
---|---|---|
committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-10-22 22:16:33 +0000 |
commit | a3d7c3b80984d58d849eb774f43364aadf077e2a (patch) | |
tree | c9552a229e194096f8ef09fe4edf551b66bfd479 /ext/tk/lib/tkextlib/blt | |
parent | 2e4c479a6bef19468d430b7291d911581ae13dfe (diff) |
* ext/tcltklib/extconf.rb: improbe messages [ruby-core:06325].
* ext/tk/lib/tk.rb, ext/tk/lib/tk/canvas.rb, ext/tk/lib/tk/entry.rb,
ext/tk/lib/tk/frame.rb, ext/tk/lib/tk/image.rb,
ext/tk/lib/tk/itemconfig.rb, ext/tk/lib/tk/labelframe.rb,
ext/tk/lib/tk/listbox.rb, ext/tk/lib/tk/menu.rb,
ext/tk/lib/tk/radiobutton.rb, ext/tk/lib/tk/scale.rb,
ext/tk/lib/tk/spinbox.rb, ext/tk/lib/tk/text.rb,
ext/tk/lib/tk/toplevel.rb: improve conversion of option values.
* ext/tk/lib/tkextlib/*: ditto.
* ext/tk/lib/tkextlib/*: update to support ActiveTcl8.4.11.2.
* ext/tk/lib/tkextlib/trofs/*: support Trofs 0.4.3.
* ext/tk/lib/tkextlib/tile/*: support Tile 0.7.2.
* ext/tk/lib/tkextlib/vu/*: support vu 2.3.0.
* ext/tk/lib/tkextlib/tcllib/*: support Tcllib 1.8 (Tklib 0.3).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9447 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk/lib/tkextlib/blt')
-rw-r--r-- | ext/tk/lib/tkextlib/blt/barchart.rb | 5 | ||||
-rw-r--r-- | ext/tk/lib/tkextlib/blt/component.rb | 5 | ||||
-rw-r--r-- | ext/tk/lib/tkextlib/blt/container.rb | 5 | ||||
-rw-r--r-- | ext/tk/lib/tkextlib/blt/dragdrop.rb | 15 | ||||
-rw-r--r-- | ext/tk/lib/tkextlib/blt/eps.rb | 17 | ||||
-rw-r--r-- | ext/tk/lib/tkextlib/blt/graph.rb | 2 | ||||
-rw-r--r-- | ext/tk/lib/tkextlib/blt/htext.rb | 5 | ||||
-rw-r--r-- | ext/tk/lib/tkextlib/blt/stripchart.rb | 3 | ||||
-rw-r--r-- | ext/tk/lib/tkextlib/blt/table.rb | 5 | ||||
-rw-r--r-- | ext/tk/lib/tkextlib/blt/tabset.rb | 15 | ||||
-rw-r--r-- | ext/tk/lib/tkextlib/blt/treeview.rb | 20 |
11 files changed, 90 insertions, 7 deletions
diff --git a/ext/tk/lib/tkextlib/blt/barchart.rb b/ext/tk/lib/tkextlib/blt/barchart.rb index 241ce11632..cb481c5889 100644 --- a/ext/tk/lib/tkextlib/blt/barchart.rb +++ b/ext/tk/lib/tkextlib/blt/barchart.rb @@ -17,12 +17,13 @@ module Tk::BLT include GraphCommand def __boolval_optkeys - ['bufferelements', 'invertxy'] + ['bufferelements', 'buffergraph', 'invertxy'] end private :__boolval_optkeys def __strval_optkeys - ['text', 'label', 'title', 'file'] + ['text', 'label', 'title', 'file', + 'background', 'plotbackground'] end private :__strval_optkeys diff --git a/ext/tk/lib/tkextlib/blt/component.rb b/ext/tk/lib/tkextlib/blt/component.rb index 0b58195c96..ad78a5430b 100644 --- a/ext/tk/lib/tkextlib/blt/component.rb +++ b/ext/tk/lib/tkextlib/blt/component.rb @@ -30,7 +30,8 @@ module Tk::BLT def __item_strval_optkeys(id) ['text', 'label', 'limits', 'title', - 'show', 'file', 'maskdata', 'maskfile'] + 'show', 'file', 'maskdata', 'maskfile', + 'color', 'titlecolor', 'fill', 'outline', 'offdash'] end private :__item_strval_optkeys @@ -40,7 +41,7 @@ module Tk::BLT private :__item_listval_optkeys def __item_numlistval_optkeys(id) - ['dashes'] + ['dashes', 'majorticks', 'minorticks'] end private :__item_numlistval_optkeys diff --git a/ext/tk/lib/tkextlib/blt/container.rb b/ext/tk/lib/tkextlib/blt/container.rb index ef711bbcc6..60ba1dec1e 100644 --- a/ext/tk/lib/tkextlib/blt/container.rb +++ b/ext/tk/lib/tkextlib/blt/container.rb @@ -13,6 +13,11 @@ module Tk::BLT WidgetClassNames[WidgetClassName] = self end + def __strval_optkeys + super() << 'name' + end + private :__strval_optkeys + def find_command(pat) list(tk_send_without_enc(tk_call(self.path, 'find', '-command', pat))) end diff --git a/ext/tk/lib/tkextlib/blt/dragdrop.rb b/ext/tk/lib/tkextlib/blt/dragdrop.rb index 3d7d652dde..68fb9e591a 100644 --- a/ext/tk/lib/tkextlib/blt/dragdrop.rb +++ b/ext/tk/lib/tkextlib/blt/dragdrop.rb @@ -39,6 +39,21 @@ module Tk::BLT end private :__item_config_cmd + def __item_boolval_optkeys(id) + super(id) << 'selftarget' + end + private :__item_boolval_optkeys + + def __item_listval_optkeys(id) + super(id) << 'send' + end + private :__item_listval_optkeys + + def __item_strval_optkeys(id) + super(id) << 'rejectbg' << 'rejectfg' << 'tokenbg' + end + private :__item_strval_optkeys + undef itemcget private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo diff --git a/ext/tk/lib/tkextlib/blt/eps.rb b/ext/tk/lib/tkextlib/blt/eps.rb index 43b2f8adc0..586a42470c 100644 --- a/ext/tk/lib/tkextlib/blt/eps.rb +++ b/ext/tk/lib/tkextlib/blt/eps.rb @@ -13,3 +13,20 @@ module Tk::BLT CItemTypeToClass[CItemTypeName] = self end end + +class TkCanvas + alias __BLT_EPS_item_strval_optkeys __item_strval_optkeys + def __item_strval_optkeys(id) + __BLT_EPS_item_strval_optkeys(id) + [ + 'shadowcolor', 'title', 'titlecolor' + ] + end + private :__item_strval_optkeys + + alias __BLT_EPS_item_boolval_optkeys __item_boolval_optkeys + def __item_boolval_optkeys(id) + __BLT_EPS_item_boolval_optkeys(id) + ['showimage'] + end + private :__item_boolval_optkeys +end + diff --git a/ext/tk/lib/tkextlib/blt/graph.rb b/ext/tk/lib/tkextlib/blt/graph.rb index e9fbdd587a..9ae99bff5c 100644 --- a/ext/tk/lib/tkextlib/blt/graph.rb +++ b/ext/tk/lib/tkextlib/blt/graph.rb @@ -22,7 +22,7 @@ module Tk::BLT private :__boolval_optkeys def __strval_optkeys - ['text', 'label', 'title', 'file'] + ['text', 'label', 'title', 'file', 'plotbackground'] end private :__strval_optkeys diff --git a/ext/tk/lib/tkextlib/blt/htext.rb b/ext/tk/lib/tkextlib/blt/htext.rb index 3bc35b7e10..a0cf3dc036 100644 --- a/ext/tk/lib/tkextlib/blt/htext.rb +++ b/ext/tk/lib/tkextlib/blt/htext.rb @@ -26,6 +26,11 @@ module Tk::BLT alias window_configuinfo itemconfiginfo alias current_window_configuinfo current_itemconfiginfo + def __strval_optkeys + super() << 'filename' + end + private :__strval_optkeys + def append(win, keys={}) tk_send('append', _epath(win), keys) self diff --git a/ext/tk/lib/tkextlib/blt/stripchart.rb b/ext/tk/lib/tkextlib/blt/stripchart.rb index 64c5c1abf8..fe5afbb095 100644 --- a/ext/tk/lib/tkextlib/blt/stripchart.rb +++ b/ext/tk/lib/tkextlib/blt/stripchart.rb @@ -22,7 +22,8 @@ module Tk::BLT private :__boolval_optkeys def __strval_optkeys - ['text', 'label', 'title', 'file'] + ['text', 'label', 'title', 'file', + 'background', 'plotbackground'] end private :__strval_optkeys diff --git a/ext/tk/lib/tkextlib/blt/table.rb b/ext/tk/lib/tkextlib/blt/table.rb index dc9cd0627e..fc1bf54e65 100644 --- a/ext/tk/lib/tkextlib/blt/table.rb +++ b/ext/tk/lib/tkextlib/blt/table.rb @@ -140,6 +140,11 @@ class << Tk::BLT::Table private :__itemcget, :__itemconfigure private :__itemconfiginfo, :__current_itemconfiginfo + def __boolval_optkeys + super() << 'propagate' + end + private :__boolval_optkeys + def tagid(tag) if tag.kind_of?(Array) case tag[0] diff --git a/ext/tk/lib/tkextlib/blt/tabset.rb b/ext/tk/lib/tkextlib/blt/tabset.rb index 693cce5073..c26b6ee001 100644 --- a/ext/tk/lib/tkextlib/blt/tabset.rb +++ b/ext/tk/lib/tkextlib/blt/tabset.rb @@ -189,6 +189,16 @@ module Tk::BLT ######################################## + def __boolval_optkeys + super() << 'samewidth' << 'tearoff' + end + private :__strval_optkeys + + def __strval_optkeys + super() << 'tabbackground' << 'tabforeground' + end + private :__strval_optkeys + def __item_cget_cmd(id) [self.path, 'tab', 'cget', id] end @@ -213,6 +223,11 @@ module Tk::BLT alias tab_configinfo itemconfiginfo alias current_tab_configinfo current_itemconfiginfo + def __item_strval_optkeys(id) + super(id) << 'shadow' + end + private :__item_strval_optkeys + def tagid(tab) if tab.kind_of?(Tk::BLT::Tabset::Tab) tab.id diff --git a/ext/tk/lib/tkextlib/blt/treeview.rb b/ext/tk/lib/tkextlib/blt/treeview.rb index 4687d41b55..0343d28b9c 100644 --- a/ext/tk/lib/tkextlib/blt/treeview.rb +++ b/ext/tk/lib/tkextlib/blt/treeview.rb @@ -44,6 +44,19 @@ module Tk::BLT::Treeview::ConfigMethod end private :__item_boolval_optkeys + def __item_strval_optkeys(id) + case id + when Array + # id := [ 'column', name ] + super() << 'titleforeground' << 'titleshadow' + when 'sort' + ['decreasing'] + else + [] + end + end + private :__item_strval_optkeys + def __item_listval_optkeys(id) case id when 'entry' @@ -197,11 +210,16 @@ class Tk::BLT::Treeview ######################## def __boolval_optkeys - ['autocreate', 'exportselection', 'flat', 'hideroot', + ['autocreate', 'allowduplicates', 'exportselection', 'flat', 'hideroot', 'newtags', 'showtitles', 'sortselection'] end private :__boolval_optkeys + def __strval_optkeys + super() + ['focusforeground', 'linecolor', 'separator', 'trim'] + end + private :__strval_optkeys + ######################## class OpenCloseCommand < TkValidateCommand |