Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Fix for 3016181, thanks to Tom Goddard for patch |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | core-8-5-branch |
Files: | files | file ages | folders |
SHA1: |
58c0a40203327885f6ba95e6fefcf126 |
User & Date: | kevin_walzer 2013-08-25 03:11:59 |
Context
2013-08-26
| ||
11:00 | Bug [c597acdab3]: Call [$pb step] in tail position in ttk::progressbar::Autoincrement, so that the widget is in a consistent state when any write traces on the linked -variable are fired check-in: 35fd9c96 user: jan.nijtmans tags: core-8-5-branch | |
2013-08-25
| ||
03:11 | Fix for 3016181, thanks to Tom Goddard for patch check-in: 58c0a402 user: kevin_walzer tags: core-8-5-branch | |
2013-07-26
| ||
09:11 | sync with Tcl version. check-in: af2f5c1a user: jan.nijtmans tags: core-8-5-branch | |
Changes
Changes to macosx/tkMacOSXButton.c.
︙ | ︙ | |||
425 426 427 428 429 430 431 | style = NSShadowlessSquareBezelStyle; highlightsBy = butPtr->selectImage || butPtr->bitmap ? NSContentsCellMask : 0; border = butPtr->borderWidth; } break; case TYPE_RADIO_BUTTON: | | | 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 | style = NSShadowlessSquareBezelStyle; highlightsBy = butPtr->selectImage || butPtr->bitmap ? NSContentsCellMask : 0; border = butPtr->borderWidth; } break; case TYPE_RADIO_BUTTON: case TYPE_CHECK_BUTTON: if (!haveImage /*|| butPtr->indicatorOn*/) { // TODO: indicatorOn type = butPtr->type == TYPE_RADIO_BUTTON ? NSRadioButton : NSSwitchButton; butPtr->inset = /*butPtr->indicatorOn ? 0 :*/ butPtr->borderWidth; } else { type = NSPushOnPushOffButton; style = NSShadowlessSquareBezelStyle; |
︙ | ︙ | |||
450 451 452 453 454 455 456 | border = butPtr->borderWidth; } } break; } [button setButtonType:type]; if (style) { | | | 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 | border = butPtr->borderWidth; } } break; } [button setButtonType:type]; if (style) { [button setBezelStyle:style]; } if (highlightsBy) { [cell setHighlightsBy:highlightsBy|[cell highlightsBy]]; } if (showsStateBy) { [cell setShowsStateBy:showsStateBy|[cell showsStateBy]]; } |
︙ | ︙ |
Changes to macosx/tkMacOSXMenu.c.
︙ | ︙ | |||
823 824 825 826 827 828 829 | * None. * * Side effects: * The menubar is changed. * *---------------------------------------------------------------------- */ | | | 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 | * None. * * Side effects: * The menubar is changed. * *---------------------------------------------------------------------- */ void TkpSetMainMenubar( Tcl_Interp *interp, /* The interpreter of the application */ Tk_Window tkwin, /* The frame we are setting up */ char *menuName) /* The name of the menu to put in front. If * NULL, use the default menu bar. */ { |
︙ | ︙ |
Changes to macosx/tkMacOSXScrlbr.c.
︙ | ︙ | |||
250 251 252 253 254 255 256 257 258 259 260 261 262 263 | */ void TkpDestroyScrollbar( TkScrollbar *scrollPtr) { MacScrollbar *macScrollPtr = (MacScrollbar *) scrollPtr; TkMacOSXMakeCollectableAndRelease(macScrollPtr->scroller); } /* *-------------------------------------------------------------- * | > > | 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 | */ void TkpDestroyScrollbar( TkScrollbar *scrollPtr) { MacScrollbar *macScrollPtr = (MacScrollbar *) scrollPtr; NSScroller *scroller = macScrollPtr->scroller; [scroller setTag:(NSInteger)0]; TkMacOSXMakeCollectableAndRelease(macScrollPtr->scroller); } /* *-------------------------------------------------------------- * |
︙ | ︙ |
Changes to macosx/tkMacOSXWm.c.
︙ | ︙ | |||
16 17 18 19 20 21 22 23 24 25 26 27 28 29 | */ #include "tkMacOSXPrivate.h" #include "tkScrollbar.h" #include "tkMacOSXWm.h" #include "tkMacOSXEvent.h" #include "tkMacOSXDebug.h" /* #ifdef TK_MAC_DEBUG #define TK_MAC_DEBUG_WINDOWS #endif */ | > | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | */ #include "tkMacOSXPrivate.h" #include "tkScrollbar.h" #include "tkMacOSXWm.h" #include "tkMacOSXEvent.h" #include "tkMacOSXDebug.h" #include <Carbon/Carbon.h> /* #ifdef TK_MAC_DEBUG #define TK_MAC_DEBUG_WINDOWS #endif */ |
︙ | ︙ | |||
347 348 349 350 351 352 353 354 355 356 357 358 359 360 | { TkWindow *winPtr = TkMacOSXGetTkWindow(self); return (winPtr && winPtr->wmInfoPtr && (winPtr->wmInfoPtr->macClass == kHelpWindowClass || winPtr->wmInfoPtr->attributes & kWindowNoActivatesAttribute)) ? NO : YES; } @end #pragma mark - /* *---------------------------------------------------------------------- * | > | 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 | { TkWindow *winPtr = TkMacOSXGetTkWindow(self); return (winPtr && winPtr->wmInfoPtr && (winPtr->wmInfoPtr->macClass == kHelpWindowClass || winPtr->wmInfoPtr->attributes & kWindowNoActivatesAttribute)) ? NO : YES; } @end #pragma mark - /* *---------------------------------------------------------------------- * |
︙ | ︙ | |||
5183 5184 5185 5186 5187 5188 5189 5190 5191 5192 5193 5194 5195 5196 | { "yellow", NULL }, { "magenta", NULL }, { "orange", NULL }, { "purple", NULL }, { "brown", NULL }, { "clear", NULL }, { "opacity", NULL }, { NULL } }; int index, i; WmInfo *wmPtr = winPtr->wmInfoPtr; if (objc == 3) { | > | 5185 5186 5187 5188 5189 5190 5191 5192 5193 5194 5195 5196 5197 5198 5199 | { "yellow", NULL }, { "magenta", NULL }, { "orange", NULL }, { "purple", NULL }, { "brown", NULL }, { "clear", NULL }, { "opacity", NULL }, { "fullscreen", NULL }, { NULL } }; int index, i; WmInfo *wmPtr = winPtr->wmInfoPtr; if (objc == 3) { |
︙ | ︙ | |||
6316 6317 6318 6319 6320 6321 6322 | } result = TCL_ERROR; wmPtr->flags &= ~WM_FULLSCREEN; } else { NSRect bounds = [window contentRectForFrameRect:[window frame]]; NSRect screenBounds = NSMakeRect(0, 0, screenWidth, screenHeight); | | | > | > | 6319 6320 6321 6322 6323 6324 6325 6326 6327 6328 6329 6330 6331 6332 6333 6334 6335 6336 6337 6338 6339 6340 6341 6342 6343 6344 6345 6346 6347 6348 6349 6350 6351 6352 6353 6354 6355 6356 6357 6358 6359 6360 6361 6362 | } result = TCL_ERROR; wmPtr->flags &= ~WM_FULLSCREEN; } else { NSRect bounds = [window contentRectForFrameRect:[window frame]]; NSRect screenBounds = NSMakeRect(0, 0, screenWidth, screenHeight); if (!NSEqualRects(bounds, screenBounds) && !wasFullscreen) { wmPtr->configX = wmPtr->x; wmPtr->configY = wmPtr->y; wmPtr->configAttributes = wmPtr->attributes; wmPtr->attributes &= ~kWindowResizableAttribute; ApplyWindowAttributeFlagChanges(winPtr, window, wmPtr->configAttributes, wmPtr->flags, 1, 0); wmPtr->flags |= WM_SYNC_PENDING; [window setFrame:[window frameRectForContentRect: screenBounds] display:YES]; wmPtr->flags &= ~WM_SYNC_PENDING; } wmPtr->flags |= WM_FULLSCREEN; } #ifdef TK_GOT_AT_LEAST_SNOW_LEOPARD /* * We can't set these features on Leopard or earlier, as they don't * exist (neither options nor API that uses them). This formally means * that there's a bug with full-screen windows with Tk on old OSX, but * it isn't worth blocking a build just for this. */ prevMask = [window styleMask]; prevPres = [NSApp presentationOptions]; [window setStyleMask: NSBorderlessWindowMask]; [NSApp setPresentationOptions: NSApplicationPresentationAutoHideDock | NSApplicationPresentationAutoHideMenuBar]; #endif /*TK_GOT_AT_LEAST_SNOW_LEOPARD*/ } else { wmPtr->flags &= ~WM_FULLSCREEN; #ifdef TK_GOT_AT_LEAST_SNOW_LEOPARD [NSApp setPresentationOptions: prevPres]; [window setStyleMask: prevMask]; #endif /*TK_GOT_AT_LEAST_SNOW_LEOPARD*/ |
︙ | ︙ |