summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2001-04-04 18:37:17 (GMT)
committerhobbs <hobbs>2001-04-04 18:37:17 (GMT)
commitfe331f8e923d4a2673e6af3cb8e72e701821e64e (patch)
tree01d4b4786bb64e6451a83ce435ee91dde19f3b62
parent187617402a472581b7cd6ddfc2d42fe5a833a8b2 (diff)
downloadtk-fe331f8e923d4a2673e6af3cb8e72e701821e64e.zip
tk-fe331f8e923d4a2673e6af3cb8e72e701821e64e.tar.gz
tk-fe331f8e923d4a2673e6af3cb8e72e701821e64e.tar.bz2
* win/tkWinMenu.c (TkWinHandleMenuEvent): corrected reseting of
service mode to only occur when it was set. [Bug #220948]
-rw-r--r--ChangeLog18
-rw-r--r--win/tkWinMenu.c4
2 files changed, 20 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 64917b1..bd35b71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2001-04-04 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * win/tkWinMenu.c (TkWinHandleMenuEvent): corrected reseting of
+ service mode to only occur when it was set. [Bug #220948]
+
+2001-04-03 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * tests/winClipboard.test: improved results for understanding when
+ tests fail.
+
+ * tests/winDialog.test: string totitle'd some results that
+ expected [pwd] to return a capital drive letter.
+
+ * tests/cursor.test: changed tests to use 'heart' cursor because
+ 'arrow' on windows has a pre-skewed use count.
+
+ * win/tkWinDialog.c (GetFileNameA): initialize multi to 0.
+
2001-04-02 Jeff Hobbs <jeffh@ActiveState.com>
* win/configure:
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c
index 3fb0102..05dc421 100644
--- a/win/tkWinMenu.c
+++ b/win/tkWinMenu.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWinMenu.c,v 1.13 2000/08/29 21:00:13 ericm Exp $
+ * RCS: @(#) $Id: tkWinMenu.c,v 1.14 2001/04/04 18:37:18 hobbs Exp $
*/
#define OEMRESOURCE
@@ -1101,8 +1101,8 @@ TkWinHandleMenuEvent(phwnd, pMessage, pwParam, plParam, plResult)
TkMenuInit();
if ((flags == 0xFFFF) && (*plParam == 0)) {
- Tcl_SetServiceMode(tsdPtr->oldServiceMode);
if (tsdPtr->modalMenuPtr != NULL) {
+ Tcl_SetServiceMode(tsdPtr->oldServiceMode);
RecursivelyClearActiveMenu(tsdPtr->modalMenuPtr);
}
} else {