summaryrefslogtreecommitdiffstats
path: root/win/tkWinDialog.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-03-22 11:44:36 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-03-22 11:44:36 (GMT)
commit314ca5019e04ec53c1ea17f8f7443f6eac02a5ba (patch)
tree631aa047f593787a41cd55d8be0fdcec04984c76 /win/tkWinDialog.c
parent63504284a60a6ae199422ecb41637700339cd333 (diff)
parentde3f6dd4ea12576354f6128c2c982bb648c53f64 (diff)
downloadtk-bug_38dc27bd1d0ecd68.zip
tk-bug_38dc27bd1d0ecd68.tar.gz
tk-bug_38dc27bd1d0ecd68.tar.bz2
Fix test-case bind-27.2 on X11 (it worked on win32)bug_38dc27bd1d0ecd68
Merge trunk.
Diffstat (limited to 'win/tkWinDialog.c')
-rw-r--r--win/tkWinDialog.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c
index d7f63fb..f763a7b 100644
--- a/win/tkWinDialog.c
+++ b/win/tkWinDialog.c
@@ -1113,7 +1113,7 @@ ParseOFNOptions(
if (strcmp(Tcl_GetString(objv[i]), "-xpstyle"))
goto error_return;
if (i + 1 == objc) {
- Tcl_SetResult(interp, "value for \"-xpstyle\" missing", TCL_STATIC);
+ Tcl_SetObjResult(interp, Tcl_NewStringObj("value for \"-xpstyle\" missing", -1));
Tcl_SetErrorCode(interp, "TK", "FILEDIALOG", "VALUE", NULL);
goto error_return;
}
@@ -1281,9 +1281,8 @@ static int GetFileNameVista(Tcl_Interp *interp, OFNOpts *optsPtr,
int oldMode;
if (tsdPtr->newFileDialogsState != FDLG_STATE_USE_NEW) {
- /* XXX - should be an assert but Tcl does not seem to have one? */
- Tcl_SetResult(interp, "Internal error: GetFileNameVista: IFileDialog API not available", TCL_STATIC);
- return TCL_ERROR;
+ Tcl_Panic("Internal error: GetFileNameVista: IFileDialog API not available");
+ return TCL_ERROR;
}
/*