[GRASS-SVN] r54796 - grass/branches/releasebranch_6_4/visualization/nviz/src

[svn_grass at osgeo.org]

Author: mmetz
Date: 2013-01-27 13:36:27 -0800 (Sun, 27 Jan 2013)
New Revision: 54796

Modified:
   grass/branches/releasebranch_6_4/visualization/nviz/src/draw.c
   grass/branches/releasebranch_6_4/visualization/nviz/src/interface.h
Log:
nviz: fix #1843

Modified: grass/branches/releasebranch_6_4/visualization/nviz/src/draw.c
===================================================================
--- grass/branches/releasebranch_6_4/visualization/nviz/src/draw.c	2013-01-27 21:03:24 UTC (rev 54795)
+++ grass/branches/releasebranch_6_4/visualization/nviz/src/draw.c	2013-01-27 21:36:27 UTC (rev 54796)
@@ -32,7 +32,7 @@
 void CancelFunc_Hook(void)
 {
     if (cancel_script != NULL) {
-	TkCopyAndGlobalEval(cancel_interp, cancel_script);
+	Tcl_EvalEx(cancel_interp, cancel_script, -1, TCL_EVAL_GLOBAL);
     }
 }
 

Modified: grass/branches/releasebranch_6_4/visualization/nviz/src/interface.h
===================================================================
--- grass/branches/releasebranch_6_4/visualization/nviz/src/interface.h	2013-01-27 21:03:24 UTC (rev 54795)
+++ grass/branches/releasebranch_6_4/visualization/nviz/src/interface.h	2013-01-27 21:36:27 UTC (rev 54796)
@@ -312,9 +312,6 @@
 /* tkAppInit.c */
 int Tcl_AppInit(Tcl_Interp *);
 
-/* tkBind.c */
-int TkCopyAndGlobalEval(Tcl_Interp *, char *);
-
 /* tkSend.c */
 #if TK_MAJOR_VERSION==8 && TK_MINOR_VERSION > 3
 CONST char *Tk_SetAppName(Tk_Window, CONST char *);