tk 0.2.0 → 0.3.0

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

data/lib/tkextlib/blt/tree.rb

@@ -273,7 +273,7 @@ module Tk::BLT
         TreeTagID_TBL.mutex.synchronize{ TreeTagID_TBL.clear }
       }
 
-      (TreeTag_ID = ['blt_tree_tag'.freeze, TkUtil.untrust('00000')]).instance_eval{
+      (TreeTag_ID = ['blt_tree_tag'.freeze, '00000']).instance_eval{
         @mutex = Mutex.new
         def mutex; @mutex; end
         freeze
@@ -431,7 +431,7 @@ module Tk::BLT
         elsif TkComm._callback_entry?(args[-1])
           cmd = args.pop
         elsif b
-          cmd = Proc.new(&b)
+          cmd = b
         else
           fail ArgumentError, "lack of 'command' argument"
         end
@@ -536,7 +536,7 @@ module Tk::BLT
 
         if !cmd
           if b
-            cmd = Proc.new(&b)
+            cmd = b
           else
             fail ArgumentError, "lack of 'command' argument"
           end
@@ -579,7 +579,7 @@ module Tk::BLT
 
     TreeID_TBL = TkCore::INTERP.create_table
 
-    (Tree_ID = ['blt_tree'.freeze, TkUtil.untrust('00000')]).instance_eval{
+    (Tree_ID = ['blt_tree'.freeze, '00000']).instance_eval{
       @mutex = Mutex.new
       def mutex; @mutex; end
       freeze
@@ -601,7 +601,7 @@ module Tk::BLT
 
         # sort command
         'ascii'=>nil, 'decreasing'=>nil, 'dictionary'=>nil,
-        'integer'=>nil, 'real'=>nil, 'recurse'=>nil, 'reorder'=>nil,
+        'integer'=>nil, 'real'=>nil, 'reorder'=>nil,
       }
     end
 

data/lib/tkextlib/blt/treeview.rb

@@ -367,20 +367,20 @@ class Tk::BLT::Treeview
     list(tk_send('bbox', '-screen', *(tags.collect{|tag| tagid(tag)})))
   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, 'bind', tagid(tag)], seq, cmd, *args)
     self
   end
-  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, 'bind', tagid(tag)], seq, cmd, *args)
     self
@@ -398,20 +398,20 @@ class Tk::BLT::Treeview
     self
   end
 
-  def button_bind(tag, seq, *args)
-    if TkComm._callback_entry?(args[0]) || !block_given?
+  def button_bind(tag, seq, *args, &block)
+    if TkComm._callback_entry?(args[0]) || !block
       cmd = args.shift
     else
-      cmd = Proc.new
+      cmd = block
     end
     _bind([@path, 'button', 'bind', tagid(tag)], seq, cmd, *args)
     self
   end
-  def button_bind_append(tag, seq, *args)
-    if TkComm._callback_entry?(args[0]) || !block_given?
+  def button_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, 'button', 'bind', tagid(tag)], seq, cmd, *args)
     self
@@ -1045,7 +1045,7 @@ class Tk::BLT::Treeview::Node < TkObject
 
   TreeNodeID_TBL = TkCore::INTERP.create_table
 
