From 519aed5fabb945ec0cba25f0f0fd6934819983f2 Mon Sep 17 00:00:00 2001 From: nagai Date: Tue, 21 Dec 2004 03:12:40 +0000 Subject: * ext/tk/lib/tk/grid.rb: rescue bug of 'grid configure' on Tcl/Tk8.3- git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ ext/tk/lib/tk/grid.rb | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ed8b616d75..3842b86c05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Dec 21 12:10:04 2004 Hidetoshi NAGAI + + * ext/tk/lib/tk/grid.rb: rescue bug of 'grid configure' on Tcl/Tk8.3- + Tue Dec 21 00:53:01 2004 Yukihiro Matsumoto * ext/openssl/ossl_asn1.c (ossl_asn1_traverse): [ruby-dev:25261] diff --git a/ext/tk/lib/tk/grid.rb b/ext/tk/lib/tk/grid.rb index 74287d43bd..499101f1bb 100644 --- a/ext/tk/lib/tk/grid.rb +++ b/ext/tk/lib/tk/grid.rb @@ -42,7 +42,16 @@ module TkGrid params.push("-#{k}") params.push((v.kind_of?(TkObject))? v.epath: v) } - tk_call_without_enc("grid", 'configure', *params) + if Tk::TCL_MAJOR_VERSION < 8 || + (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION <= 3) + if params[0] == '-' || params[0] == 'x' || params[0] == '^' + tk_call_without_enc('grid', *params) + else + tk_call_without_enc('grid', 'configure', *params) + end + else + tk_call_without_enc('grid', 'configure', *params) + end end alias grid configure -- cgit v1.2.3