tk 0.1.0 → 0.4.0

data/lib/tk/variable.rb

@@ -17,7 +17,7 @@ class TkVariable
   #TkVar_ID_TBL = {}
   TkVar_CB_TBL = TkCore::INTERP.create_table
   TkVar_ID_TBL = TkCore::INTERP.create_table
-  (Tk_VARIABLE_ID = ["v".freeze, TkUtil.untrust("00000")]).instance_eval{
+  (Tk_VARIABLE_ID = ["v".freeze, "00000"]).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze
@@ -27,7 +27,7 @@ class TkVariable
     TkVar_ID_TBL.mutex.synchronize{ TkVar_ID_TBL.clear }
   }
 
-  major, minor, type, patchlevel = TclTkLib.get_version
+  major, minor, _, _ = TclTkLib.get_version
   USE_OLD_TRACE_OPTION_STYLE = (major < 8) || (major == 8 && minor < 4)
 
   #TkCore::INTERP.add_tk_procs('rb_var', 'args',
@@ -131,9 +131,9 @@ class TkVariable
     self
   end
   alias default_value= set_default_value
-  def default_proc(cmd = Proc.new)
+  def default_proc(cmd = nil, &block)
     @def_default = :proc
-    @default_val = cmd
+    @default_val = cmd || block
     self
   end
 
@@ -1372,7 +1372,8 @@ end
   end
   private :_check_trace_opt
 
-  def trace(opts, cmd = Proc.new)
+  def trace(opts, cmd = nil, &block)
+    cmd ||= block
     opts = _check_trace_opt(opts)
     (@trace_var ||= []).unshift([opts,cmd])
 
@@ -1412,7 +1413,8 @@ end
     self
   end
 
-  def trace_element(elem, opts, cmd = Proc.new)
+  def trace_element(elem, opts, cmd = nil, &block)
+    cmd ||= block
     if @elem
       fail(RuntimeError,
            "invalid for a TkVariable which denotes an element of Tcl's array")
@@ -1770,11 +1772,11 @@ module Tk
   begin
     INTERP._invoke_without_enc('global', 'auto_path')
     auto_path = INTERP._invoke('set', 'auto_path')
-  rescue => e
+  rescue
     begin
       INTERP._invoke_without_enc('global', 'env')
       auto_path = INTERP._invoke('set', 'env(TCLLIBPATH)')
-    rescue => e
+    rescue
       auto_path = Tk::LIBRARY
     end
   end

data/lib/tk/virtevent.rb

@@ -10,7 +10,7 @@ class TkVirtualEvent<TkObject
 
   TkCommandNames = ['event'.freeze].freeze
 
