github
/
ruby
зеркало из https://github.com/github/ruby.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

* ext/tk/lib/{tk.rb,tk/itemconfig.rb}: configure creates 

TkVariable if key name is 'variable' or 'textvariable'
  by default. [ruby-dev:26749]

* ext/tk/lib/tk/{label,radiobutton}.rb: removed its own
  {variable,textvariable} function.

* ext/tk/lib/tk/variable.rb: retains backward conpatibility.

(written by Hidetoshi NAGAI)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8933 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ocean 2005-08-06 03:44:00 +00:00
Родитель 3c3f54c7a3
Коммит 58d86a2035
8 изменённых файлов: 230 добавлений и 14 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

11
ChangeLog
Просмотреть файл

@ -1,3 +1,14 @@
Sat Aug 6 12:35:24 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/{tk.rb,tk/itemconfig.rb}: configure creates
TkVariable if key name is 'variable' or 'textvariable'
by default. [ruby-dev:26749]
* ext/tk/lib/tk/{label,radiobutton}.rb: removed its own
{variable,textvariable} function.
* ext/tk/lib/tk/variable.rb: retains backward conpatibility.
Fri Aug 5 12:48:31 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* ext/tk/tcltklib.c: fixed memory leak when tk_funcall raised

4
ext/tk/ChangeLog.tkextlib
Просмотреть файл

@ -1,3 +1,7 @@
2005-08-06 ocean <ocean@ruby-lang.org>
* sample/tkextlib/tile/demo.rb: use Tk::Tile::Scale#variable.
2005-08-04 ocean <ocean@ruby-lang.org>
* sample/tkextlib/tile/demo.rb: followed previous changes.

101
ext/tk/lib/tk.rb
Просмотреть файл

@ -2233,10 +2233,13 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
end
def encoding_convertfrom(str, enc=nil)
# str must be a Tcl's internal string expression in enc.
# str is an usual enc string or a Tcl's internal string expression
# in enc (which is returned from 'encoding_convertto' method).
# the return value is a UTF-8 string.
enc = encoding_system unless enc
TkCore::INTERP.__invoke('encoding', 'convertfrom', enc, str)
ret = TkCore::INTERP.__invoke('encoding', 'convertfrom', enc, str)
ret.instance_variable_set('@encoding', 'utf-8')
ret
end
alias encoding_convert_from encoding_convertfrom
@ -2245,7 +2248,9 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
# The return value is a Tcl's internal string expression in enc.
# To get an usual enc string, use Tk.fromUTF8(ret_val, enc).
enc = encoding_system unless enc
TkCore::INTERP.__invoke('encoding', 'convertto', enc, str)
ret = TkCore::INTERP.__invoke('encoding', 'convertto', enc, str)
ret.instance_variable_set('@encoding', 'binary')
ret
end
alias encoding_convert_to encoding_convertto
end
@ -2710,6 +2715,11 @@ module TkConfigMethod
end
private :__numlistval_optkeys
def __tkvariable_optkeys
['variable', 'textvariable']
end
private :__tkvariable_optkeys
def __methodcall_optkeys # { key=>method, ... }
{}
end
@ -2815,6 +2825,10 @@ module TkConfigMethod
fnt
end
when /^(#{__tkvariable_optkeys.join('|')})$/
v = tk_call_without_enc(*(__cget_cmd << "-#{slot}"))
(v.empty?)? nil: TkVarAccess.new(v)
else
tk_tcl2ruby(tk_call_without_enc(*(__cget_cmd << "-#{slot}")), true)
end
@ -2999,6 +3013,28 @@ module TkConfigMethod
when /^(#{__strval_optkeys.join('|')})$/
# conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
when /^(#{__tkvariable_optkeys.join('|')})$/
conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]])
v = conf[__configinfo_struct[:default_value]]
if v.empty?
conf[__configinfo_struct[:default_value]] = nil
else
conf[__configinfo_struct[:default_value]] = TkVarAccess.new(v)
end
end
if ( conf[__configinfo_struct[:current_value]] )
v = conf[__configinfo_struct[:current_value]]
if v.empty?
conf[__configinfo_struct[:current_value]] = nil
else
conf[__configinfo_struct[:current_value]] = TkVarAccess.new(v)
end
end
else
# conf = tk_split_list(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
conf = tk_split_list(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), 0, false, true)
@ -3100,6 +3136,25 @@ module TkConfigMethod
list(conf[__configinfo_struct[:current_value]])
end
when /^(#{__tkvariable_optkeys.join('|')})$/
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]] )
v = conf[__configinfo_struct[:default_value]]
if v.empty?
conf[__configinfo_struct[:default_value]] = nil
else
conf[__configinfo_struct[:default_value]] = TkVarAccess.new(v)
end
end
if ( conf[__configinfo_struct[:current_value]] )
v = conf[__configinfo_struct[:current_value]]
if v.empty?
conf[__configinfo_struct[:current_value]] = nil
else
conf[__configinfo_struct[:current_value]] = TkVarAccess.new(v)
end
end
else
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]] )
@ -3269,6 +3324,27 @@ module TkConfigMethod
list(conf[__configinfo_struct[:current_value]])
end
when /^(#{__tkvariable_optkeys.join('|')})$/
conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]] )
v = conf[__configinfo_struct[:default_value]]
if v.empty?
conf[__configinfo_struct[:default_value]] = nil
else
conf[__configinfo_struct[:default_value]] = TkVarAccess.new(v)
end
end
if ( conf[__configinfo_struct[:current_value]] )
v = conf[__configinfo_struct[:current_value]]
if v.empty?
conf[__configinfo_struct[:current_value]] = nil
else
conf[__configinfo_struct[:current_value]] = TkVarAccess.new(v)
end
end
when /^(#{__strval_optkeys.join('|')})$/
# conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
@ -3376,6 +3452,25 @@ module TkConfigMethod
list(conf[__configinfo_struct[:current_value]])
end
when /^(#{__tkvariable_optkeys.join('|')})$/
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]] )
v = conf[__configinfo_struct[:default_value]]
if v.empty?
conf[__configinfo_struct[:default_value]] = nil
else
conf[__configinfo_struct[:default_value]] = TkVarAccess.new
end
end
if ( conf[__configinfo_struct[:current_value]] )
v = conf[__configinfo_struct[:current_value]]
if v.empty?
conf[__configinfo_struct[:current_value]] = nil
else
conf[__configinfo_struct[:current_value]] = TkVarAccess.new
end
end
else
if ( __configinfo_struct[:default_value] \
&& conf[__configinfo_struct[:default_value]] )

