From 35dcc04709bd5a5564145ae34878b84e9b1406cb Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 21 Nov 2003 07:49:11 +0000
Subject: * ext/tk/lib/tkentry.rb: fix the encoding trouble of percent  
 substitutions on validatecommand option of TkEntry widget * ext/tk/lib/tk.rb:
 fix bug on {pack|grid}_propagate() method

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5000 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/lib/tk.rb      | 8 ++++----
 ext/tk/lib/tkentry.rb | 9 ++++++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'ext')

diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 9c7a0982c..cec589047 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -4053,8 +4053,8 @@ class TkWindow<TkObject
     return info
   end
 
-  def pack_propagate(mode = nil)
-    if mode
+  def pack_propagate(mode=None)
+    if mode == None
       tk_call('pack', 'propagate', epath, mode)
     else
       bool(tk_call('pack', 'propagate', epath))
@@ -4141,8 +4141,8 @@ class TkWindow<TkObject
     list(tk_call('grid', 'location', epath, x, y))
   end
 
-  def grid_propagate(mode=nil)
-    if mode
+  def grid_propagate(mode=None)
+    if mode == None
       tk_call('grid', 'propagate', epath, mode)
     else
       bool(tk_call('grid', 'propagate', epath))
diff --git a/ext/tk/lib/tkentry.rb b/ext/tk/lib/tkentry.rb
index fc52b9435..e0589802d 100644
--- a/ext/tk/lib/tkentry.rb
+++ b/ext/tk/lib/tkentry.rb
@@ -27,9 +27,10 @@ class TkEntry<TkLabel
 
     class ValidateArgs
       VARG_KEY  = 'disvPSVW'
-      VARG_TYPE = 'nxsssssw'
+      VARG_TYPE = 'nxeseesw'
 
       def self.scan_args(arg_str, arg_val)
+	enc = Tk.encoding
 	arg_cnv = []
 	arg_str.strip.split(/\s+/).each_with_index{|kwd,idx|
 	  if kwd =~ /^%(.)$/
@@ -39,6 +40,12 @@ class TkEntry<TkLabel
 		arg_cnv << TkComm::number(arg_val[idx])
 	      when ?s
 		arg_cnv << TkComm::string(arg_val[idx])
+	      when ?e
+		if enc
+		  arg_cnv << Tk.fromUTF8(TkComm::string(arg_val[idx]), enc)
+		else
+		  arg_cnv << TkComm::string(arg_val[idx])
+		end
 	      when ?w
 		arg_cnv << TkComm::window(arg_val[idx])
 	      when ?x
-- 
cgit