diff options
| author | das <das@noemail.net> | 2007-06-09 17:09:39 (GMT) |
|---|---|---|
| committer | das <das@noemail.net> | 2007-06-09 17:09:39 (GMT) |
| commit | 58a84da6ab8fc9fbcbf21a075a3f2ab0d22d388f (patch) | |
| tree | f359d2dd182768b18f13b4636ebdc5c225ffa0f8 /macosx/tkMacOSXColor.c | |
| parent | 87a057ab14d211c00cd6fb94d1370e6bb2a5864c (diff) | |
| download | tk-58a84da6ab8fc9fbcbf21a075a3f2ab0d22d388f.zip tk-58a84da6ab8fc9fbcbf21a075a3f2ab0d22d388f.tar.gz tk-58a84da6ab8fc9fbcbf21a075a3f2ab0d22d388f.tar.bz2 | |
* macosx/tkMacOSXColor.c: fix issues with TK_{IF,ELSE,ENDIF} macros;
* macosx/tkMacOSXDraw.c: implement Jaguar equivalent of unavailable
* macosx/tkMacOSXEntry.c: kHIToolboxVersion global; panic at startup
* macosx/tkMacOSXEvent.c: if MAC_OS_X_VERSION_MIN_REQUIRED constraint
* macosx/tkMacOSXInit.c: is not satisfied.
* macosx/tkMacOSXInt.h:
* macosx/tkMacOSXWm.c:
* macosx/tkMacOSXDraw.c (XCopyArea, XCopyPlane, TkPutImage)
(TkMacOSXSetupDrawingContext): factor out common code and standardize
setup/restore of port, context and clipping; formatting cleanup.
* macosx/tkMacOSXWindowEvent.c: add error checking.
* macosx/tkMacOSXMenu.c: fix gcc3 warning.
* macosx/tkMacOSXScrlbr.c: fix testsuite crash.
* macosx/tkMacOSXSubwindows.c: formatting cleanup.
* macosx/tkMacOSXRegion.c: fix typos.
* macosx/tkMacOSXScale.c:
* macosx/tkMacOSXXStubs.c (Tk_GetUserInactiveTime): remove superfluous
CFRetain/CFRelease.
* macosx/Wish-Release.xcconfig: disable tktest release build stripping.
* macosx/Wish.xcodeproj/project.pbxproj: add new Tclsh-Info.plist.in.
FossilOrigin-Name: 284e8e0649a746b194074ad192d9ce4bdd021f5a
Diffstat (limited to 'macosx/tkMacOSXColor.c')
| -rw-r--r-- | macosx/tkMacOSXColor.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c index 7355356..2194b7a 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.10 2007/06/06 09:55:52 das Exp $ + * RCS: @(#) $Id: tkMacOSXColor.c,v 1.11 2007/06/09 17:09:39 das Exp $ */ #include "tkMacOSXInt.h" @@ -386,16 +386,16 @@ TkMacOSXSetColorInContext(unsigned long pixel, CGContextRef context) TK_IF_MAC_OS_X_API (4, HIThemeSetFill, err = ChkErr(HIThemeSetFill, brush, NULL, context, kHIThemeOrientationNormal); - TK_IF_MAC_OS_X_API_COND (4, err == noErr, HIThemeSetFill, + TK_IF_MAC_OS_X_API_COND (4, HIThemeSetFill, err == noErr, err = ChkErr(HIThemeSetStroke, brush, NULL, context, kHIThemeOrientationNormal); - ) TK_ENDIF_MAC_OS_X - ) TK_ENDIF_MAC_OS_X + ) TK_ENDIF + ) TK_ENDIF } else if (textColor) { TK_IF_MAC_OS_X_API (4, HIThemeSetTextFill, err = ChkErr(HIThemeSetTextFill, textColor, NULL, context, kHIThemeOrientationNormal); - ) TK_ENDIF_MAC_OS_X + ) TK_ENDIF } else if (background) { TK_IF_MAC_OS_X_API (3, CGContextGetClipBoundingBox, CGRect rect = CGContextGetClipBoundingBox(context); @@ -403,12 +403,12 @@ TkMacOSXSetColorInContext(unsigned long pixel, CGContextRef context) background }; TK_IF_MAC_OS_X_API (3, HIThemeApplyBackground, - TK_IF_MAC_OS_X_HI_TOOLBOX (3, /* c.f. QA1377 */ + TK_IF_HI_TOOLBOX (3, /* c.f. QA1377 */ err = ChkErr(HIThemeApplyBackground, &rect, &info, context, kHIThemeOrientationNormal); - ) TK_ENDIF_MAC_OS_X - ) TK_ENDIF_MAC_OS_X - ) TK_ENDIF_MAC_OS_X + ) TK_ENDIF + ) TK_ENDIF + ) TK_ENDIF } if (err == noErr) { return; @@ -442,9 +442,9 @@ TkMacOSXSetColorInContext(unsigned long pixel, CGContextRef context) Tcl_Panic("TkMacOSXSetColorInContext(): " "pattern initialization failed !"); } - TK_IF_MAC_OS_X_HI_TOOLBOX (4, + TK_IF_HI_TOOLBOX (4, bitmapInfo = kCGBitmapByteOrder32Host; - ) TK_ENDIF_MAC_OS_X + ) TK_ENDIF } portChanged = QDSwapPort(patGWorld, &savePort); TkMacOSXSetColorInPort(pixel, 1, pixpat); |