summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-03-07 15:45:54 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-03-07 15:45:54 (GMT)
commitfa8e8bdc1f17f5e80540ecf8a72127c33133e0cf (patch)
tree232ef728d6ccfbf0c1b1c3acfdfe394710a0d508
parent94cd3ab8f3c3b77c4268f5a8f65e3669a4fb10f2 (diff)
downloadtk-fa8e8bdc1f17f5e80540ecf8a72127c33133e0cf.zip
tk-fa8e8bdc1f17f5e80540ecf8a72127c33133e0cf.tar.gz
tk-fa8e8bdc1f17f5e80540ecf8a72127c33133e0cf.tar.bz2
Benefit somwhat more from the TCL_EVAL_GLOBAL flag
-rw-r--r--generic/tkCanvPs.c4
-rw-r--r--macosx/tkMacOSXHLEvents.c8
-rw-r--r--macosx/tkMacOSXMenus.c2
3 files changed, 7 insertions, 7 deletions
diff --git a/generic/tkCanvPs.c b/generic/tkCanvPs.c
index fe4d043..244f993 100644
--- a/generic/tkCanvPs.c
+++ b/generic/tkCanvPs.c
@@ -193,13 +193,13 @@ TkCanvPostscriptCmd(
* such.
*/
- result = Tcl_EvalEx(interp, "::tk::ensure_psenc_is_loaded", -1,
+ result = Tcl_EvalEx(interp, "tk::ensure_psenc_is_loaded", -1,
TCL_EVAL_GLOBAL);
if (result != TCL_OK) {
return result;
}
preambleObj = Tcl_GetVar2Ex(interp, "::tk::ps_preamble", NULL,
- TCL_LEAVE_ERR_MSG);
+ TCL_LEAVE_ERR_MSG | TCL_EVAL_GLOBAL);
if (preambleObj == NULL) {
return TCL_ERROR;
}
diff --git a/macosx/tkMacOSXHLEvents.c b/macosx/tkMacOSXHLEvents.c
index ffbb06d..3699f7b 100644
--- a/macosx/tkMacOSXHLEvents.c
+++ b/macosx/tkMacOSXHLEvents.c
@@ -222,7 +222,7 @@ OappHandler(
if (interp &&
Tcl_GetCommandInfo(interp, "::tk::mac::OpenApplication", &dummy)){
- int code = Tcl_EvalEx(interp, "::tk::mac::OpenApplication", -1, TCL_EVAL_GLOBAL);
+ int code = Tcl_EvalEx(interp, "tk::mac::OpenApplication", -1, TCL_EVAL_GLOBAL);
if (code != TCL_OK) {
Tcl_BackgroundException(interp, code);
}
@@ -259,7 +259,7 @@ RappHandler(
if (interp && Tcl_GetCommandInfo(interp,
"::tk::mac::ReopenApplication", &dummy)) {
- int code = Tcl_EvalEx(interp, "::tk::mac::ReopenApplication", -1, TCL_EVAL_GLOBAL);
+ int code = Tcl_EvalEx(interp, "tk::mac::ReopenApplication", -1, TCL_EVAL_GLOBAL);
if (code != TCL_OK){
Tcl_BackgroundException(interp, code);
}
@@ -295,7 +295,7 @@ PrefsHandler(
if (interp &&
Tcl_GetCommandInfo(interp, "::tk::mac::ShowPreferences", &dummy)){
- int code = Tcl_EvalEx(interp, "::tk::mac::ShowPreferences", -1, TCL_EVAL_GLOBAL);
+ int code = Tcl_EvalEx(interp, "tk::mac::ShowPreferences", -1, TCL_EVAL_GLOBAL);
if (code != TCL_OK) {
Tcl_BackgroundException(interp, code);
}
@@ -625,7 +625,7 @@ ReallyKillMe(
Tcl_Interp *interp = ((KillEvent *) eventPtr)->interp;
Tcl_CmdInfo dummy;
int quit = Tcl_GetCommandInfo(interp, "::tk::mac::Quit", &dummy);
- int code = Tcl_EvalEx(interp, quit ? "::tk::mac::Quit" : "exit", -1, TCL_EVAL_GLOBAL);
+ int code = Tcl_EvalEx(interp, quit ? "tk::mac::Quit" : "exit", -1, TCL_EVAL_GLOBAL);
if (code != TCL_OK) {
/*
diff --git a/macosx/tkMacOSXMenus.c b/macosx/tkMacOSXMenus.c
index 881bf75..678271b 100644
--- a/macosx/tkMacOSXMenus.c
+++ b/macosx/tkMacOSXMenus.c
@@ -193,7 +193,7 @@ static Tcl_Obj * GetWidgetDemoPath(Tcl_Interp *interp);
"::tk::mac::ShowHelp", &dummy)) {
[super showHelp:sender];
} else {
- int code = Tcl_EvalEx(_eventInterp, "::tk::mac::ShowHelp", -1,
+ int code = Tcl_EvalEx(_eventInterp, "tk::mac::ShowHelp", -1,
TCL_EVAL_GLOBAL);
if (code != TCL_OK) {