-  (TkVirtualEventID = ["VirtEvent".freeze, TkUtil.untrust("00000")]).instance_eval{
+  (TkVirtualEventID = ["VirtEvent".freeze, "00000"]).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze

data/lib/tk/winfo.rb

@@ -239,7 +239,7 @@ module TkWinfo
     TkWinfo.screendepth self
   end
 
-  def TkWinfo.screenheight (win)
+  def TkWinfo.screenheight(win)
     number(tk_call_without_enc('winfo', 'screenheight', win))
   end
   def winfo_screenheight

data/lib/tkextlib/blt/barchart.rb

@@ -33,23 +33,6 @@ module Tk::BLT
     end
     private :__tkvariable_optkeys
 
-=begin
-    BarElement_ID = ['blt_barchart_bar'.freeze, TkUtil.untrust('00000')].freeze
-
-    def bar(elem=nil, keys={})
-      if elem.kind_of?(Hash)
-        keys = elem
-        elem = nil
-      end
-      unless elem
-        elem = BarElement_ID.join(TkCore::INTERP._ip_id_).freeze
-        BarElement_ID[1].succ!
-      end
-      tk_send('bar', elem, keys)
-      Element.new(self, elem, :without_creating=>true)
-    end
-=end
-
     def extents(item)
       num_or_str(tk_send_without_enc('extents', item))
     end

data/lib/tkextlib/blt/bitmap.rb

@@ -15,7 +15,7 @@ module Tk::BLT
 
     BITMAP_ID_TBL = TkCore::INTERP.create_table
 
-    (BITMAP_ID = ['blt_bitmap_id'.freeze, TkUtil.untrust('00000')]).instance_eval{
+    (BITMAP_ID = ['blt_bitmap_id'.freeze, '00000']).instance_eval{
       @mutex = Mutex.new
       def mutex; @mutex; end
       freeze

data/lib/tkextlib/blt/component.rb

@@ -84,13 +84,13 @@ module Tk::BLT
     private :__item_pathname
 
     def axis_cget_tkstring(id, option)
-      ret = itemcget_tkstring(['axis', tagid(id)], option)
+      itemcget_tkstring(['axis', tagid(id)], option)
     end
     def axis_cget(id, option)
-      ret = itemcget(['axis', tagid(id)], option)
+      itemcget(['axis', tagid(id)], option)
     end
     def axis_cget_strict(id, option)
-      ret = itemcget_strict(['axis', tagid(id)], option)
+      itemcget_strict(['axis', tagid(id)], option)
     end
     def axis_configure(*args)
       slot = args.pop
@@ -414,7 +414,7 @@ module Tk::BLT
     #################
 
     class Axis < TkObject
-      (OBJ_ID = ['blt_chart_axis'.freeze, TkUtil.untrust('00000')]).instance_eval{
+      (OBJ_ID = ['blt_chart_axis'.freeze, '00000']).instance_eval{
         @mutex = Mutex.new
         def mutex; @mutex; end
         freeze
@@ -536,7 +536,7 @@ module Tk::BLT
         if cmd
           configure('command', cmd)
         elsif b
-          configure('command', Proc.new(&b))
+          configure('command', b)
         else
           cget('command')
         end
@@ -672,7 +672,7 @@ module Tk::BLT
         ElementID_TBL.mutex.synchronize{ ElementID_TBL.clear }
       }
 
-      (OBJ_ID = ['blt_chart_element'.freeze, TkUtil.untrust('00000')]).instance_eval{
+      (OBJ_ID = ['blt_chart_element'.freeze, '00000']).instance_eval{
         @mutex = Mutex.new
         def mutex; @mutex; end
         freeze
@@ -923,13 +923,13 @@ module Tk::BLT
 
       def self.new(chart, keys={})
         obj = nil
-        LegenedID_TBL.mutex.synchronize{
-          unless (obj = LegenedID_TBL[chart.path])
+        LegendID_TBL.mutex.synchronize{
+          unless (obj = LegendID_TBL[chart.path])
             (obj = self.allocate).instance_eval{
               @parent = @chart = chart
               @cpath = @chart.path
               @path = @id = 'crosshairs'
-              Legend::LegenedID_TBL[@cpath] = self
+              Legend::LegendID_TBL[@cpath] = self
             }
           end
         }
@@ -991,7 +991,7 @@ module Tk::BLT
     #################
 
     class Pen < TkObject
-      (OBJ_ID = ['blt_chart_pen'.freeze, TkUtil.untrust('00000')]).instance_eval{
+      (OBJ_ID = ['blt_chart_pen'.freeze, '00000']).instance_eval{
         @mutex = Mutex.new
         def mutex; @mutex; end
         freeze
@@ -1425,20 +1425,20 @@ module Tk::BLT
       end
     end
 
-    def _component_bind(target, tag, context, *args)
-      if TkComm._callback_entry?(args[0]) || !block_given?
+    def _component_bind(target, tag, context, *args, &block)
+      if TkComm._callback_entry?(args[0]) || !block
         cmd = args.shift
       else
-        cmd = Proc.new
+        cmd = block
       end
       _bind([path, target, 'bind', tagid(tag)], context, cmd, *args)
       self
     end
-    def _component_bind_append(target, tag, context, *args)
-      if TkComm._callback_entry?(args[0]) || !block_given?
+    def _component_bind_append(target, tag, context, *args, &block)
+      if TkComm._callback_entry?(args[0]) || !block
         cmd = args.shift
       else
-        cmd = Proc.new
+        cmd = block
       end
       _bind_append([path, target, 'bind', tagid(tag)], context, cmd, *args)
       self
@@ -1947,20 +1947,20 @@ module Tk::BLT
     def current_xaxis_configinfo(slot=nil)
       current_itemconfiginfo('xaxis', slot)
     end
-    def xaxis_bind(context, *args)
-      if TkComm._callback_entry?(args[0]) || !block_given?
+    def xaxis_bind(context, *args, &block)
+      if TkComm._callback_entry?(args[0]) || !block
         cmd = args.shift
       else
-        cmd = Proc.new
+        cmd = block
       end
       _bind([path, 'xaxis', 'bind'], context, cmd, *args)
       self
     end
-    def xaxis_bind_append(context, *args)
-      if TkComm._callback_entry?(args[0]) || !block_given?
+    def xaxis_bind_append(context, *args, &block)
+      if TkComm._callback_entry?(args[0]) || !block
         cmd = args.shift
       else
-        cmd = Proc.new
+        cmd = block
       end
       _bind_append([path, 'xaxis', 'bind'], context, cmd, *args)
       self
@@ -2022,20 +2022,20 @@ module Tk::BLT
     def current_x2axis_configinfo(slot=nil)
       current_itemconfiginfo('x2axis', slot)
     end
-    def x2axis_bind(context, *args)
-      if TkComm._callback_entry?(args[0]) || !block_given?
+    def x2axis_bind(context, *args, &block)
+      if TkComm._callback_entry?(args[0]) || !block
         cmd = args.shift
       else
-        cmd = Proc.new
+        cmd = block
       end
       _bind([path, 'x2axis', 'bind'], context, cmd, *args)
       self
     end
-    def x2axis_bind_append(context, *args)
-      if TkComm._callback_entry?(args[0]) || !block_given?
+    def x2axis_bind_append(context, *args, &block)
+      if TkComm._callback_entry?(args[0]) || !block
         cmd = args.shift
       else
-        cmd = Proc.new
+        cmd = block
       end
       _bind_append([path, 'x2axis', 'bind'], context, cmd, *args)
       self
@@ -2097,20 +2097,20 @@ module Tk::BLT
     def current_yaxis_configinfo(slot=nil)
       current_itemconfiginfo('yaxis', slot)
     end
-    def yaxis_bind(context, *args)
-      if TkComm._callback_entry?(args[0]) || !block_given?
+    def yaxis_bind(context, *args, &block)
+      if TkComm._callback_entry?(args[0]) || !block
         cmd = args.shift
       else
-        cmd = Proc.new
+        cmd = block
       end
       _bind([path, 'yaxis', 'bind'], context, cmd, *args)
       self
     end
-    def yaxis_bind_append(context, *args)
-      if TkComm._callback_entry?(args[0]) || !block_given?
+    def yaxis_bind_append(context, *args, &block)
+      if TkComm._callback_entry?(args[0]) || !block
         cmd = args.shift
       else
-        cmd = Proc.new
+        cmd = block
       end
       _bind_append([path, 'yaxis', 'bind'], context, cmd, *args)
       self
@@ -2172,20 +2172,20 @@ module Tk::BLT
     def current_y2axis_configinfo(slot=nil)
       current_itemconfiginfo('y2axis', slot)
     end
-    def y2axis_bind(context, *args)
-      if TkComm._callback_entry?(args[0]) || !block_given?
+    def y2axis_bind(context, *args, &block)
+      if TkComm._callback_entry?(args[0]) || !block
         cmd = args.shift
       else
-        cmd = Proc.new
+        cmd = block
       end
       _bind([path, 'y2axis', 'bind'], context, cmd, *args)
       self
     end
-    def y2axis_bind_append(context, *args)
-      if TkComm._callback_entry?(args[0]) || !block_given?
+    def y2axis_bind_append(context, *args, &block)
+      if TkComm._callback_entry?(args[0]) || !block
         cmd = args.shift
       else
-        cmd = Proc.new
+        cmd = block
       end
       _bind_append([path, 'y2axis', 'bind'], context, cmd, *args)
       self

data/lib/tkextlib/blt/dragdrop.rb

@@ -204,16 +204,16 @@ module Tk::BLT
       _setup_subst_table(KEY_TBL, PROC_TBL)
     end
 
-    def self.source_handler(win, datatype, cmd=Proc.new, *args)
+    def self.source_handler(win, datatype, cmd=nil, *args, &block)
       _bind_for_event_class(DnD_Handle,
                             ['::blt::drag&drop', 'source', win, 'handler'],
-                            cmd, *args)
+                            cmd || block, *args)
     end
 
-    def self.target_handler(win, datatype, cmd=Proc.new, *args)
+    def self.target_handler(win, datatype, cmd=nil, *args, &block)
       _bind_for_event_class(DnD_Handle,
                             ['::blt::drag&drop', 'target', win, 'handler'],
-                            cmd, *args)
+                            cmd || block, *args)
     end
 
     ###################################
@@ -255,8 +255,8 @@ module Tk::BLT
       tk_call('::blt::drag&drop', 'drop', win, x, y)
     end
 
-    def self.errors(cmd=Proc.new)
-      tk_call('::blt::drag&drop', 'errors', cmd)
+    def self.errors(cmd=nil, &block)
+      tk_call('::blt::drag&drop', 'errors', cmd || block)
     end
 
     def self.active

data/lib/tkextlib/blt/graph.rb

@@ -27,23 +27,6 @@ module Tk::BLT
     end
     private :__strval_optkeys
 
-=begin
-    BarElement_ID = ['blt_graph_bar'.freeze, TkUtil.untrust('00000')].freeze
-
-    def bar(elem=nil, keys={})
-      if elem.kind_of?(Hash)
-        keys = elem
-        elem = nil
-      end
-      unless elem
-        elem = BarElement_ID.join(TkCore::INTERP._ip_id_).freeze
-        BarElement_ID[1].succ!
-      end
-      tk_send('bar', elem, keys)
-      Element.new(self, elem, :without_creating=>true)
-    end
-=end
-
     def extents(item)
       num_or_str(tk_send_without_enc('extents', item))
     end

data/lib/tkextlib/blt/stripchart.rb

@@ -28,23 +28,6 @@ module Tk::BLT
     end
     private :__strval_optkeys
 
-=begin
-    BarElement_ID = ['blt_stripchart_bar'.freeze, TkUtil.untrust('00000')].freeze
-
-    def bar(elem=nil, keys={})
-      if elem.kind_of?(Hash)
-        keys = elem
-        elem = nil
-      end
-      unless elem
-        elem = BarElement_ID.join(TkCore::INTERP._ip_id_).freeze
-        BarElement_ID[1].succ!
-      end
-      tk_send('bar', elem, keys)
-      Element.new(self, elem, :without_creating=>true)
-    end
-=end
-
     def extents(item)
       num_or_str(tk_send_without_enc('extents', item))
     end

data/lib/tkextlib/blt/tabset.rb

@@ -14,7 +14,7 @@ module Tk::BLT
 
       TabID_TBL = TkCore::INTERP.create_table
 
-      (TabsetTab_ID = ['blt_tabset_tab'.freeze, TkUtil.untrust('00000')]).instance_eval{
+      (TabsetTab_ID = ['blt_tabset_tab'.freeze, '00000']).instance_eval{
         @mutex = Mutex.new
         def mutex; @mutex; end
         freeze
@@ -97,30 +97,22 @@ module Tk::BLT
         end
       end
 
-      #def bind(context, cmd=Proc.new, *args)
-      #  @t.tab_bind(@id, context, cmd, *args)
-      #  self
-      #end
-      def bind(context, *args)
+      def bind(context, *args, &block)
         # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-        if TkComm._callback_entry?(args[0]) || !block_given?
+        if TkComm._callback_entry?(args[0]) || !block
           cmd = args.shift
         else
-          cmd = Proc.new
+          cmd = block
         end
         @t.tab_bind(@id, context, cmd, *args)
         self
       end
-      #def bind_append(context, cmd=Proc.new, *args)
-      #  @t.tab_bind_append(@id, context, cmd, *args)
-      #  self
-      #end
-      def bind_append(context, *args)
+      def bind_append(context, *args, &block)
         # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-        if TkComm._callback_entry?(args[0]) || !block_given?
+        if TkComm._callback_entry?(args[0]) || !block
           cmd = args.shift
         else
-          cmd = Proc.new
+          cmd = block
         end
         @t.tab_bind_append(@id, context, cmd, *args)
         self
@@ -289,30 +281,23 @@ module Tk::BLT
     end
     alias highlight activate
 
-    #def tabbind(tag, context, cmd=Proc.new, *args)
-    #  _bind([path, "bind", tagid(tag)], context, cmd, *args)
-    #  self
-    #end
-    def tabbind(tag, context, *args)
+    def tabbind(tag, context, *args, &block)
       # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-      if TkComm._callback_entry?(args[0]) || !block_given?
+      if TkComm._callback_entry?(args[0]) || !block
         cmd = args.shift
       else
-        cmd = Proc.new
+        cmd = block
       end
       _bind([path, "bind", tagid(tag)], context, cmd, *args)
       self
     end
-    #def tabbind_append(tag, context, cmd=Proc.new, *args)
-    #  _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
-    #  self
-    #end
-    def tabbind_append(tag, context, *args)
+
+    def tabbind_append(tag, context, *args, &block)
       # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-      if TkComm._callback_entry?(args[0]) || !block_given?
+      if TkComm._callback_entry?(args[0]) || !block
         cmd = args.shift
       else
-        cmd = Proc.new
+        cmd = block
       end
       _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
       self
@@ -482,8 +467,8 @@ module Tk::BLT
       window(tk_send('tab', 'tearoff', tagindex(index), parent))
     end
 
-    def xscrollcommand(cmd=Proc.new)
-      configure_cmd 'scrollcommand', cmd
+    def xscrollcommand(cmd=nil, &block)
+      configure_cmd('scrollcommand', cmd || block)
       self
     end
     alias scrollcommand xscrollcommand