diff options
| author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-09 18:35:52 +0000 |
|---|---|---|
| committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-09 18:35:52 +0000 |
| commit | cd84994255d9f33172021b1f74621fd93ff0c57a (patch) | |
| tree | e8f29319f4b3bc3bb6b6dc28eff27c373ef2e149 /ext | |
| parent | 3df602c018cabf965ebaaefd53ca0a9665428493 (diff) | |
* ext/tcltklib/tcltklib.c: fix SEGV when compiled with Tcl/Tk8.3.x or older
* ext/tk/lib/tkextlib/tile/style.rb: bug fix
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7239 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/tcltklib/tcltklib.c | 9 | ||||
| -rw-r--r-- | ext/tk/ChangeLog.tkextlib | 4 | ||||
| -rw-r--r-- | ext/tk/lib/tkextlib/tile/style.rb | 2 |
3 files changed, 15 insertions, 0 deletions
diff --git a/ext/tcltklib/tcltklib.c b/ext/tcltklib/tcltklib.c index 765417d925..67958d7beb 100644 --- a/ext/tcltklib/tcltklib.c +++ b/ext/tcltklib/tcltklib.c @@ -3306,9 +3306,12 @@ delete_slaves(ip) Tcl_Preserve(slave); +#if TCL_MAJOR_VERSION < 8 || ( TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 4) +#else if (!Tcl_InterpDeleted(slave)) { Tcl_Eval(slave, "foreach i [after info] { after cancel $i }"); } +#endif /* delete slaves of slave */ delete_slaves(slave); @@ -3356,9 +3359,12 @@ ip_free(ptr) Tcl_Eval(ptr->ip, finalize_hook_name); } +#if TCL_MAJOR_VERSION < 8 || ( TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 4) +#else if (!Tcl_InterpDeleted(ptr->ip)) { Tcl_Eval(ptr->ip, "foreach i [after info] {after cancel $i}"); } +#endif del_root(ptr->ip); @@ -3820,9 +3826,12 @@ ip_delete(self) /* Tcl_Preserve(ptr->ip); */ rbtk_preserve_ip(ptr); +#if TCL_MAJOR_VERSION < 8 || ( TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 4) +#else if (!Tcl_InterpDeleted(ptr->ip)) { Tcl_Eval(ptr->ip, "foreach i [after info] { after cancel $i }"); } +#endif del_root(ptr->ip); diff --git a/ext/tk/ChangeLog.tkextlib b/ext/tk/ChangeLog.tkextlib index 25f4469101..deda55052d 100644 --- a/ext/tk/ChangeLog.tkextlib +++ b/ext/tk/ChangeLog.tkextlib @@ -1,3 +1,7 @@ +2004-11-10 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> + + * lib/tile/style.rb: bug fix + 2004-11-07 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb: diff --git a/ext/tk/lib/tkextlib/tile/style.rb b/ext/tk/lib/tkextlib/tile/style.rb index 1e399182da..3be8c1d580 100644 --- a/ext/tk/lib/tkextlib/tile/style.rb +++ b/ext/tk/lib/tkextlib/tile/style.rb @@ -58,6 +58,8 @@ class << Tk::Tile::Style end def theme_settings(name, cmd=nil, &b) + cmd = Proc.new(&b) if !cmd && b + tk_call('style', 'theme', 'settings', name, cmd) end def theme_names() |