diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-24 12:06:43 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-24 12:06:43 (GMT) |
| commit | 473ed169135beac6352af2c5f61cca5d404ccf51 (patch) | |
| tree | 92d3c58d4eb81caa992d5c78700b436bed1161dc /macosx | |
| parent | 0de78ce9ce43fcfbe9fe16cb0cb36f6cfa9b6e07 (diff) | |
| parent | 93a3e63b7e9a22f94f1101b7ba32ac79738e5b65 (diff) | |
| download | tk-473ed169135beac6352af2c5f61cca5d404ccf51.zip tk-473ed169135beac6352af2c5f61cca5d404ccf51.tar.gz tk-473ed169135beac6352af2c5f61cca5d404ccf51.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXWm.c | 4 | ||||
| -rw-r--r-- | macosx/ttkMacOSXTheme.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c index 38daca4..c0177c7 100644 --- a/macosx/tkMacOSXWm.c +++ b/macosx/tkMacOSXWm.c @@ -1984,6 +1984,7 @@ WmFrameCmd( { WmInfo *wmPtr = winPtr->wmInfoPtr; Window window; + char buf[TCL_INTEGER_SPACE]; if (objc != 3) { Tcl_WrongNumArgs(interp, 2, objv, "window"); @@ -1993,7 +1994,8 @@ WmFrameCmd( if (window == None) { window = Tk_WindowId((Tk_Window) winPtr); } - Tcl_SetObjResult(interp, Tcl_ObjPrintf("0x%x", (unsigned) window)); + sprintf(buf, "0x%" TCL_Z_MODIFIER "x", (size_t)window); + Tcl_SetObjResult(interp, Tcl_NewStringObj(buf, -1)); return TCL_OK; } diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c index 60e768d..3d88ef7 100644 --- a/macosx/ttkMacOSXTheme.c +++ b/macosx/ttkMacOSXTheme.c @@ -1064,7 +1064,7 @@ static void DrawDarkFocusRing( { CGRect insetBounds = CGRectInset(bounds, -3, -3); CHECK_RADIUS(4, insetBounds) - + NSColorSpace *deviceRGB = [NSColorSpace deviceRGBColorSpace]; NSColor *strokeColor; NSColor *fillColor = [NSColor colorWithColorSpace:deviceRGB |