Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Fix for bgerror conflict with Tk-Cocoa menu |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
104c33095573530be03db53853000a5e |
User & Date: | kevin_walzer 2011-08-05 00:11:19 |
Context
2011-08-08
| ||
18:09 | merge release to trunk check-in: 3fee6bc9 user: dgp tags: trunk | |
2011-08-05
| ||
18:54 | merge to rc check-in: 339bf58d user: dgp tags: core-8-6-b2-rc | |
00:11 | Fix for bgerror conflict with Tk-Cocoa menu check-in: 104c3309 user: kevin_walzer tags: trunk | |
2011-08-03
| ||
16:50 | Bug 2891541 Merge of 8.5.8 fix from Pat Thoyts. Permit normal behaviour on Windows for a grabbed toplevel when it is the main window. check-in: 51bf0af1 user: dgp tags: trunk | |
Changes
Changes to macosx/tkMacOSXDraw.c.
︙ | ︙ | |||
12 13 14 15 16 17 18 19 20 21 22 23 24 25 | * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include "tkMacOSXPrivate.h" #include "tkMacOSXDebug.h" #include "xbytes.h" /* #ifdef TK_MAC_DEBUG #define TK_MAC_DEBUG_DRAWING #define TK_MAC_DEBUG_IMAGE_DRAWING #endif */ | > | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include "tkMacOSXPrivate.h" #include "tkMacOSXDebug.h" #include "xbytes.h" /* #ifdef TK_MAC_DEBUG #define TK_MAC_DEBUG_DRAWING #define TK_MAC_DEBUG_IMAGE_DRAWING #endif */ |
︙ | ︙ |
Changes to macosx/tkMacOSXMenu.c.
︙ | ︙ | |||
247 248 249 250 251 252 253 254 255 256 257 258 259 260 | if ([sender isKindOfClass:[NSMenuItem class]]) { NSMenuItem *menuItem = (NSMenuItem *)sender; TkMenu *menuPtr = (TkMenu *)_tkMenu; TkMenuEntry *mePtr = (TkMenuEntry *)[menuItem tag]; if (menuPtr && mePtr) { Tcl_Interp *interp = menuPtr->interp; Tcl_Preserve(interp); Tcl_Preserve(menuPtr); int result = TkInvokeMenu(interp, menuPtr, mePtr->index); if (result != TCL_OK && result != TCL_CONTINUE && | > > | 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 | if ([sender isKindOfClass:[NSMenuItem class]]) { NSMenuItem *menuItem = (NSMenuItem *)sender; TkMenu *menuPtr = (TkMenu *)_tkMenu; TkMenuEntry *mePtr = (TkMenuEntry *)[menuItem tag]; 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); int result = TkInvokeMenu(interp, menuPtr, mePtr->index); if (result != TCL_OK && result != TCL_CONTINUE && |
︙ | ︙ | |||
339 340 341 342 343 344 345 | Tcl_Preserve(interp); Tcl_Preserve(menuPtr); int result = TkPostCommand(_tkMenu); if (result!=TCL_OK && result!=TCL_CONTINUE && result!=TCL_BREAK) { | | | | 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 | Tcl_Preserve(interp); Tcl_Preserve(menuPtr); 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_Release(menuPtr); Tcl_Release(interp); } } @end |
︙ | ︙ |