diff options
| author | wolfsuit <wolfsuit@noemail.net> | 2005-05-15 20:57:07 (GMT) |
|---|---|---|
| committer | wolfsuit <wolfsuit@noemail.net> | 2005-05-15 20:57:07 (GMT) |
| commit | 3137e21d0d82255a861afd547d783580409bc591 (patch) | |
| tree | cf5ca4ddc5b3e3bf86edd41ae71fe2e3fe8b4d9d /macosx/tkMacOSXMenu.c | |
| parent | 2d2208d15c4817159758d05886748a73c89f5f7b (diff) | |
| download | tk-3137e21d0d82255a861afd547d783580409bc591.zip tk-3137e21d0d82255a861afd547d783580409bc591.tar.gz tk-3137e21d0d82255a861afd547d783580409bc591.tar.bz2 | |
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]
FossilOrigin-Name: 46f4744496650759ce3587758582f26884eec032
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 f9d1e23..9f69c28 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.6.2.7 2005/05/14 20:53:31 das Exp $ + * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.6.2.8 2005/05/15 20:57:08 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); |