From dbd3ec671dec8ea39032d3b0b56387df40c66c28 Mon Sep 17 00:00:00 2001 From: "N.N." Date: Wed, 31 Mar 2004 10:24:20 +0000 Subject: toxy alpha11 svn path=/trunk/externals/miXed/; revision=1526 --- shared/hammer/gui.c | 3 ++- shared/toxy/scriptlet.c | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'shared') diff --git a/shared/hammer/gui.c b/shared/hammer/gui.c index 131ddfe..ec6add7 100644 --- a/shared/hammer/gui.c +++ b/shared/hammer/gui.c @@ -199,7 +199,8 @@ static void hammergui_setup(void) /* Protect against pdCmd being called (via "Canvas " binding) during Tcl_Finalize(). FIXME this should be a standard exit handler. */ sys_gui("proc hammergui_exithook {cmd op} {proc pd {} {}}\n"); - sys_gui("trace add execution exit enter hammergui_exithook\n"); + sys_gui("if {[info tclversion] >= 8.4} {\n\ + trace add execution exit enter hammergui_exithook}\n"); sys_gui("proc hammergui_ispatcher {cv} {\n"); sys_gui(" if {[string range $cv 0 1] == \".x\""); diff --git a/shared/toxy/scriptlet.c b/shared/toxy/scriptlet.c index a2f5ee0..192eaa6 100644 --- a/shared/toxy/scriptlet.c +++ b/shared/toxy/scriptlet.c @@ -471,8 +471,12 @@ void scriptlet_qpush(t_scriptlet *sp) sys_gui(sp->s_buffer); *tail = 0; sprintf(buf, "\ - trace add variable ::toxy::reply write \"::toxy::doreply %s\"\n\ - ::toxy::query}\n", sp->s_rptarget->s_name); + if {[info tclversion] < 8.4} {\n\ + trace variable ::toxy::reply w \"::toxy::doreply %s\"\n\ + } else {\n\ + trace add variable ::toxy::reply write \"::toxy::doreply %s\"\n\ + }\n\ + ::toxy::query}\n", sp->s_rptarget->s_name, sp->s_rptarget->s_name); sys_gui(buf); } } -- cgit v1.2.1