diff options
| author | dgp <dgp@users.sourceforge.net> | 2011-08-05 18:54:32 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2011-08-05 18:54:32 (GMT) |
| commit | 729f551a3a758a6edfbb4c6d364e4aa27fe94356 (patch) | |
| tree | eb10306c8eaee8240b7ae554dc50ed95842ba1a9 | |
| parent | c4ca35cc303677b06aae8587f802608660f7645b (diff) | |
| parent | 72ce81a049b258f65e778a1b37e57af94c643159 (diff) | |
| download | tk-729f551a3a758a6edfbb4c6d364e4aa27fe94356.zip tk-729f551a3a758a6edfbb4c6d364e4aa27fe94356.tar.gz tk-729f551a3a758a6edfbb4c6d364e4aa27fe94356.tar.bz2 | |
merge to rc
| -rw-r--r-- | macosx/tkMacOSXDraw.c | 1 | ||||
| -rw-r--r-- | macosx/tkMacOSXMenu.c | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c index 5bafad1..806cbf4 100644 --- a/macosx/tkMacOSXDraw.c +++ b/macosx/tkMacOSXDraw.c @@ -17,6 +17,7 @@ #include "tkMacOSXDebug.h" #include "xbytes.h" + /* #ifdef TK_MAC_DEBUG #define TK_MAC_DEBUG_DRAWING diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c index 3ada6d7..19db490 100644 --- a/macosx/tkMacOSXMenu.c +++ b/macosx/tkMacOSXMenu.c @@ -251,6 +251,8 @@ static int ModifierCharWidth(Tk_Font tkfont); if (menuPtr && mePtr) { Tcl_Interp *interp = menuPtr->interp; + /*Add time for errors to fire if necessary. This is sub-optimal but avoids issues with Tcl/Cocoa event loop integration.*/ + Tcl_Sleep(100); Tcl_Preserve(interp); Tcl_Preserve(menuPtr); @@ -343,8 +345,8 @@ static int ModifierCharWidth(Tk_Font tkfont); int result = TkPostCommand(_tkMenu); if (result!=TCL_OK && result!=TCL_CONTINUE && result!=TCL_BREAK) { - Tcl_AddErrorInfo(interp, "\n (menu preprocess)"); - Tcl_BackgroundException(interp, result); + Tcl_AddErrorInfo(interp, "\n (menu preprocess)"); + Tcl_BackgroundException(interp, result); } Tcl_Release(menuPtr); Tcl_Release(interp); |