From 94d960beb57ead291992a6ceb34871b377ade1d1 Mon Sep 17 00:00:00 2001 From: nagai Date: Mon, 11 Oct 2004 04:51:21 +0000 Subject: * ext/tk/lib/tk/*: untabify git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7029 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/tk/lib/tk/optionobj.rb | 148 ++++++++++++++++++++++----------------------- 1 file changed, 74 insertions(+), 74 deletions(-) (limited to 'ext/tk/lib/tk/optionobj.rb') diff --git a/ext/tk/lib/tk/optionobj.rb b/ext/tk/lib/tk/optionobj.rb index 2c8a1efd5e..8fe7e0ee5a 100644 --- a/ext/tk/lib/tk/optionobj.rb +++ b/ext/tk/lib/tk/optionobj.rb @@ -25,32 +25,32 @@ module Tk def observs @observ.collect{|win| - if win.kind_of?(Array) - win[0] - else - win - end + if win.kind_of?(Array) + win[0] + else + win + end } end def _remove_win(win) if win.kind_of?(Array) - widget, method = win - @observ.delete_if{|x| - if x.kind_of?(Array) - x[0] == widget - else - x == widget - end - } + widget, method = win + @observ.delete_if{|x| + if x.kind_of?(Array) + x[0] == widget + else + x == widget + end + } else - @observ.delete_if{|x| - if x.kind_of?(Array) - x[0] == win - else - x == win - end - } + @observ.delete_if{|x| + if x.kind_of?(Array) + x[0] == win + else + x == win + end + } end end private :_remove_win @@ -81,27 +81,27 @@ module Tk # #==> set all of them # wins.each{|win| - _remove_win(win) - @observ << win - notify(win) + _remove_win(win) + @observ << win + notify(win) } self end def unassign(*wins) wins.each{|win| - _remove_win(win) + _remove_win(win) } self end def notify(target = nil) if target - targets = [target] + targets = [target] elsif @observ.empty? - return self + return self else - targets = @observ.dup + targets = @observ.dup end return self if empty? @@ -109,50 +109,50 @@ module Tk org_hash = _symbolkey2str(self) targets.each{|win| - widget = receiver = win - hash = org_hash - begin - if win.kind_of?(Array) - widget, method, conv_tbl = win - receiver = widget - - if conv_tbl - hash = {} - org_hash.each{|key, val| - key = conv_tbl[key] if conv_tbl.key?(key) - next unless key - if key.kind_of?(Array) - key.each{|k| hash[k] = val} - else - hash[key] = val - end - } - end - - if method.kind_of?(Array) - receiver, method, *args = method - receiver.__send__(method, *(args << hash)) - elsif method - widget.__send__(method, hash) - else - widget.configure(hash) - end - - else - widget.configure(self) - end - rescue => e - if ( ( widget.kind_of?(TkObject) \ - && widget.respond_to?('exist?') \ - && ! receiver.exist? ) \ - || ( receiver.kind_of?(TkObject) \ - && receiver.respond_to?('exist?') \ - && ! receiver.exist? ) ) - @observ.delete(win) - else - fail e - end - end + widget = receiver = win + hash = org_hash + begin + if win.kind_of?(Array) + widget, method, conv_tbl = win + receiver = widget + + if conv_tbl + hash = {} + org_hash.each{|key, val| + key = conv_tbl[key] if conv_tbl.key?(key) + next unless key + if key.kind_of?(Array) + key.each{|k| hash[k] = val} + else + hash[key] = val + end + } + end + + if method.kind_of?(Array) + receiver, method, *args = method + receiver.__send__(method, *(args << hash)) + elsif method + widget.__send__(method, hash) + else + widget.configure(hash) + end + + else + widget.configure(self) + end + rescue => e + if ( ( widget.kind_of?(TkObject) \ + && widget.respond_to?('exist?') \ + && ! receiver.exist? ) \ + || ( receiver.kind_of?(TkObject) \ + && receiver.respond_to?('exist?') \ + && ! receiver.exist? ) ) + @observ.delete(win) + else + fail e + end + end } self @@ -161,7 +161,7 @@ module Tk def +(hash) unless hash.kind_of?(Hash) - fail ArgumentError, "expect a Hash" + fail ArgumentError, "expect a Hash" end new_obj = self.dup new_obj.update_without_notify(_symbolkey2str(hash)) @@ -177,9 +177,9 @@ module Tk def configure(key, value=nil) if key.kind_of?(Hash) - update(key) + update(key) else - store(key,value) + store(key,value) end end -- cgit v1.2.3