diff options
Diffstat (limited to 'macosx/tkMacOSXScrlbr.c')
| -rw-r--r-- | macosx/tkMacOSXScrlbr.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c index 8173e0a..f5b25f1 100644 --- a/macosx/tkMacOSXScrlbr.c +++ b/macosx/tkMacOSXScrlbr.c @@ -95,7 +95,7 @@ static ScrollbarMetrics metrics = { * Declarations of static functions defined later in this file: */ -static void ScrollbarEventProc(ClientData clientData, +static void ScrollbarEventProc(void *clientData, XEvent *eventPtr); static int ScrollbarEvent(TkScrollbar *scrollPtr, XEvent *eventPtr); @@ -244,7 +244,7 @@ static void drawMacScrollbar( void TkpDisplayScrollbar( - ClientData clientData) /* Information about window. */ + void *clientData) /* Information about window. */ { TkScrollbar *scrollPtr = (TkScrollbar *)clientData; MacScrollbar *msPtr = (MacScrollbar *) scrollPtr; @@ -284,7 +284,7 @@ TkpDisplayScrollbar( * Draw a 3D rectangle to provide a base for the native scrollbar. */ - if (scrollPtr->highlightWidth != 0) { + if (scrollPtr->highlightWidth > 0) { GC fgGC, bgGC; bgGC = Tk_GCForColor(scrollPtr->highlightBgColorPtr, (Pixmap) macWin); @@ -293,7 +293,7 @@ TkpDisplayScrollbar( } else { fgGC = bgGC; } - TkpDrawHighlightBorder(tkwin, fgGC, bgGC, scrollPtr->highlightWidth, + Tk_DrawHighlightBorder(tkwin, fgGC, bgGC, scrollPtr->highlightWidth, (Pixmap) macWin); } @@ -484,9 +484,8 @@ TkpDestroyScrollbar( void TkpConfigureScrollbar( - TkScrollbar *scrollPtr) + TCL_UNUSED(TkScrollbar *)) { - (void)scrollPtr; /* empty */ } @@ -650,8 +649,8 @@ UpdateControlValues( || height <= metrics.minHeight) { msPtr->info.enableState = kThemeTrackHideTrack; } else { - msPtr->info.enableState = kThemeTrackActive; - msPtr->info.attributes = + msPtr->info.enableState = kThemeTrackActive; + msPtr->info.attributes = kThemeTrackShowThumb | kThemeTrackThumbRgnIsNotGhost; } } @@ -766,7 +765,7 @@ ScrollbarEvent( static void ScrollbarEventProc( - ClientData clientData, /* Information about window. */ + void *clientData, /* Information about window. */ XEvent *eventPtr) /* Information about event. */ { TkScrollbar *scrollPtr = (TkScrollbar *)clientData; |