* ext/tk/lib/tk/timer.rb (TkRTTimer): correct calculation of offset

  value. get a little better accuracy.
* ext/tk/sample/demos-en/widget: use a binding with no local variables
  when eval a sample script.
* ext/tk/sample/demos-en/bind.rb: ditto.
* ext/tk/sample/demos-en/tcolor: ditto.
* ext/tk/sample/demos-jp/widget: ditto.
* ext/tk/sample/demos-jp/bind.rb: ditto.
* ext/tk/sample/demos-jp/tcolor: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8143 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 11 insertions, 6 deletions

diff --git a/ext/tk/sample/demos-jp/tcolor b/ext/tk/sample/demos-jp/tcolor
index fc697df63e..c7f7ec7289 100644
--- a/ext/tk/sample/demos-jp/tcolor
+++ b/ext/tk/sample/demos-jp/tcolor
@@ -124,9 +124,14 @@ def hsbToRgb(hue,sat,value)
 end
 
 
+def _null_binding
+  Module.new.instance_eval{binding}
+end
+private :_null_binding
+
 def doUpdate 
   newCmd = $command.to_s.gsub("%%","\"#{$color}\"")
-  eval(newCmd)
+  eval(newCmd, _null_binding)
 end
 
 
@@ -211,21 +216,21 @@ def tc_loadNamedColor(name)
   else
     case name.length
     when 4
-      format = /#(.{1})(.{1})(.{1})/
+      fmt = /#(.{1})(.{1})(.{1})/
       shift = 12
     when 7
-      format = /#(.{2})(.{2})(.{2})/
+      fmt = /#(.{2})(.{2})(.{2})/
       shift = 8
     when 10
-      format = /#(.{3})(.{3})(.{3})/
+      fmt = /#(.{3})(.{3})(.{3})/
       shift = 4
     when 13
-      format = /#(.{4})(.{4})(.{4})/
+      fmt = /#(.{4})(.{4})(.{4})/
       shift = 0
     else
       raise(eException,"syntax error in color name \"#{name}\"")
     end
-    name.scan(format){|strlist|
+    name.scan(fmt){|strlist|
       if strlist.length != 3
 	raise(eException,"syntax error in color name \"#{name}\"")
       end