89
ext/tk/lib/tk/itemconfig.rb
Просмотреть файл

@ -40,6 +40,11 @@ module TkItemConfigOptkeys
end
private :__item_numlistval_optkeys
def __item_tkvariable_optkeys
['variable']
end
private :__item_tkvariable_optkeys
def __item_methodcall_optkeys(id) # { key=>method, ... }
# maybe need to override
# {'coords'=>'coords'}
@ -161,6 +166,10 @@ module TkItemConfigMethod
conf
end
when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
v = tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}"))
(v.empty?)? nil: TkVarAccess.new(v)
when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
_fromUTF8(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")))
@ -357,6 +366,27 @@ module TkItemConfigMethod
# conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
v = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
if v.empty?
conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
else
conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkVarAccess.new(v)
end
end
if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
v = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
if v.empty?
conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
else
conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = TkVarAccess.new(v)
end
end
else
# conf = tk_split_list(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
conf = tk_split_list(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), 0, false, true)
@ -458,6 +488,25 @@ module TkItemConfigMethod
list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
end
when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
v = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
if v.empty?
conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
else
conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkVarAccess.new(v)
end
end
if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
v = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
if v.empty?
conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
else
conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = TkVarAccess.new
end
end
else
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
@ -630,6 +679,27 @@ module TkItemConfigMethod
# conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
v = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
if v.empty?
conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
else
conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkVarAccess.new(v)
end
end
if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
v = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
if v.empty?
conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
else
conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = TkVarAccess.new(v)
end
end
else
# conf = tk_split_list(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
conf = tk_split_list(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), 0, false, true)
@ -734,6 +804,25 @@ module TkItemConfigMethod
list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
end
when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
v = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
if v.empty?
conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
else
conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkVarAccess.new(v)
end
end
if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
v = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
if v.empty?
conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
else
conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = TkVarAccess.new(v)
end
end
else
if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
&& conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )

4
ext/tk/lib/tk/label.rb
Просмотреть файл

@ -15,8 +15,4 @@ class TkLabel<TkWindow
# end
#end
#private :create_self
def textvariable(v)
configure 'textvariable', tk_trace_variable(v)
end
end

3
ext/tk/lib/tk/radiobutton.rb
Просмотреть файл

@ -25,9 +25,6 @@ class TkRadioButton<TkButton
tk_send_without_enc('select')
self
end
def variable(v)
configure 'variable', tk_trace_variable(v)
end
def get_value
var = tk_send_without_enc('cget', '-variable')

28
ext/tk/lib/tk/variable.rb
Просмотреть файл

@ -1529,12 +1529,36 @@ end
class TkVarAccess<TkVariable
def self.new(name, *args)
return TkVar_ID_TBL[name] if TkVar_ID_TBL[name]
if name.kind_of?(TkVariable)
name.value = args[0] unless args.empty?
return name
end
if v = TkVar_ID_TBL[name]
v.value = args[0] unless args.empty?
return v
end
super(name, *args)
end
def self.new_hash(name, *args)
return TkVar_ID_TBL[name] if TkVar_ID_TBL[name]
if name.kind_of?(TkVariable)
unless name.is_hash?
fail ArgumentError, "already exist as a scalar variable"
end
name.value = args[0] unless args.empty?
return name
end
if v = TkVar_ID_TBL[name]
unless v.is_hash?
fail ArgumentError, "already exist as a scalar variable"
end
v.value = args[0] unless args.empty?
return v
end
INTERP._invoke_without_enc('global', name)
if args.empty? && INTERP._invoke_without_enc('array', 'exist', name) == '0'
self.new(name, {}) # force creating

4
ext/tk/sample/tkextlib/tile/demo.rb
Просмотреть файл

@ -549,8 +549,8 @@ else # tile 0.5 or earlier
scale.command{|value| progress.set(value)}
vscale.command{|value| vprogress.set(value)}
else # this would also work. (via TkVariable#trace)
v1 = $V.ref(:SCALE)
v2 = $V.ref(:VSCALE)
v1 = scale.variable
v2 = vscale.variable
v1.trace('w', proc{ progress.set(v1.value) })
v2.trace('w', proc{ vprogress.set(v2.value) })
end