tk 0.2.0 → 0.3.0

data/lib/tk/timer.rb

@@ -12,13 +12,13 @@ class TkTimer
 
   TkCommandNames = ['after'.freeze].freeze
 
-  (Tk_CBID = ['a'.freeze, TkUtil.untrust('00000')]).instance_eval{
+  (Tk_CBID = ['a'.freeze, '00000']).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze
   }
 
-  Tk_CBTBL = TkUtil.untrust({})
+  Tk_CBTBL = {}
 
   TkCore::INTERP.add_tk_procs('rb_after', 'id', <<-'EOL')
     if {[set st [catch {eval {ruby_cmd TkTimer callback} $id} ret]] != 0} {

data/lib/tk/tk_mac.rb

@@ -17,48 +17,48 @@ module Tk::Mac
   extend TkCore
 
   # event handler callbacks
-  def self.def_ShowPreferences(cmd=Proc.new)
-    ip_eval("proc ::tk::mac::ShowPreferences {} { #{install_cmd(cmd)} }")
+  def self.def_ShowPreferences(cmd=nil, &block)
+    ip_eval("proc ::tk::mac::ShowPreferences {} { #{install_cmd(cmd || block)} }")
     nil
   end
 
-  def self.def_OpenApplication(cmd=Proc.new)
-    ip_eval("proc ::tk::mac::OpenApplication {} { #{install_cmd(cmd)} }")
+  def self.def_OpenApplication(cmd=nil, &block)
+    ip_eval("proc ::tk::mac::OpenApplication {} { #{install_cmd(cmd || block)} }")
     nil
   end
 
-  def self.def_ReopenApplication(cmd=Proc.new)
-    ip_eval("proc ::tk::mac::ReopenApplication {} { #{install_cmd(cmd)} }")
+  def self.def_ReopenApplication(cmd=nil, &block)
+    ip_eval("proc ::tk::mac::ReopenApplication {} { #{install_cmd(cmd || block)} }")
     nil
   end
 
-  def self.def_OpenDocument(cmd=Proc.new)
-    ip_eval("proc ::tk::mac::OpenDocument {args} { eval #{install_cmd(cmd)} $args }")
+  def self.def_OpenDocument(cmd=nil, &block)
+    ip_eval("proc ::tk::mac::OpenDocument {args} { eval #{install_cmd(cmd || block)} $args }")
     nil
   end
 
-  def self.def_PrintDocument(cmd=Proc.new)
-    ip_eval("proc ::tk::mac::PrintDocument {args} { eval #{install_cmd(cmd)} $args }")
+  def self.def_PrintDocument(cmd=nil, &block)
+    ip_eval("proc ::tk::mac::PrintDocument {args} { eval #{install_cmd(cmd || block)} $args }")
     nil
   end
 
-  def self.def_Quit(cmd=Proc.new)
-    ip_eval("proc ::tk::mac::Quit {} { #{install_cmd(cmd)} }")
+  def self.def_Quit(cmd=nil, &block)
+    ip_eval("proc ::tk::mac::Quit {} { #{install_cmd(cmd || block)} }")
     nil
   end
 
-  def self.def_OnHide(cmd=Proc.new)
-    ip_eval("proc ::tk::mac::OnHide {} { #{install_cmd(cmd)} }")
+  def self.def_OnHide(cmd=nil, &block)
+    ip_eval("proc ::tk::mac::OnHide {} { #{install_cmd(cmd || block)} }")
     nil
   end
 
-  def self.def_OnShow(cmd=Proc.new)
-    ip_eval("proc ::tk::mac::OnShow {} { #{install_cmd(cmd)} }")
+  def self.def_OnShow(cmd=nil, &block)
+    ip_eval("proc ::tk::mac::OnShow {} { #{install_cmd(cmd || block)} }")
     nil
   end
 
-  def self.def_ShowHelp(cmd=Proc.new)
-    ip_eval("proc ::tk::mac::ShowHelp {} { #{install_cmd(cmd)} }")
+  def self.def_ShowHelp(cmd=nil, &block)
+    ip_eval("proc ::tk::mac::ShowHelp {} { #{install_cmd(cmd || block)} }")
     nil
   end
 

data/lib/tk/validation.rb

@@ -294,7 +294,8 @@ class TkValidateCommand
     ['vcmd', 'validatecommand', 'invcmd', 'invalidcommand']
   end
 
-  def _initialize_for_cb_class(klass, cmd = Proc.new, *args)
+  def _initialize_for_cb_class(klass, cmd = nil, *args, &block)
+    cmd ||= block
     extra_args_tbl = klass._get_extra_args_tbl
 
     if args.compact.size > 0
@@ -332,8 +333,8 @@ class TkValidateCommand
     end
   end
 
-  def initialize(cmd = Proc.new, *args)
-    _initialize_for_cb_class(self.class::ValidateArgs, cmd, *args)
+  def initialize(cmd = nil, *args, &block)
+    _initialize_for_cb_class(self.class::ValidateArgs, cmd || block, *args)
   end
 
   def to_eval
@@ -363,36 +364,4 @@ module TkValidation
   end
 
   Tk::ValidateConfigure.__def_validcmd(binding, ValidateCmd)
-
-=begin
-  def validatecommand(cmd = Proc.new, args = nil)
-    if cmd.kind_of?(ValidateCmd)
-      configure('validatecommand', cmd)
-    elsif args
-      configure('validatecommand', [cmd, args])
-    else
-      configure('validatecommand', cmd)
-    end
-  end
-=end
-#  def validatecommand(*args, &b)
-#    __validcmd_call(ValidateCmd, 'validatecommand', *args, &b)
-#  end
-#  alias vcmd validatecommand
-
-=begin
-  def invalidcommand(cmd = Proc.new, args = nil)
-    if cmd.kind_of?(ValidateCmd)
-      configure('invalidcommand', cmd)
-    elsif args
-      configure('invalidcommand', [cmd, args])
-    else
-      configure('invalidcommand', cmd)
-    end
-  end
-=end
-#  def invalidcommand(*args, &b)
-#    __validcmd_call(ValidateCmd, 'invalidcommand', *args, &b)
-#  end
-#  alias invcmd invalidcommand
 end

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
@@ -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")

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/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

@@ -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
@@ -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