-  (TreeNode_ID = ['blt_treeview_node'.freeze, TkUtil.untrust('00000')]).instance_eval{
+  (TreeNode_ID = ['blt_treeview_node'.freeze, '00000']).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze
@@ -1166,7 +1166,7 @@ class Tk::BLT::Treeview::Tag < TkObject
 
   TreeTagID_TBL = TkCore::INTERP.create_table
 
-  (TreeTag_ID = ['blt_treeview_tag'.freeze, TkUtil.untrust('00000')]).instance_eval{
+  (TreeTag_ID = ['blt_treeview_tag'.freeze, '00000']).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze

data/lib/tkextlib/blt/watch.rb

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

data/lib/tkextlib/bwidget/labelentry.rb

@@ -39,31 +39,23 @@ class Tk::BWidget::LabelEntry
   end
   private :__font_optkeys
 
-  #def entrybind(*args)
-  #  _bind([path, 'bind'], *args)
-  #  self
-  #end
-  def entrybind(context, *args)
+  def entrybind(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'], context, cmd, *args)
     self
   end
 
-  #def entrybind_append(*args)
-  #  _bind_append([path, 'bind'], *args)
-  #  self
-  #end
-  def entrybind_append(context, *args)
+  def entrybind_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
     _bind_append([path, 'bind'], context, cmd, *args)
     self

data/lib/tkextlib/bwidget/listbox.rb

@@ -50,32 +50,24 @@ class Tk::BWidget::ListBox
     end
   end
 
-  #def imagebind(*args)
-  #  _bind_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
-  #  self
-  #end
-  def imagebind(context, *args)
+  def imagebind(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_for_event_class(Event_for_Items, [path, 'bindImage'],
                           context, cmd, *args)
     self
   end
 
-  #def imagebind_append(*args)
-  #  _bind_append_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
-  #  self
-  #end
-  def imagebind_append(context, *args)
+  def imagebind_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
     _bind_append_for_event_class(Event_for_Items, [path, 'bindImage'],
                                  context, cmd, *args)
@@ -91,32 +83,24 @@ class Tk::BWidget::ListBox
     _bindinfo_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
   end
 
-  #def textbind(*args)
-  #  _bind_for_event_class(Event_for_Items, [path, 'bindText'], *args)
-  #  self
-  #end
-  def textbind(context, *args)
+  def textbind(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_for_event_class(Event_for_Items, [path, 'bindText'],
                           context, cmd, *args)
     self
   end
 
-  #def textbind_append(*args)
-  #  _bind_append_for_event_class(Event_for_Items, [path, 'bindText'], *args)
-  #  self
-  #end
-  def textbind_append(context, *args)
+  def textbind_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
     _bind_append_for_event_class(Event_for_Items, [path, 'bindText'],
                                  context, cmd, *args)
@@ -213,7 +197,7 @@ class Tk::BWidget::ListBox::Item
 
   ListItem_TBL = TkCore::INTERP.create_table
 
-  (ListItem_ID = ['bw:item'.freeze, TkUtil.untrust('00000')]).instance_eval{
+  (ListItem_ID = ['bw:item'.freeze, '00000']).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze

data/lib/tkextlib/bwidget/notebook.rb

@@ -47,32 +47,24 @@ class Tk::BWidget::NoteBook
     end
   end
 
-  #def tabbind(*args)
-  #  _bind_for_event_class(Event_for_Tabs, [path, 'bindtabs'], *args)
-  #  self
-  #end
-  def tabbind(context, *args)
+  def tabbind(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_for_event_class(Event_for_Tabs, [path, 'bindtabs'],
                           context, cmd, *args)
     self
   end
 
-  #def tabbind_append(*args)
-  #  _bind_append_for_event_class(Event_for_Tabs, [path, 'bindtabs'], *args)
-  #  self
-  #end
-  def tabbind_append(context, *args)
+  def tabbind_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
     _bind_append_for_event_class(Event_for_Tabs, [path, 'bindtabs'],
                                  context, cmd, *args)

data/lib/tkextlib/bwidget/spinbox.rb

@@ -43,31 +43,23 @@ class Tk::BWidget::SpinBox
   end
   private :__tkvariable_optkeys
 
-  #def entrybind(*args)
-  #  _bind([path, 'bind'], *args)
-  #  self
-  #end
-  def entrybind(context, *args)
+  def entrybind(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'], context, cmd, *args)
     self
   end
 
-  #def entrybind_append(*args)
-  #  _bind_append([path, 'bind'], *args)
-  #  self
-  #end
-  def entrybind_append(context, *args)
+  def entrybind_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
     _bind_append([path, 'bind'], context, cmd, *args)
     self

data/lib/tkextlib/bwidget/tree.rb

@@ -58,22 +58,22 @@ class Tk::BWidget::Tree
     end
   end
 
-  def areabind(context, *args)
-    if TkComm._callback_entry?(args[0]) || !block_given?
+  def areabind(context, *args, &block)
+    if TkComm._callback_entry?(args[0]) || !block
       cmd = args.shift
     else
-      cmd = Proc.new
+      cmd = block
     end
     _bind_for_event_class(Event_for_Items, [path, 'bindArea'],
                           context, cmd, *args)
     self
   end
 
-  def areabind_append(context, *args)
-    if TkComm._callback_entry?(args[0]) || !block_given?
+  def areabind_append(context, *args, &block)
+    if TkComm._callback_entry?(args[0]) || !block
       cmd = args.shift
     else
-      cmd = Proc.new
+      cmd = block
     end
     _bind_append_for_event_class(Event_for_Items, [path, 'bindArea'],
                                  context, cmd, *args)
@@ -89,32 +89,24 @@ class Tk::BWidget::Tree
     _bindinfo_for_event_class(Event_for_Items, [path, 'bindArea'], *args)
   end
 
-  #def imagebind(*args)
-  #  _bind_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
-  #  self
-  #end
-  def imagebind(context, *args)
+  def imagebind(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_for_event_class(Event_for_Items, [path, 'bindImage'],
                           context, cmd, *args)
     self
   end
 
-  #def imagebind_append(*args)
-  #  _bind_append_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
-  #  self
-  #end
-  def imagebind_append(context, *args)
+  def imagebind_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
     _bind_append_for_event_class(Event_for_Items, [path, 'bindImage'],
                                  context, cmd, *args)
@@ -130,32 +122,24 @@ class Tk::BWidget::Tree
     _bindinfo_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
   end
 
-  #def textbind(*args)
-  #  _bind_for_event_class(Event_for_Items, [path, 'bindText'], *args)
-  #  self
-  #end
-  def textbind(context, *args)
+  def textbind(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_for_event_class(Event_for_Items, [path, 'bindText'],
                           context, cmd, *args)
     self
   end
 
-  #def textbind_append(*args)
-  #  _bind_append_for_event_class(Event_for_Items, [path, 'bindText'], *args)
-  #  self
-  #end
-  def textbind_append(context, *args)
+  def textbind_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
     _bind_append_for_event_class(Event_for_Items, [path, 'bindText'],
                                  context, cmd, *args)
@@ -310,7 +294,7 @@ class Tk::BWidget::Tree::Node
 
   TreeNode_TBL = TkCore::INTERP.create_table
 
-  (TreeNode_ID = ['bw:node'.freeze, TkUtil.untrust('00000')]).instance_eval{
+  (TreeNode_ID = ['bw:node'.freeze, '00000']).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze