diff options
| author | jingham <jingham> | 1999-08-10 05:04:45 (GMT) |
|---|---|---|
| committer | jingham <jingham> | 1999-08-10 05:04:45 (GMT) |
| commit | 4904c2fefb18f2f2cc5e3e70d58e1750f52fa659 (patch) | |
| tree | 7316e518597bb3d84ce7a7a7cabcf5b05832add8 /mac/tkMacScrlbr.c | |
| parent | 1cdd5fb850d1be603e0994761bd0271233c964c4 (diff) | |
| download | tk-4904c2fefb18f2f2cc5e3e70d58e1750f52fa659.zip tk-4904c2fefb18f2f2cc5e3e70d58e1750f52fa659.tar.gz tk-4904c2fefb18f2f2cc5e3e70d58e1750f52fa659.tar.bz2 | |
New Function: TkpDrawHighlightBorder. Use this in place of Tk_DrawFocusHighlight. The latter did not work on the Mac, since you need to know both foreground & background color when you draw the active focus ring.
Diffstat (limited to 'mac/tkMacScrlbr.c')
| -rw-r--r-- | mac/tkMacScrlbr.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/mac/tkMacScrlbr.c b/mac/tkMacScrlbr.c index e54c3c9..333cc27 100644 --- a/mac/tkMacScrlbr.c +++ b/mac/tkMacScrlbr.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacScrlbr.c,v 1.2 1998/09/14 18:23:39 stanton Exp $ + * RCS: @(#) $Id: tkMacScrlbr.c,v 1.3 1999/08/10 05:05:18 jingham Exp $ */ #include "tkScrollbar.h" @@ -210,17 +210,20 @@ TkpDisplayScrollbar( * Draw the focus or any 3D relief we may have. */ if (scrollPtr->highlightWidth != 0) { - GC gc; + GC fgGC, bgGC; + + bgGC = Tk_GCForColor(scrollPtr->highlightBgColorPtr, + Tk_WindowId(tkwin)); if (scrollPtr->flags & GOT_FOCUS) { - gc = Tk_GCForColor(scrollPtr->highlightColorPtr, + fgGC = Tk_GCForColor(scrollPtr->highlightColorPtr, Tk_WindowId(tkwin)); + TkpDrawHighlightBorder(tkwin, fgGC, bgGC, scrollPtr->highlightWidth, + Tk_WindowId(tkwin)); } else { - gc = Tk_GCForColor(scrollPtr->highlightBgColorPtr, - Tk_WindowId(tkwin)); - } - Tk_DrawFocusHighlight(tkwin, gc, scrollPtr->highlightWidth, + TkpDrawHighlightBorder(tkwin, bgGC, bgGC, scrollPtr->highlightWidth, Tk_WindowId(tkwin)); + } } Tk_Draw3DRectangle(tkwin, Tk_WindowId(tkwin), scrollPtr->bgBorder, scrollPtr->highlightWidth, scrollPtr->highlightWidth, |