summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2007-07-25 05:24:54 (GMT)
committerdas <das>2007-07-25 05:24:54 (GMT)
commit06cbfb8e6af582eb4a59fee7868029b9d608bbe3 (patch)
treea044b482a370f93d59854b216b3f8cbb33a9970f
parenta6c78109ec048c2c92578fc5b1de44043c7ee6cc (diff)
downloadtk-06cbfb8e6af582eb4a59fee7868029b9d608bbe3.zip
tk-06cbfb8e6af582eb4a59fee7868029b9d608bbe3.tar.gz
tk-06cbfb8e6af582eb4a59fee7868029b9d608bbe3.tar.bz2
* macosx/tkMacOSXDialog.c (NavServicesGetFile): reset interp result on
nav dialog cancel. [Bug 1743786]
-rw-r--r--ChangeLog5
-rw-r--r--macosx/tkMacOSXDialog.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 320dec9..37c6b1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-25 Daniel Steffen <das@users.sourceforge.net>
+
+ * macosx/tkMacOSXDialog.c (NavServicesGetFile): reset interp result on
+ nav dialog cancel. [Bug 1743786]
+
2007-07-09 Daniel Steffen <das@users.sourceforge.net>
* macosx/tkMacOSXWindowEvent.c (Tk_MacOSXIsAppInFront): use process mgr
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index b0aff20..6d7665b 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXDialog.c,v 1.4.2.16 2007/06/29 03:22:01 das Exp $
+ * RCS: @(#) $Id: tkMacOSXDialog.c,v 1.4.2.17 2007/07/25 05:25:01 das Exp $
*/
#include "tkMacOSXPrivate.h"
@@ -944,6 +944,7 @@ NavServicesGetFile(
Tcl_SetObjResult(interp, theResult);
result = TCL_OK;
} else if (err == userCanceledErr) {
+ Tcl_ResetResult(interp);
result = TCL_OK;
}