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/tkMacMenubutton.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/tkMacMenubutton.c')
-rw-r--r-- | mac/tkMacMenubutton.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/mac/tkMacMenubutton.c b/mac/tkMacMenubutton.c index 830be01..698ac97 100644 --- a/mac/tkMacMenubutton.c +++ b/mac/tkMacMenubutton.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacMenubutton.c,v 1.4 1999/05/22 06:33:38 jingham Exp $ + * RCS: @(#) $Id: tkMacMenubutton.c,v 1.5 1999/08/10 05:05:02 jingham Exp $ */ #include "tkMenubutton.h" @@ -223,15 +223,17 @@ TkpDisplayMenuButton( } if (mbPtr->highlightWidth != 0) { - GC gc; + GC fgGC, bgGC; + bgGC = Tk_GCForColor(mbPtr->highlightBgColorPtr, Tk_WindowId(tkwin)); if (mbPtr->flags & GOT_FOCUS) { - gc = Tk_GCForColor(mbPtr->highlightColorPtr, Tk_WindowId(tkwin)); + fgGC = Tk_GCForColor(mbPtr->highlightColorPtr, Tk_WindowId(tkwin)); + TkpDrawHighlightBorder(tkwin, fgGC, bgGC, mbPtr->highlightWidth, + Tk_WindowId(tkwin)); } else { - gc = Tk_GCForColor(mbPtr->highlightBgColorPtr, Tk_WindowId(tkwin)); + TkpDrawHighlightBorder(tkwin, bgGC, bgGC, mbPtr->highlightWidth, + Tk_WindowId(tkwin)); } - Tk_DrawFocusHighlight(tkwin, gc, mbPtr->highlightWidth, - Tk_WindowId(tkwin)); } SetGWorld(saveWorld, saveDevice); |