diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-07-31 11:00:20 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-07-31 11:00:20 (GMT) |
| commit | 28822e5191d3003f1d8fea59eeb79a0c14cf066d (patch) | |
| tree | 99bc25b39b1860eafa0d8d150260e01f8c622496 /macosx | |
| parent | d1cee4ca466f149ff990f8bea8eaa7a50694e901 (diff) | |
| parent | 2cd1f9a29e32479bbf154940297dcafdb43dc3de (diff) | |
| download | tk-28822e5191d3003f1d8fea59eeb79a0c14cf066d.zip tk-28822e5191d3003f1d8fea59eeb79a0c14cf066d.tar.gz tk-28822e5191d3003f1d8fea59eeb79a0c14cf066d.tar.bz2 | |
Merge 8.5
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXBitmap.c | 2 | ||||
| -rw-r--r-- | macosx/tkMacOSXScrlbr.c | 6 | ||||
| -rw-r--r-- | macosx/ttkMacOSXTheme.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/macosx/tkMacOSXBitmap.c b/macosx/tkMacOSXBitmap.c index e8cb211..615192b 100644 --- a/macosx/tkMacOSXBitmap.c +++ b/macosx/tkMacOSXBitmap.c @@ -134,7 +134,7 @@ PixmapFromImage( { TkMacOSXDrawingContext dc; Pixmap pixmap; - + pixmap = Tk_GetPixmap(display, None, size.width, size.height, 0); if (TkMacOSXSetupDrawingContext(pixmap, NULL, 1, &dc)) { if (dc.context) { diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c index 0f92c70..a189646 100644 --- a/macosx/tkMacOSXScrlbr.c +++ b/macosx/tkMacOSXScrlbr.c @@ -216,7 +216,7 @@ static void drawMacScrollbar( /* * Do not display the thumb unless scrolling is possible. */ - + if (scrollPtr->firstFraction > 0.0 || scrollPtr->lastFraction < 1.0) { CGRect thumbBounds = {thumbOrigin, thumbSize}; path = CGPathCreateWithRoundedRect(thumbBounds, 4, 4, NULL); @@ -233,7 +233,7 @@ static void drawMacScrollbar( } } #endif - + void TkpDisplayScrollbar( ClientData clientData) /* Information about window. */ @@ -317,7 +317,7 @@ TkpDisplayScrollbar( /* * Switch back to NSView coordinates and draw a modern scrollbar. */ - + CGContextConcatCTM(dc.context, t); drawMacScrollbar(scrollPtr, msPtr, dc.context); #endif diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c index 50c79bb..0052b14 100644 --- a/macosx/ttkMacOSXTheme.c +++ b/macosx/ttkMacOSXTheme.c @@ -2354,7 +2354,7 @@ static void ThumbElementSize( } else { *minHeight = 8; *minWidth = 18; - } + } } static void ThumbElementDraw( |