diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-14 13:48:03 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-14 13:48:03 (GMT) |
| commit | 0b9e60051d8b56808f7674686838055b264485f1 (patch) | |
| tree | 94a7466233e7a73007acc61a138d2a1b04aafeca /macosx | |
| parent | 5da102f8bd2f7296a1786f951e0aedf27941ccb5 (diff) | |
| download | tk-0b9e60051d8b56808f7674686838055b264485f1.zip tk-0b9e60051d8b56808f7674686838055b264485f1.tar.gz tk-0b9e60051d8b56808f7674686838055b264485f1.tar.bz2 | |
Replace various functions calls, for functions which are small wrappers around other functions, to call the wrapped function directly.
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXDialog.c | 4 | ||||
| -rw-r--r-- | macosx/tkMacOSXInit.c | 12 | ||||
| -rw-r--r-- | macosx/tkMacOSXWindowEvent.c | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c index df1dbab..a0eef7c 100644 --- a/macosx/tkMacOSXDialog.c +++ b/macosx/tkMacOSXDialog.c @@ -502,8 +502,8 @@ Tk_GetOpenFileObjCmd( * The -typevariable option is not really supported. */ - Tcl_SetVar(interp, Tcl_GetString(typeVariablePtr), "", - TCL_GLOBAL_ONLY); + Tcl_SetVar2(interp, Tcl_GetString(typeVariablePtr), NULL, + "", TCL_GLOBAL_ONLY); } end: diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c index 01f893e..1f70149 100644 --- a/macosx/tkMacOSXInit.c +++ b/macosx/tkMacOSXInit.c @@ -363,11 +363,11 @@ TkpInit( */ if (Tcl_GetStartupScript(NULL) == NULL) { - const char *intvar = Tcl_GetVar(interp, - "tcl_interactive", TCL_GLOBAL_ONLY); + const char *intvar = Tcl_GetVar2(interp, + "tcl_interactive", NULL, TCL_GLOBAL_ONLY); if (intvar == NULL) { - Tcl_SetVar(interp, "tcl_interactive", "1", + Tcl_SetVar2(interp, "tcl_interactive", NULL, "1", TCL_GLOBAL_ONLY); } } @@ -380,11 +380,11 @@ TkpInit( Tk_MacOSXSetupTkNotifier(); if (tkLibPath[0] != '\0') { - Tcl_SetVar(interp, "tk_library", tkLibPath, TCL_GLOBAL_ONLY); + Tcl_SetVar2(interp, "tk_library", NULL, tkLibPath, TCL_GLOBAL_ONLY); } if (scriptPath[0] != '\0') { - Tcl_SetVar(interp, "auto_path", scriptPath, + Tcl_SetVar2(interp, "auto_path", NULL, scriptPath, TCL_GLOBAL_ONLY|TCL_LIST_ELEMENT|TCL_APPEND_VALUE); } @@ -421,7 +421,7 @@ TkpGetAppName( { const char *p, *name; - name = Tcl_GetVar(interp, "argv0", TCL_GLOBAL_ONLY); + name = Tcl_GetVar2(interp, "argv0", NULL, TCL_GLOBAL_ONLY); if ((name == NULL) || (*name == 0)) { name = "tk"; } else { diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c index c14c6eb..9402cbb 100644 --- a/macosx/tkMacOSXWindowEvent.c +++ b/macosx/tkMacOSXWindowEvent.c @@ -272,7 +272,7 @@ extern NSString *opaqueTag; int code = Tcl_EvalEx(_eventInterp, cmd, -1, TCL_EVAL_GLOBAL); if (code != TCL_OK) { - Tcl_BackgroundError(_eventInterp); + Tcl_BackgroundException(_eventInterp, code); } Tcl_ResetResult(_eventInterp); } @@ -706,7 +706,7 @@ TkWmProtocolEventProc( Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf( "\n (command for \"%s\" window manager protocol)", Tk_GetAtomName((Tk_Window) winPtr, protocol))); - Tcl_BackgroundError(interp); + Tcl_BackgroundException(interp, result); } Tcl_Release(interp); Tcl_Release(protPtr); |