diff options
-rw-r--r-- | ChangeLog | 13 | ||||
-rw-r--r-- | macosx/tkMacOSXColor.c | 11 |
2 files changed, 19 insertions, 5 deletions
@@ -1,3 +1,14 @@ +2007-11-01 Daniel Steffen <das@users.sourceforge.net> + + * macosx/tkMacOSXColor.c (GetThemeColor): improve translation of RGB + pixel values into RGBColor. + + * library/demos/widget: increase height of main window text widget to + use more of the available vertical space. + + * doc/bind.n: document the Option modifier, clarify meaning + and availability of Command & Option. + 2007-11-01 Donal K. Fellows <donal.k.fellows@man.ac.uk> * unix/installManPage, doc/*.n: Make documentation use the name that @@ -5,7 +16,7 @@ * doc/text.n: Fixed mistake in [$t tag remove] docs. [Bug 1792191] - * doc/bind.n: Documentated the Command modifier. [Bug 1232908] + * doc/bind.n: Documented the Command modifier. [Bug 1232908] * doc/console.n, doc/wish.1: Made it clearer when and why the console command is present. [Bug 1386955] diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c index 697610d..c3150a4 100644 --- a/macosx/tkMacOSXColor.c +++ b/macosx/tkMacOSXColor.c @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXColor.c,v 1.13 2007/07/02 13:05:14 das Exp $ + * RCS: @(#) $Id: tkMacOSXColor.c,v 1.14 2007/11/01 11:36:22 das Exp $ */ #include "tkMacOSXPrivate.h" @@ -253,9 +253,12 @@ GetThemeColor( } else if (textColor) { err = ChkErr(GetThemeTextColor, textColor, 32, true, c); } else { - c->red = ((pixel >> 16) & 0xff) << 8; - c->green = ((pixel >> 8) & 0xff) << 8; - c->blue = ((pixel ) & 0xff) << 8; + c->red = (pixel >> 16) & 0xff; + c->green = (pixel >> 8) & 0xff; + c->blue = (pixel ) & 0xff; + c->red |= c->red << 8; + c->green |= c->green << 8; + c->blue |= c->blue << 8; } return err; } |