tk 0.2.0 → 0.3.0

data/lib/tkextlib/itcl/incr_tcl.rb

@@ -41,12 +41,12 @@ module Tk
     class ItclObject < TkObject
       ITCL_CLASSNAME = ''.freeze
 
-      (ITCL_OBJ_ID = ['itclobj'.freeze, TkUtil.untrust('00000')]).instance_eval{
+      (ITCL_OBJ_ID = ['itclobj'.freeze, '00000']).instance_eval{
         @mutex = Mutex.new
         def mutex; @mutex; end
         freeze
       }
-      ITCL_OBJ_TBL = TkUtil.untrust({})
+      ITCL_OBJ_TBL = {}
 
       def initialize(*args)
         if (@klass = self.class::ITCL_CLASSNAME).empty?

data/lib/tkextlib/itk/incr_tk.rb

@@ -147,7 +147,7 @@ module Tk
 
       ComponentID_TBL = TkCore::INTERP.create_table
 
-      (Itk_Component_ID = ['itk:component'.freeze, TkUtil.untrust('00000')]).instance_eval{
+      (Itk_Component_ID = ['itk:component'.freeze, '00000']).instance_eval{
         @mutex = Mutex.new
         def mutex; @mutex; end
         freeze
@@ -360,18 +360,7 @@ module Tk
         end
       end
 
-      #def bind(*args)
-      #  unless @widget
-      #    begin
-      #      @widget = window(tk_call(@master, 'component', @component))
-      #      @path = @widget.path
-      #    rescue
-      #      fail RuntimeError, 'component is not assigned to a widget'
-      #    end
-      #  end
-      #  @widget.bind(*args)
-      #end
-      def bind(context, *args)
+      def bind(context, *args, &block)
         unless @widget
           begin
             @widget = window(tk_call(@master, 'component', @component))
@@ -381,26 +370,15 @@ module Tk
           end
         end
         # 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
         @widget.bind(context, cmd, *args)
       end
 
-      #def bind_append(*args)
-      #  unless @widget
-      #    begin
-      #      @widget = window(tk_call(@master, 'component', @component))
-      #      @path = @widget.path
-      #    rescue
-      #      fail RuntimeError, 'component is not assigned to a widget'
-      #    end
-      #  end
-      #  @widget.bind_append(*args)
-      #end
-      def bind_append(context, *args)
+      def bind_append(context, *args, &block)
         unless @widget
           begin
             @widget = window(tk_call(@master, 'component', @component))
@@ -410,10 +388,10 @@ module Tk
           end
         end
         # 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
         @widget.bind_append(context, cmd, *args)
       end

data/lib/tkextlib/iwidgets/calendar.rb

@@ -76,10 +76,6 @@ class Tk::Iwidgets::Calendar
       # array of config-option key (string or symbol)
       ['command']
     end
-
-    #def initialize(cmd = Proc.new, *args)
-    #  _initialize_for_cb_class(CalCmdArgs, cmd, *args)
-    #end
   end
 
   def __validation_class_list
@@ -87,17 +83,6 @@ class Tk::Iwidgets::Calendar
   end
 
   Tk::ValidateConfigure.__def_validcmd(binding, CalendarCommand)
-=begin
-  def command(cmd = Proc.new, args = nil)
-    if cmd.kind_of?(CalendarCommand)
-      configure('command', cmd)
-    elsif args
-      configure('command', [cmd, args])
-    else
-      configure('command', cmd)
-    end
-  end
-=end
 
   ####################################
 

data/lib/tkextlib/iwidgets/entryfield.rb

@@ -75,27 +75,6 @@ class Tk::Iwidgets::Entryfield
   end
 
   Tk::ValidateConfigure.__def_validcmd(binding, EntryfieldValidate)
-=begin
-  def validate(cmd = Proc.new, args = nil)
-    if cmd.kind_of?(ValidateCmd)
-      configure('validate', cmd)
-    elsif args
-      configure('validate', [cmd, args])
-    else
-      configure('validate', cmd)
-    end
-  end
-
-  def invalid(cmd = Proc.new, args = nil)
-    if cmd.kind_of?(ValidateCmd)
-      configure('invalid', cmd)
-    elsif args
-      configure('invalid', [cmd, args])
-    else
-      configure('invalid', cmd)
-    end
-  end
-=end
 
   ####################################
 

data/lib/tkextlib/iwidgets/notebook.rb

@@ -118,8 +118,8 @@ class Tk::Iwidgets::Notebook
     self
   end
 
-  def scrollcommand(cmd=Proc.new)
-    configure_cmd 'scrollcommand', cmd
+  def scrollcommand(cmd=nil, &block)
+    configure_cmd('scrollcommand', cmd || block)
     self
   end
   alias xscrollcommand scrollcommand

data/lib/tkextlib/iwidgets/scrolledcanvas.rb

@@ -108,31 +108,23 @@ class Tk::Iwidgets::Scrolledcanvas
                              *tags.collect{|t| tagid(t)}))
   end
 
-  #def itembind(tag, context, cmd=Proc.new, *args)
-  #  _bind([path, "bind", tagid(tag)], context, cmd, *args)
-  #  self
-  #end
-  def itembind(tag, context, *args)
+  def itembind(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 itembind_append(tag, context, cmd=Proc.new, *args)
-  #  _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
-  #  self
-  #end
-  def itembind_append(tag, context, *args)
+  def itembind_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

data/lib/tkextlib/iwidgets/tabnotebook.rb

@@ -124,8 +124,8 @@ class Tk::Iwidgets::Tabnotebook
     self
   end
 
-  def scrollcommand(cmd=Proc.new)
-    configure_cmd 'scrollcommand', cmd
+  def scrollcommand(cmd=nil, &block)
+    configure_cmd('scrollcommand', cmd || block)
     self
   end
   alias xscrollcommand scrollcommand

data/lib/tkextlib/tcllib/ctext.rb

@@ -150,8 +150,8 @@ class Tk::Tcllib::CText
     tk_call('ctext::findPreviousSpace', @path, idx)
   end
 
-  def set_update_proc(cmd=Proc.new)
-    tk_call('proc', 'ctext::update', '', cmd)
+  def set_update_proc(cmd=nil, &block)
+    tk_call('proc', 'ctext::update', '', cmd || block)
     self
   end
 

data/lib/tkextlib/tcllib/plotchart.rb

@@ -709,15 +709,15 @@ module Tk::Tcllib::Plotchart
     end
     private :_create_chart
 
-    def plot_function(cmd=Proc.new)
-      Tk.ip_eval("proc #{@path}_#{@chart} {x y} {#{install_cmd(cmd)} $x $y}")
+    def plot_function(cmd=nil, &block)
+      Tk.ip_eval("proc #{@path}_#{@chart} {x y} {#{install_cmd(cmd || block)} $x $y}")
       tk_call_without_enc(@chart, 'plotfunc', "#{@path}_#{@chart}")
       self
     end
 
-    def plot_funcont(conts, cmd=Proc.new)
+    def plot_funcont(conts, cmd=nil, &block)
       conts = array2tk_list(conts) if conts.kind_of?(Array)
-      Tk.ip_eval("proc #{@path}_#{@chart} {x y} {#{install_cmd(cmd)} $x $y}")
+      Tk.ip_eval("proc #{@path}_#{@chart} {x y} {#{install_cmd(cmd || block)} $x $y}")
       tk_call_without_enc(@chart, 'plotfuncont', "#{@path}_#{@chart}", conts)
       self
     end
@@ -1360,7 +1360,7 @@ module Tk::Tcllib::Plotchart
   class PlotSeries < TkObject
     SeriesID_TBL = TkCore::INTERP.create_table
 
-    (Series_ID = ['series'.freeze, TkUtil.untrust('00000')]).instance_eval{
+    (Series_ID = ['series'.freeze, '00000']).instance_eval{
       @mutex = Mutex.new
       def mutex; @mutex; end
       freeze

data/lib/tkextlib/tcllib/validator.rb

@@ -33,8 +33,8 @@ end
 module Tk::Tcllib::Validator
   extend TkCore
 
-  def self.attach(widget, color, cmd=Proc.new)
-    tk_call_without_enc('::widget::validator', 'attach', widget, color, cmd)
+  def self.attach(widget, color, cmd=nil, &block)
+    tk_call_without_enc('::widget::validator', 'attach', widget, color, cmd || block)
     nil
   end
 
@@ -48,17 +48,17 @@ module Tk::Tcllib::Validator
     nil
   end
 
-  def attach_validator(color, cmd=Proc.new)
-    tk_call_without_enc('::widget::validator', 'attach', @path, color, cmd)
+  def attach_validator(color, cmd=nil, &block)
+    tk_call_without_enc('::widget::validator', 'attach', @path, color, cmd || block)
     self
   end
 
-  def detach_validator(color, cmd=Proc.new)
+  def detach_validator(color, cmd=nil)
     tk_call_without_enc('::widget::validator', 'detach', @path)
     self
   end
 
-  def invoke_validator(color, cmd=Proc.new)
+  def invoke_validator(color, cmd=nil)
     tk_call_without_enc('::widget::validator', 'validate', @path)
     self
   end

data/lib/tkextlib/tile.rb

@@ -338,7 +338,7 @@ module Tk
         if script
           tk_send('instate', state, script)
         elsif b
-          tk_send('instate', state, Proc.new(&b))
+          tk_send('instate', state, b)
         else
           bool(tk_send('instate', state))
         end

data/lib/tkextlib/tile/style.rb

@@ -320,7 +320,7 @@ class << Tk::Tile::Style
 
   def theme_settings(name, cmd=nil, &b)
     name = name.to_s
-    cmd = Proc.new(&b) if !cmd && b
+    cmd = b if !cmd && b
     tk_call(TkCommandNames[0], 'theme', 'settings', name, cmd)
     name
   end

data/lib/tkextlib/tile/treeview.rb

@@ -939,7 +939,7 @@ class Tk::Tile::Treeview::Tag < TkObject
 
   TagID_TBL = TkCore::INTERP.create_table
 
-  (Tag_ID = ['tile_treeview_tag'.freeze, TkUtil.untrust('00000')]).instance_eval{
+  (Tag_ID = ['tile_treeview_tag'.freeze, '00000']).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze
@@ -999,21 +999,21 @@ class Tk::Tile::Treeview::Tag < TkObject
     @t.tag_remove(@id, *items)
   end
 
-  def bind(seq, *args)
-    if TkComm._callback_entry?(args[0]) || !block_given?
+  def bind(seq, *args, &block)
+    if TkComm._callback_entry?(args[0]) || !block
       cmd = args.shift
     else
-      cmd = Proc.new
+      cmd = block
     end
     @t.tag_bind(@id, seq, cmd, *args)
     self
   end
 
-  def bind_append(seq, *args)
-    if TkComm._callback_entry?(args[0]) || !block_given?
+  def bind_append(seq, *args, &block)
+    if TkComm._callback_entry?(args[0]) || !block
       cmd = args.shift
     else
-      cmd = Proc.new
+      cmd = block
     end
     @t.tag_bind_append(@id, seq, cmd, *args)
     self
@@ -1191,13 +1191,6 @@ class Tk::Tile::Treeview < TkWindow
     Tk::Tile::Treeview::Item.new(self, parent, idx, keys)
   end
 
-  # def instate(spec, cmd=Proc.new)
-  #   tk_send('instate', spec, cmd)
-  # end
-  # def state(spec=None)
-  #   tk_send('state', spec)
-  # end
-
   def move(item, parent, idx)
     tk_send('move', item, parent, idx)
     self
@@ -1280,22 +1273,22 @@ class Tk::Tile::Treeview < TkWindow
     }
   end
 
-  def tag_bind(tag, seq, *args)
-    if TkComm._callback_entry?(args[0]) || !block_given?
+  def tag_bind(tag, seq, *args, &block)
+    if TkComm._callback_entry?(args[0]) || !block
       cmd = args.shift
     else
-      cmd = Proc.new
+      cmd = block
     end
     _bind([@path, 'tag', 'bind', tag], seq, cmd, *args)
     self
   end
   alias tagbind tag_bind
 
-  def tag_bind_append(tag, seq, *args)
-    if TkComm._callback_entry?(args[0]) || !block_given?
+  def tag_bind_append(tag, seq, *args, &block)
+    if TkComm._callback_entry?(args[0]) || !block
       cmd = args.shift
     else
-      cmd = Proc.new
+      cmd = block
     end
     _bind_append([@path, 'tag', 'bind', tag], seq, cmd, *args)
     self

data/lib/tkextlib/tkDND/tkdnd.rb

@@ -146,19 +146,7 @@ module Tk
         end
       end
 
-      #def dnd_bindtarget(type, event, cmd=Proc.new, prior=50, *args)
-      #  event = tk_event_sequence(event)
-      #  if prior.kind_of?(Numeric)
-      #    tk_call('dnd', 'bindtarget', @path, type, event,
-      #            install_bind_for_event_class(DND_Subst, cmd, *args),
-      #            prior)
-      #  else
-      #    tk_call('dnd', 'bindtarget', @path, type, event,
-      #            install_bind_for_event_class(DND_Subst, cmd, prior, *args))
-      #  end
-      #  self
-      #end
-      def dnd_bindtarget(type, event, *args)
+      def dnd_bindtarget(type, event, *args, &block)
         # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
         klass = case type
                 when 'text/plain'
@@ -168,10 +156,10 @@ module Tk
                 else
                   DND_Subst
                 end
-        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
 
         prior = 50
@@ -202,16 +190,12 @@ module Tk
         end
       end
 
-      #def dnd_bindsource(type, cmd=Proc.new, prior=None)
-      #  tk_call('dnd', 'bindsource', @path, type, cmd, prior)
-      #  self
-      #end
-      def dnd_bindsource(type, *args)
+      def dnd_bindsource(type, *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
 
         args = [TkComm::None] if args.empty?

data/lib/tkextlib/tkHTML/htmlwidget.rb

@@ -391,7 +391,7 @@ class Tk::HTML_Widget
   end
 
   def token_handler(tag, cmd=nil, &b)
-    cmd = Proc.new(&b) if !cmd && b
+    cmd = b if !cmd && b
     if cmd
       tk_send('token', 'handler', tag, cmd)
       return self

data/lib/tkextlib/tktable/tktable.rb

@@ -132,7 +132,7 @@ class Tk::TkTable::CellTag
 
   CellTagID_TBL = TkCore::INTERP.create_table
 
-  (CellTag_ID = ['tktbl:celltag'.freeze, TkUtil.untrust('00000')]).instance_eval{
+  (CellTag_ID = ['tktbl:celltag'.freeze, '00000']).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze