diff options
| author | dgp <dgp@users.sourceforge.net> | 2014-11-07 14:23:32 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2014-11-07 14:23:32 (GMT) |
| commit | 640ca4ad25d6efe409faf5551bbb2f4102011e62 (patch) | |
| tree | 0de72c99a6495d3dadd2dc7b89c2239027dcd61d /macosx | |
| parent | 0788f6fc1ac0b467bdc3e53a74ba66de5da2278f (diff) | |
| parent | 054420d1e3b71ea9d657396bb42d92472b0d7e88 (diff) | |
| download | tk-640ca4ad25d6efe409faf5551bbb2f4102011e62.zip tk-640ca4ad25d6efe409faf5551bbb2f4102011e62.tar.gz tk-640ca4ad25d6efe409faf5551bbb2f4102011e62.tar.bz2 | |
merge trunk
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXButton.c | 2 | ||||
| -rw-r--r-- | macosx/tkMacOSXScale.c | 2 | ||||
| -rw-r--r-- | macosx/ttkMacOSXTheme.c | 14 |
3 files changed, 13 insertions, 5 deletions
diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c index adbdda0..d4aae8d 100644 --- a/macosx/tkMacOSXButton.c +++ b/macosx/tkMacOSXButton.c @@ -197,7 +197,7 @@ TkpDestroyButton( [macButtonPtr->button setTag:(NSInteger)-1]; TkMacOSXMakeCollectableAndRelease(macButtonPtr->button); - TkMacOSXMakeCollectableAndRelease(macButtonPtr->selectImage); + TkMacOSXMakeCollectableAndRelease(macButtonPtr->image); TkMacOSXMakeCollectableAndRelease(macButtonPtr->selectImage); TkMacOSXMakeCollectableAndRelease(macButtonPtr->tristateImage); } diff --git a/macosx/tkMacOSXScale.c b/macosx/tkMacOSXScale.c index 0bca521..c5a6f76 100644 --- a/macosx/tkMacOSXScale.c +++ b/macosx/tkMacOSXScale.c @@ -145,7 +145,7 @@ TkpDisplayScale( Tk_Window tkwin = scalePtr->tkwin; Tcl_Interp *interp = scalePtr->interp; int result; - char string[PRINT_CHARS]; + char string[TCL_DOUBLE_SPACE]; MacScale *macScalePtr = (MacScale *) clientData; Rect r; WindowRef windowRef; diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c index 5752fb1..a4abc7b 100644 --- a/macosx/ttkMacOSXTheme.c +++ b/macosx/ttkMacOSXTheme.c @@ -294,14 +294,22 @@ static Ttk_StateTable TabPositionTable[] = { * TP30000359-TPXREF116> */ -static const int TAB_HEIGHT = 10; -static const int TAB_OVERLAP = 10; + +int TAB_HEIGHT = 0; +int TAB_OVERLAP = 0; static void TabElementSize( void *clientData, void *elementRecord, Tk_Window tkwin, int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr) { - *heightPtr = TAB_HEIGHT + TAB_OVERLAP - 1; + TAB_HEIGHT = 10; + TAB_OVERLAP = 10; + /*Different metrics on 10.10/Yosemite.*/ + if (MAC_OS_X_VERSION_MIN_REQUIRED > 100000) { + TAB_OVERLAP = 5; + } + *heightPtr = TAB_HEIGHT + TAB_OVERLAP - 1; + } static void TabElementDraw( |