diff options
| author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-21 03:12:40 +0000 |
|---|---|---|
| committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-21 03:12:40 +0000 |
| commit | 30197588570d15f61f5103f0cd4c6b54d5949c3d (patch) | |
| tree | 54019d1b7d3b71db4f611c0aadafc6b98cf475ff | |
| parent | d7f6ed827fdfcabcd1e5a0d4419f5ea06f90ebaf (diff) | |
| download | ruby-30197588570d15f61f5103f0cd4c6b54d5949c3d.tar.gz | |
* 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/trunk@7620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/tk/lib/tk/grid.rb | 11 |
2 files changed, 14 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Tue Dec 21 12:10:04 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> + + * ext/tk/lib/tk/grid.rb: rescue bug of 'grid configure' on Tcl/Tk8.3- + Mon Dec 20 22:52:29 2004 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp> * added samples for the previous soap4r's commit. 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 |