* ext/tk/tcltklib.c: remove dangerous 'rb_jump_tag's.

* ext/tk/lib/tk.rb: add __val2ruby_optkeys and __ruby2val_optkeys to
  help to convert option values between ruby and tcl.
* ext/tk/lib/tk/itemconfig.rb: add __item_val2ruby_optkeys and
  __item_ruby2val_optkeys to help to convert option values between
  ruby and tcl.
* ext/tk/lib/tk/radiobutton.rb: use __ruby2val_optkeys for 'variable'
  option (for the reason of backward compatibility).
* ext/tk/lib/tk/composite.rb: clarify the arguments of super().
* ext/tk/lib/tk/spinbox.rb: ditto.
* ext/tk/lib/tk/text.rb: ditto.
* ext/tk/lib/tk/validation.rb: ditto.
* ext/tk/lib/tkextlib/*: support to treat tkvariable-type
  configure options.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8958 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 13 insertions, 2 deletions

diff --git a/ext/tk/lib/tkextlib/blt/barchart.rb b/ext/tk/lib/tkextlib/blt/barchart.rb
index c25319458..241ce1163 100644
--- a/ext/tk/lib/tkextlib/blt/barchart.rb
+++ b/ext/tk/lib/tkextlib/blt/barchart.rb
@@ -26,6 +26,11 @@ module Tk::BLT
     end
     private :__strval_optkeys
 
+    def __tkvariable_optkeys
+      super() << 'colormap' << 'fontmap'
+    end
+    private :__tkvariable_optkeys
+
 =begin
     BarElement_ID = ['blt_barchart_bar'.freeze, '00000'.taint].freeze
 
diff --git a/ext/tk/lib/tkextlib/blt/component.rb b/ext/tk/lib/tkextlib/blt/component.rb
index eee4f6ab4..87ed838da 100644
--- a/ext/tk/lib/tkextlib/blt/component.rb
+++ b/ext/tk/lib/tkextlib/blt/component.rb
@@ -43,7 +43,13 @@ module Tk::BLT
         ['dashes']
       end
       private :__item_numlistval_optkeys
+
+      def __item_tkvariable_optkeys(id)
+        ['variable', 'textvariable', 'colormap', 'fontmap']
+      end
+      private :__item_tkvariable_optkeys
     end
+
     include OptKeys
 
     def __item_cget_cmd(id)
diff --git a/ext/tk/lib/tkextlib/blt/dragdrop.rb b/ext/tk/lib/tkextlib/blt/dragdrop.rb
index 7636c9999..3d7d652dd 100644
--- a/ext/tk/lib/tkextlib/blt/dragdrop.rb
+++ b/ext/tk/lib/tkextlib/blt/dragdrop.rb
@@ -105,7 +105,7 @@ module Tk::BLT
     end
 
     def self.__validation_class_list
-      super << PackageCommand << SiteCommand
+      super() << PackageCommand << SiteCommand
     end
 
     class << self
diff --git a/ext/tk/lib/tkextlib/blt/treeview.rb b/ext/tk/lib/tkextlib/blt/treeview.rb
index 75ce51110..4687d41b5 100644
--- a/ext/tk/lib/tkextlib/blt/treeview.rb
+++ b/ext/tk/lib/tkextlib/blt/treeview.rb
@@ -234,7 +234,7 @@ class Tk::BLT::Treeview
   end
 
   def __validation_class_list
-    super << OpenCloseCommand
+    super() << OpenCloseCommand
   end
 
   Tk::ValidateConfigure.__def_validcmd(binding, OpenCloseCommand)