aboutsummaryrefslogtreecommitdiffstats
path: root/ext/tk/lib/multi-tk.rb
diff options
context:
space:
mode:
authornagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-07-05 05:56:31 +0000
committernagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-07-05 05:56:31 +0000
commite3849ae9878e78fd089d117f5bd2cb787a62e941 (patch)
tree4eb42beb78e9a7d85198c12948ac76486ccd4818 /ext/tk/lib/multi-tk.rb
parent6556fb4f00f041e06cd53ca4eab20967c02ffee8 (diff)
downloadruby-e3849ae9878e78fd089d117f5bd2cb787a62e941.tar.gz
* ext/tk/tcltklib.c: bug fix on treating Unicode strings.
* ext/tk/tcltklib.c: add methods to treat encoding mode. * ext/tk/MANUAL_tcltklib.eng: add description of TclTkLib#encoding, encoding_system, and so on. * ext/tk/MANUAL_tcltklib.eucj: ditto. * ext/tk/tkutil/tkutil.c: fail to create a Tcl's list string from an array including multiple kind of encoded strings. * ext/tk/lib/tk.rb: ditto. * ext/tk/lib/multi-tk.rb: 2nd arg of _{to|from}UTF8 is omissible. * ext/tk/lib/remote-tk.rb: ditto. * ext/tk/lib/tk.rb: override TclTkLib#encoding and encoding= to use TkCore::INTERP.encoding and encoding=. * ext/tk/lib/tk.rb: when "require 'tk'" and $KCODE=='NONE', check DEFAULT_TK_ENCODING to decide Ruby/Tk's system encoding mode. * ext/tk/lib/tk/encodedstr.rb: check both of Tk.encoding and Tk.encoding_system. Tk.encoding has higher priority. * ext/tk/lib/tk/optiondb.rb: ditto. * ext/tk/lib/tk/spinbox.rb: ditto. * ext/tk/lib/tk/validation.rb: ditto. * ext/tk/lib/tk/namespace.rb: arguemnts for TclTkIp#_merge_tklist should be UTF-8 strings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8722 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk/lib/multi-tk.rb')
-rw-r--r--ext/tk/lib/multi-tk.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb
index 6d048e91bc..e8bbf67de1 100644
--- a/ext/tk/lib/multi-tk.rb
+++ b/ext/tk/lib/multi-tk.rb
@@ -1730,11 +1730,11 @@ class << MultiTkIp
__getip._invoke_with_enc(*args)
end
- def _toUTF8(str, encoding)
+ def _toUTF8(str, encoding=nil)
__getip._toUTF8(str, encoding)
end
- def _fromUTF8(str, encoding)
+ def _fromUTF8(str, encoding=nil)
__getip._fromUTF8(str, encoding)
end
@@ -2119,11 +2119,11 @@ class MultiTkIp
@interp._invoke_with_enc(*args)
end
- def _toUTF8(str, encoding)
+ def _toUTF8(str, encoding=nil)
@interp._toUTF8(str, encoding)
end
- def _fromUTF8(str, encoding)
+ def _fromUTF8(str, encoding=nil)
@interp._fromUTF8(str, encoding)
end