diff options
| author | kevin_walzer <kevin_walzer@noemail.net> | 2012-10-02 00:49:25 (GMT) |
|---|---|---|
| committer | kevin_walzer <kevin_walzer@noemail.net> | 2012-10-02 00:49:25 (GMT) |
| commit | fd50d9ee3e62dd70cc295d37402153e901a0b6c0 (patch) | |
| tree | 549927193340a734dce34da8094620d4f1d5611a | |
| parent | e7424ffac34c7620b104e24ebd35013dedc4d354 (diff) | |
| download | tk-fd50d9ee3e62dd70cc295d37402153e901a0b6c0.zip tk-fd50d9ee3e62dd70cc295d37402153e901a0b6c0.tar.gz tk-fd50d9ee3e62dd70cc295d37402153e901a0b6c0.tar.bz2 | |
Fix for 3572016, menus not re-enabling after modal dialog
FossilOrigin-Name: b84bc7c57ff640c88d72c0e0016df350b91a9283
| -rw-r--r-- | macosx/tkMacOSXMenu.c | 6 | ||||
| -rw-r--r-- | macosx/tkMacOSXNotify.c | 2 | ||||
| -rw-r--r-- | macosx/tkMacOSXSubwindows.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c index 8054c57..83ad47a 100644 --- a/macosx/tkMacOSXMenu.c +++ b/macosx/tkMacOSXMenu.c @@ -236,6 +236,12 @@ static int ModifierCharWidth(Tk_Font tkfont); return [menuItem isEnabled]; } +// Workaround for bug 3572016; leaves menu items enabled during modal dialog. +- (BOOL)worksWhenModal +{ + return YES; +} + - (void) tkMenuItemInvoke: (id) sender { /* diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c index 689f45e..3e0dfde 100644 --- a/macosx/tkMacOSXNotify.c +++ b/macosx/tkMacOSXNotify.c @@ -274,7 +274,7 @@ TkMacOSXEventsCheckProc( TSD_INIT(); if (tsdPtr->currentEvent) { currentEvent = TkMacOSXMakeCollectableAndAutorelease( - tsdPtr->currentEvent); + tsdPtr->currentEvent); } do { modalSession = TkMacOSXGetModalSession(); diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c index 8cf8d65..18276fb 100644 --- a/macosx/tkMacOSXSubwindows.c +++ b/macosx/tkMacOSXSubwindows.c @@ -65,7 +65,7 @@ XDestroyWindow( TkMacOSXSelDeadWindow(macWin->winPtr); macWin->toplevel->referenceCount--; - if (!Tk_IsTopLevel(macWin->winPtr)) { + if (!Tk_IsTopLevel(macWin->winPtr) ) { TkMacOSXInvalidateWindow(macWin, TK_PARENT_WINDOW); if (macWin->winPtr->parentPtr != NULL) { TkMacOSXInvalClipRgns((Tk_Window) macWin->winPtr->parentPtr); |