* ext/tcltklib/tcltklib.c (lib_eventloop_ensure): mis-delete a timer

  handler when exit from a recursive called eventloop
* ext/tk/lib/tk/timer.rb: new TkRTTimer class, which can works for a
  realtime operation
* ext/tk/sample/tkrttimer.rb: sample of TkRTTimer class
* ext/tk/lib/tk/textmark.rb: move  TkTextMark#+ and TkTextMark#- to
  TkText::IndexModMethods
* ext/tk/lib/tk/text.rb: improve TkTextMark#+ and TkTextMark#-, and
  add them to TkText::IndexModMethods module
* ext/tk/sample/tktextio.rb: add test part of "seek by text index
  modifiers"


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

1 files changed, 20 insertions, 20 deletions

diff --git a/ext/tk/lib/tk/xim.rb b/ext/tk/lib/tk/xim.rb
index 701cd7531c..0ac8559bb9 100644
--- a/ext/tk/lib/tk/xim.rb
+++ b/ext/tk/lib/tk/xim.rb
@@ -9,34 +9,34 @@ module TkXIM
 
   TkCommandNames = ['imconfigure'.freeze].freeze
 
-  def TkXIM.useinputmethods(value = None, window = nil)
+  def TkXIM.useinputmethods(value = None, win = nil)
     if value == None
-      if window
+      if win
         bool(tk_call_without_enc('tk', 'useinputmethods', 
-                                 '-displayof', window))
+                                 '-displayof', win))
       else
         bool(tk_call_without_enc('tk', 'useinputmethods'))
       end
     else
-      if window
+      if win
         bool(tk_call_without_enc('tk', 'useinputmethods', 
-                                 '-displayof', window, value))
+                                 '-displayof', win, value))
       else
         bool(tk_call_without_enc('tk', 'useinputmethods', value))
       end
     end
   end
 
-  def TkXIM.useinputmethods_displayof(window, value = None)
-    TkXIM.useinputmethods(value, window)
+  def TkXIM.useinputmethods_displayof(win, value = None)
+    TkXIM.useinputmethods(value, win)
   end
 
-  def TkXIM.caret(window, keys=nil)
+  def TkXIM.caret(win, keys=nil)
     if keys
-      tk_call_without_enc('tk', 'caret', window, *hash_kv(keys))
+      tk_call_without_enc('tk', 'caret', win, *hash_kv(keys))
       self
     else
-      lst = tk_split_list(tk_call_without_enc('tk', 'caret', window))
+      lst = tk_split_list(tk_call_without_enc('tk', 'caret', win))
       info = {}
       while key = lst.shift
         info[key[1..-1]] = lst.shift
@@ -45,29 +45,29 @@ module TkXIM
     end
   end
 
-  def TkXIM.configure(window, slot, value=None)
+  def TkXIM.configure(win, slot, value=None)
     begin
       if /^8\.*/ === Tk::TK_VERSION  && JAPANIZED_TK
         if slot.kind_of? Hash
-          tk_call('imconfigure', window, *hash_kv(slot))
+          tk_call('imconfigure', win, *hash_kv(slot))
         else
-          tk_call('imconfigure', window, "-#{slot}", value)
+          tk_call('imconfigure', win, "-#{slot}", value)
         end
       end
     rescue
     end
   end
 
-  def TkXIM.configinfo(window, slot=nil)
+  def TkXIM.configinfo(win, slot=nil)
     if TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
       begin
         if /^8\.*/ === Tk::TK_VERSION  && JAPANIZED_TK
           if slot
-            conf = tk_split_list(tk_call('imconfigure', window, "-#{slot}"))
+            conf = tk_split_list(tk_call('imconfigure', win, "-#{slot}"))
             conf[0] = conf[0][1..-1]
             conf
           else
-            tk_split_list(tk_call('imconfigure', window)).collect{|conf|
+            tk_split_list(tk_call('imconfigure', win)).collect{|conf|
               conf[0] = conf[0][1..-1]
               conf
             }
@@ -79,19 +79,19 @@ module TkXIM
         []
       end
     else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
-      TkXIM.current_configinfo(window, slot)
+      TkXIM.current_configinfo(win, slot)
     end
   end
 
-  def TkXIM.current_configinfo(window, slot=nil)
+  def TkXIM.current_configinfo(win, slot=nil)
     begin
       if /^8\.*/ === Tk::TK_VERSION  && JAPANIZED_TK
         if slot
-          conf = tk_split_list(tk_call('imconfigure', window, "-#{slot}"))
+          conf = tk_split_list(tk_call('imconfigure', win, "-#{slot}"))
           { conf[0][1..-1] => conf[1] }
         else
           ret = {}
-          tk_split_list(tk_call('imconfigure', window)).each{|conf|
+          tk_split_list(tk_call('imconfigure', win)).each{|conf|
             ret[conf[0][1..-1]] = conf[1]
           }
           ret