diff options
| author | wolfsuit <wolfsuit> | 2005-05-15 21:09:33 (GMT) |
|---|---|---|
| committer | wolfsuit <wolfsuit> | 2005-05-15 21:09:33 (GMT) |
| commit | 96fedba896a22af86c0a426b925575af8df35400 (patch) | |
| tree | 5aee3a7ffe9823811d0c9e4c8ce3fba437eb32ec /macosx/tkMacOSXMenu.c | |
| parent | d37684e3166d0c9986993a276e65a1572d103a01 (diff) | |
| download | tk-96fedba896a22af86c0a426b925575af8df35400.zip tk-96fedba896a22af86c0a426b925575af8df35400.tar.gz tk-96fedba896a22af86c0a426b925575af8df35400.tar.bz2 | |
Fixes from Michael Kirkham:
* macosx/tkMacOSXMenu.c (TkpConfigureMenuEntry): Thinko in clearing
the ENTRY_ACCEL_MASK before re-parsing it. [Tk Bug 1012852]
* macosx/tkMacOSXScrlbr.c (UpdateControlValues): Don't set the
control value BEFORE setting the min and max or the control manager
will reset it for you. [Tk Bug 1202181]
* macosx/tkMacOSXXStubs.c (TkMacOSXXGetPixel, TkMacOSXXPutPixel):
Restore the port to what it was before putting we were called.
[Tk Bug 1202223]
Diffstat (limited to 'macosx/tkMacOSXMenu.c')
| -rw-r--r-- | macosx/tkMacOSXMenu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c index 378fe13..e1ee0ed 100644 --- a/macosx/tkMacOSXMenu.c +++ b/macosx/tkMacOSXMenu.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: tkMacOSXMenu.c,v 1.17 2005/05/14 20:48:15 das Exp $ + * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.18 2005/05/15 21:09:34 wolfsuit Exp $ */ #include "tkMacOSXInt.h" #include "tkMenubutton.h" @@ -991,7 +991,7 @@ TkpConfigureMenuEntry( char *accelString = (mePtr->accelPtr == NULL) ? "" : Tcl_GetStringFromObj(mePtr->accelPtr, NULL); char *accel = accelString; - mePtr->entryFlags |= ~ENTRY_ACCEL_MASK; + mePtr->entryFlags &= ~ENTRY_ACCEL_MASK; mePtr->entryFlags |= ParseAccelerators(&accelString); |