From f92a3958e397da3df239b250b48063ee7e76a198 Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 2 Dec 2004 16:59:02 +0000
Subject: * ext/tk/lib/tk.rb: widget configuration by TkWindow#method_missing  
 returns proper object. "widget.option = val" returns val, and  
 "widget.option(val)" returns self. * ext/tk/lib/tk/font.rb: TkFont#replace
 accepts only one font argument. * ext/tk/lib/tk/radiobutton.rb: add
 TkRadiobutton#value and value=(val). * ext/tk/lib/tk/spinbox.rb: callback
 substitution support on command option. * ext/tk/sample/demos-en/widget: bug
 fix (wrong image height) * ext/tk/sample/demos-jp/widget: ditto.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7442 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/lib/tk.rb             |  2 ++
 ext/tk/lib/tk/font.rb        |  3 ++-
 ext/tk/lib/tk/radiobutton.rb | 19 +++++++++++++++++++
 ext/tk/lib/tk/spinbox.rb     | 44 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 67 insertions(+), 1 deletion(-)

(limited to 'ext/tk/lib')

diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 0abab4b3e..9081eb993 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -3186,8 +3186,10 @@ class TkObject<TkKernel
     when 1
       if name[-1] == ?=
         configure name[0..-2], args[0]
+        args[0]
       else
         configure name, args[0]
+        self
       end
     when 0
       begin
diff --git a/ext/tk/lib/tk/font.rb b/ext/tk/lib/tk/font.rb
index 02e09c606..2ebe6612b 100644
--- a/ext/tk/lib/tk/font.rb
+++ b/ext/tk/lib/tk/font.rb
@@ -1362,7 +1362,8 @@ class TkFont
     end
   end
 
-  def replace(ltn, knj)
+  def replace(ltn, knj=None)
+    knj = ltn if knj == None
     latin_replace(ltn)
     kanji_replace(knj)
     self
diff --git a/ext/tk/lib/tk/radiobutton.rb b/ext/tk/lib/tk/radiobutton.rb
index 697c02128..8ee67bde6 100644
--- a/ext/tk/lib/tk/radiobutton.rb
+++ b/ext/tk/lib/tk/radiobutton.rb
@@ -28,5 +28,24 @@ class TkRadioButton<TkButton
   def variable(v)
     configure 'variable', tk_trace_variable(v)
   end
+
+  def value
+    var = tk_send_without_enc('cget', '-variable')
+    if TkVariable::USE_TCLs_SET_VARIABLE_FUNCTIONS
+      _fromUTF8(INTERP._get_global_var(var))
+    else
+      INTERP._eval(Kernel.format('global %s; set %s', var, var))
+    end
+  end
+
+  def value=(val)
+    var = tk_send_without_enc('cget', '-variable')
+    if TkVariable::USE_TCLs_SET_VARIABLE_FUNCTIONS
+      _fromUTF8(INTERP._set_global_var(var, _get_eval_string(val, true)))
+    else
+      s = '"' + _get_eval_string(val).gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
+      INTERP._eval(Kernel.format('global %s; set %s %s', var, var, s))
+    end
+  end
 end
 TkRadiobutton = TkRadioButton
diff --git a/ext/tk/lib/tk/spinbox.rb b/ext/tk/lib/tk/spinbox.rb
index f4febb05b..fe50d85e4 100644
--- a/ext/tk/lib/tk/spinbox.rb
+++ b/ext/tk/lib/tk/spinbox.rb
@@ -11,6 +11,50 @@ class TkSpinbox<TkEntry
   WidgetClassName = 'Spinbox'.freeze
   WidgetClassNames[WidgetClassName] = self
 
+  class SpinCommand < TkValidateCommand
+    class ValidateArgs < TkUtil::CallbackSubst
+      KEY_TBL = [
+        [ ?d, ?s, :direction ], 
+        [ ?s, ?e, :current ], 
+        [ ?W, ?w, :widget ], 
+        nil
+      ]
+
+      PROC_TBL = [
+        [ ?s, TkComm.method(:string) ], 
+        [ ?w, TkComm.method(:window) ], 
+
+        [ ?e, proc{|val|
+            enc = Tk.encoding
+            if enc
+              Tk.fromUTF8(TkComm::string(val), enc)
+            else
+              TkComm::string(val)
+            end
+          }
+        ], 
+
+        nil
+      ]
+
+      _setup_subst_table(KEY_TBL, PROC_TBL);
+
+      def self.ret_val(val)
+        (val)? '1': '0'
+      end
+    end
+
+    def self._config_keys
+      ['command']
+    end
+  end
+
+  def __validation_class_list
+    super << SpinCommand
+  end
+
+  Tk::ValidateConfigure.__def_validcmd(binding, SpinCommand)
+
   #def create_self(keys)
   #  tk_call_without_enc('spinbox', @path)
   #  if keys and keys != None
-- 
cgit