From 3a47cf3395dd4c4fe8bdd5df13aab698f2ca314b Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 15 May 2011 11:55:52 +0000 Subject: * remove trailing spaces. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/tk/lib/multi-tk.rb | 8 ++++---- ext/tk/lib/tk.rb | 4 ++-- ext/tk/lib/tk/autoload.rb | 10 +++++----- ext/tk/lib/tk/fontchooser.rb | 12 ++++++------ ext/tk/lib/tk/menuspec.rb | 2 +- ext/tk/lib/tk/ttk_selector.rb | 2 +- ext/tk/lib/tkextlib/tcllib/canvas_sqmap.rb | 2 +- ext/tk/lib/tkextlib/tcllib/canvas_zoom.rb | 2 +- ext/tk/lib/tkextlib/tcllib/chatwidget.rb | 4 ++-- ext/tk/lib/tkextlib/tcllib/ip_entry.rb | 2 +- ext/tk/lib/tkextlib/tcllib/khim.rb | 4 ++-- ext/tk/lib/tkextlib/tcllib/plotchart.rb | 14 +++++++------- ext/tk/lib/tkextlib/tcllib/tablelist.rb | 2 +- ext/tk/lib/tkextlib/tcllib/tablelist_core.rb | 12 ++++++------ ext/tk/lib/tkextlib/tile/sizegrip.rb | 2 +- ext/tk/lib/tkextlib/tile/style.rb | 2 +- 16 files changed, 42 insertions(+), 42 deletions(-) (limited to 'ext/tk/lib') diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb index efeaf9830a..b125c6e18e 100644 --- a/ext/tk/lib/multi-tk.rb +++ b/ext/tk/lib/multi-tk.rb @@ -774,7 +774,7 @@ class MultiTkIp ensure # interp must be deleted before the thread for interp is dead. - # If not, raise Tcl_Panic on Tcl_AsyncDelete because async handler + # If not, raise Tcl_Panic on Tcl_AsyncDelete because async handler # deleted by the wrong thread. interp.delete end @@ -1933,7 +1933,7 @@ class MultiTkIp end =end def cb_eval(cmd, *args) - self.eval_callback(*args, + self.eval_callback(*args, &_proc_on_safelevel{|*params| TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *params)) }) @@ -2121,7 +2121,7 @@ class MultiTkIp end err } - $SAFE=safe if $SAFE < safe; + $SAFE=safe if $SAFE < safe; begin yield(*args) rescue Exception => e @@ -2300,7 +2300,7 @@ end current[:callback_ip] = backup_ip end else - eval_proc_core(true, + eval_proc_core(true, proc{|safe, *params| Thread.new{cmd.call(safe, *params)}.value }, diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb index f00afe9ea0..0fd8cfdb20 100644 --- a/ext/tk/lib/tk.rb +++ b/ext/tk/lib/tk.rb @@ -1306,7 +1306,7 @@ EOS ensure # interp must be deleted before the thread for interp is dead. - # If not, raise Tcl_Panic on Tcl_AsyncDelete because async handler + # If not, raise Tcl_Panic on Tcl_AsyncDelete because async handler # deleted by the wrong thread. interp.delete end @@ -1339,7 +1339,7 @@ EOS INTERP.instance_eval{ # @tk_cmd_tbl = TkUtil.untrust({}) - @tk_cmd_tbl = + @tk_cmd_tbl = TkUtil.untrust(Hash.new{|hash, key| fail IndexError, "unknown command ID '#{key}'" }) diff --git a/ext/tk/lib/tk/autoload.rb b/ext/tk/lib/tk/autoload.rb index 2ebee9ea24..f6ca261da9 100644 --- a/ext/tk/lib/tk/autoload.rb +++ b/ext/tk/lib/tk/autoload.rb @@ -538,8 +538,8 @@ class << Tk @TOPLEVEL_ALIAS_TABLE[target][sym] = obj else # NOT topalias_defined?(sym) - # Nobody controls ALIAS[sym]. - # At leaset, current widget set doesn't control ALIAS[sym]. + # Nobody controls ALIAS[sym]. + # At leaset, current widget set doesn't control ALIAS[sym]. # Keep Object::sym (even if it is not defined) # Keep OWNER[sym]. @TOPLEVEL_ALIAS_TABLE[target][sym] = obj @@ -552,7 +552,7 @@ class << Tk @TOPLEVEL_ALIAS_TABLE[target][sym] = obj replace_topalias(sym, obj) replace_topobj(sym, obj) - + when nil # New definition for sym @TOPLEVEL_ALIAS_OWNER[sym] = target @@ -566,7 +566,7 @@ class << Tk # Keep ALIAS[sym]. # Keep OWNER[sym]. @TOPLEVEL_ALIAS_TABLE[target][sym] = obj - + end end @@ -583,7 +583,7 @@ class << Tk def __set_loaded_toplevel_aliases__(autopath, target, obj, *symbols) # autopath is an autoload file - # Currently, this method doesn't support that autoload loads + # Currently, this method doesn't support that autoload loads # different toplevels between .rb and .so extension. shortpath = (autopath =~ /^(.*)(.rb|.so)$/)? $1: autopath target = target.to_sym diff --git a/ext/tk/lib/tk/fontchooser.rb b/ext/tk/lib/tk/fontchooser.rb index 092ffc04bf..694c58a607 100644 --- a/ext/tk/lib/tk/fontchooser.rb +++ b/ext/tk/lib/tk/fontchooser.rb @@ -86,7 +86,7 @@ class << TkFont::Chooser def configure(option, value=None) if option.kind_of? Hash - tk_call('tk', 'fontchooser', 'configure', + tk_call('tk', 'fontchooser', 'configure', *hash_kv(_symbolkey2str(option))) else opt = option.to_s @@ -141,8 +141,8 @@ class << TkFont::Chooser def set_for(target, title="Font") if target.kind_of? TkFont configs = { - :font=>target.actual_hash, - :command=>proc{|fnt, *args| + :font=>target.actual_hash, + :command=>proc{|fnt, *args| target.configure(TkFont.actual_hash(fnt)) } } @@ -152,14 +152,14 @@ class << TkFont::Chooser fnt = fnt.actual_hash if fnt.kind_of?(TkFont) configs = { :font => fnt, - :command=>proc{|fnt, *args| + :command=>proc{|fnt, *args| target[:font] = TkFont.actual_hash(fnt) } } else configs = { - :font=>target.cget_tkstring(:font), - :command=>proc{|fnt, *args| + :font=>target.cget_tkstring(:font), + :command=>proc{|fnt, *args| target.font = TkFont.actual_hash_displayof(fnt, target) } } diff --git a/ext/tk/lib/tk/menuspec.rb b/ext/tk/lib/tk/menuspec.rb index 9521a157d9..cb3597eec9 100644 --- a/ext/tk/lib/tk/menuspec.rb +++ b/ext/tk/lib/tk/menuspec.rb @@ -27,7 +27,7 @@ # # A menu_info is an array of menu entries: # [ entry_info, entry_info, ... ] -# +# # # underline, accelerator, and configs are optional pearameters. # Hashes are OK instead of Arrays. Then the entry type ('command', diff --git a/ext/tk/lib/tk/ttk_selector.rb b/ext/tk/lib/tk/ttk_selector.rb index 522249e6a9..cc9e9928cb 100644 --- a/ext/tk/lib/tk/ttk_selector.rb +++ b/ext/tk/lib/tk/ttk_selector.rb @@ -62,7 +62,7 @@ module Tk major, minor, type, patchlevel = TclTkLib.get_version # ttk::spinbox is supported on Tcl/Tk8.6b1 or later - if ([major,minor,type,patchlevel] <=> + if ([major,minor,type,patchlevel] <=> [8,6,TclTkLib::RELEASE_TYPE::BETA,1]) >= 0 @TOPLEVEL_ALIAS_TABLE[:Ttk].update( :TkSpinbox => 'tkextlib/tile/tspinbox' diff --git a/ext/tk/lib/tkextlib/tcllib/canvas_sqmap.rb b/ext/tk/lib/tkextlib/tcllib/canvas_sqmap.rb index 0bd59511c1..ba87cd3aae 100644 --- a/ext/tk/lib/tkextlib/tcllib/canvas_sqmap.rb +++ b/ext/tk/lib/tkextlib/tcllib/canvas_sqmap.rb @@ -3,7 +3,7 @@ # by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp) # # * Part of tcllib extension -# * +# * # require 'tk' diff --git a/ext/tk/lib/tkextlib/tcllib/canvas_zoom.rb b/ext/tk/lib/tkextlib/tcllib/canvas_zoom.rb index e2a5061112..f4ffb48ece 100644 --- a/ext/tk/lib/tkextlib/tcllib/canvas_zoom.rb +++ b/ext/tk/lib/tkextlib/tcllib/canvas_zoom.rb @@ -3,7 +3,7 @@ # by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp) # # * Part of tcllib extension -# * +# * # require 'tk' diff --git a/ext/tk/lib/tkextlib/tcllib/chatwidget.rb b/ext/tk/lib/tkextlib/tcllib/chatwidget.rb index 860b9e899b..ddb0340c31 100644 --- a/ext/tk/lib/tkextlib/tcllib/chatwidget.rb +++ b/ext/tk/lib/tkextlib/tcllib/chatwidget.rb @@ -3,7 +3,7 @@ # by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp) # # * Part of tcllib extension -# * chatwidget - Provides a multi-paned view suitable for display of +# * chatwidget - Provides a multi-paned view suitable for display of # chat room or irc channel information # @@ -92,7 +92,7 @@ class Tk::Tcllib::ChatWidget def hook_add(type, *args, &blk) # args -> [prior, cmd], [prior], [cmd] #type -> 'message', 'post', 'names_group', 'names_nick', 'chatstate', 'url' - + if prior = args.shift if !prior.kind_of?(Numeric) cmd = prior diff --git a/ext/tk/lib/tkextlib/tcllib/ip_entry.rb b/ext/tk/lib/tkextlib/tcllib/ip_entry.rb index e5e0f8d42d..4878cc3c23 100644 --- a/ext/tk/lib/tkextlib/tcllib/ip_entry.rb +++ b/ext/tk/lib/tkextlib/tcllib/ip_entry.rb @@ -70,6 +70,6 @@ class Tk::Tcllib::IP_Entry end end -class Tk::Tcllib::IP_Entry6 < Tk::Tcllib::IP_Entry +class Tk::Tcllib::IP_Entry6 < Tk::Tcllib::IP_Entry TkCommandNames = ['::ipentry::ipentry6'.freeze].freeze end diff --git a/ext/tk/lib/tkextlib/tcllib/khim.rb b/ext/tk/lib/tkextlib/tcllib/khim.rb index 00acff91d9..5dc2130b35 100644 --- a/ext/tk/lib/tkextlib/tcllib/khim.rb +++ b/ext/tk/lib/tkextlib/tcllib/khim.rb @@ -43,11 +43,11 @@ class Tk::Tcllib::KHIM def self.set_config(*args) if args.length == 1 - # cmd_string generated by + # cmd_string generated by #Tk.ip_eval_without_enc(cmd_string) Tk.ip_eval(cmd_string) else - # args for setConfig command + # args for setConfig command #Tk.tk_call_without_enc('::khim::setConfig', *args) Tk.tk_call('::khim::setConfig', *args) end diff --git a/ext/tk/lib/tkextlib/tcllib/plotchart.rb b/ext/tk/lib/tkextlib/tcllib/plotchart.rb index 3c944bb266..2f3d79d427 100644 --- a/ext/tk/lib/tkextlib/tcllib/plotchart.rb +++ b/ext/tk/lib/tkextlib/tcllib/plotchart.rb @@ -221,7 +221,7 @@ module Tk::Tcllib::Plotchart end def legend(series, text) - tk_call_without_enc(@chart, 'legend', + tk_call_without_enc(@chart, 'legend', _get_eval_enc_str(series), _get_eval_enc_str(text)) self end @@ -238,7 +238,7 @@ module Tk::Tcllib::Plotchart text, dir = args - tk_call_without_enc(@chart, 'balloon', x, y, + tk_call_without_enc(@chart, 'balloon', x, y, _get_eval_enc_str(text), dir) self end @@ -263,7 +263,7 @@ module Tk::Tcllib::Plotchart text, dir = args - tk_call_without_enc(@chart, 'plaintext', x, y, + tk_call_without_enc(@chart, 'plaintext', x, y, _get_eval_enc_str(text), dir) self end @@ -485,7 +485,7 @@ module Tk::Tcllib::Plotchart end def dot(series, xcrd, ycrd, value) - tk_call_without_enc(@chart, 'dot', _get_eval_enc_str(series), + tk_call_without_enc(@chart, 'dot', _get_eval_enc_str(series), xcrd, ycrd, value) self end @@ -804,7 +804,7 @@ module Tk::Tcllib::Plotchart private :_create_chart def plot(label, yvalue, color) - tk_call_without_enc(@chart, 'plot', _get_eval_enc_str(label), + tk_call_without_enc(@chart, 'plot', _get_eval_enc_str(label), _get_eval_enc_str(yvalue), color) self end @@ -1262,8 +1262,8 @@ module Tk::Tcllib::Plotchart # time_begin := String of time format (e.g. "1 january 2004") # time_end := String of time format (e.g. "1 january 2004") # args := Expected/maximum number of items - # ( This determines the vertical spacing. ), - # Expected/maximum width of items, + # ( This determines the vertical spacing. ), + # Expected/maximum width of items, # Option Hash ( { key=>value, ... } ) if args[0].kind_of?(String) @time_begin = args.shift diff --git a/ext/tk/lib/tkextlib/tcllib/tablelist.rb b/ext/tk/lib/tkextlib/tcllib/tablelist.rb index b40f7a5b8b..bf5ab6620a 100644 --- a/ext/tk/lib/tkextlib/tcllib/tablelist.rb +++ b/ext/tk/lib/tkextlib/tcllib/tablelist.rb @@ -10,7 +10,7 @@ require 'tkextlib/tcllib.rb' # check Tile extension :: If already loaded, use tablelist_tile. unless defined? Tk::Tcllib::Tablelist_usingTile - Tk::Tcllib::Tablelist_usingTile = + Tk::Tcllib::Tablelist_usingTile = TkPackage.provide('tile') || TkPackage.provide('Ttk') end diff --git a/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb b/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb index 850e75d845..2a5c415cc7 100644 --- a/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb +++ b/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb @@ -419,7 +419,7 @@ class Tk::Tcllib::Tablelist columnwidth(idx, 'total') end - def configcelllist(lst) # lst ==> [idx, opt, val, idx, opt, val, ...] + def configcelllist(lst) # lst ==> [idx, opt, val, idx, opt, val, ...] ary = [] lst.slice(3){|idx, opt, val| ary << _to_idx(idx) << "-#{opt}" << val @@ -439,7 +439,7 @@ class Tk::Tcllib::Tablelist end alias config_cells configcells - def configcolumnlist(lst) # lst ==> [idx, opt, val, idx, opt, val, ...] + def configcolumnlist(lst) # lst ==> [idx, opt, val, idx, opt, val, ...] ary = [] lst.slice(3){|idx, opt, val| ary << _to_idx(idx) << "-#{opt}" << val @@ -459,7 +459,7 @@ class Tk::Tcllib::Tablelist end alias config_columns configcolumns - def configrowlist(lst) # lst ==> [idx, opt, val, idx, opt, val, ...] + def configrowlist(lst) # lst ==> [idx, opt, val, idx, opt, val, ...] ary = [] lst.slice(3){|idx, opt, val| ary << _to_idx(idx) << "-#{opt}" << val @@ -841,11 +841,11 @@ class Tk::Tcllib::Tablelist # default of 'labelcommand' option - DEFAULT_labelcommand_value = + DEFAULT_labelcommand_value = DEFAULT_sortByColumn_cmd = '::tablelist::sortByColumn' # default of 'labelcommand2' option - DEFAULT_labelcommand2_value = + DEFAULT_labelcommand2_value = DEFAULT_addToSortColumns_cmd = '::tablelist::addToSortColumns' def sortByColumn_with_event_generate(idx) @@ -1053,7 +1053,7 @@ class << Tk::Tcllib::Tablelist else gmt = None end - Tk.tk_call('::tablelist::addDateTimeMentry', + Tk.tk_call('::tablelist::addDateTimeMentry', format, date_sep, time_sep, gmt, name) end diff --git a/ext/tk/lib/tkextlib/tile/sizegrip.rb b/ext/tk/lib/tkextlib/tile/sizegrip.rb index d7da0a4075..9947e0d870 100644 --- a/ext/tk/lib/tkextlib/tile/sizegrip.rb +++ b/ext/tk/lib/tkextlib/tile/sizegrip.rb @@ -28,5 +28,5 @@ end #Tk.__set_toplevel_aliases__(:Ttk, Tk::Tile::Sizegrip, # :TkSizegrip, :TkSizeGrip) Tk.__set_loaded_toplevel_aliases__('tkextlib/tile/sizegrip.rb', - :Ttk, Tk::Tile::Sizegrip, + :Ttk, Tk::Tile::Sizegrip, :TkSizegrip, :TkSizeGrip) diff --git a/ext/tk/lib/tkextlib/tile/style.rb b/ext/tk/lib/tkextlib/tile/style.rb index f38deda503..108d81f88b 100644 --- a/ext/tk/lib/tkextlib/tile/style.rb +++ b/ext/tk/lib/tkextlib/tile/style.rb @@ -295,7 +295,7 @@ class << Tk::Tile::Style fail ArgumentError, "too many arguments" unless args.empty? # define a Microsoft Visual Styles element - tk_call(TkCommandNames[0], 'element', 'create', name, 'vsapi', + tk_call(TkCommandNames[0], 'element', 'create', name, 'vsapi', class_name, part_id, state_map, opts) end -- cgit v1.2.3