diff options
| author | wolfsuit <wolfsuit> | 2005-05-15 20:57:07 (GMT) |
|---|---|---|
| committer | wolfsuit <wolfsuit> | 2005-05-15 20:57:07 (GMT) |
| commit | c8cbd274c4ee973c09bf584947c6e6a164e9414e (patch) | |
| tree | cf5ca4ddc5b3e3bf86edd41ae71fe2e3fe8b4d9d /macosx/tkMacOSXXStubs.c | |
| parent | 96723e49a59aebc9468bb4f297062273172cfe34 (diff) | |
| download | tk-c8cbd274c4ee973c09bf584947c6e6a164e9414e.zip tk-c8cbd274c4ee973c09bf584947c6e6a164e9414e.tar.gz tk-c8cbd274c4ee973c09bf584947c6e6a164e9414e.tar.bz2 | |
From Michael Kirkham:
* macosx/tkMacOSXMenu.c (TkpConfigureMenuEntry): Thinko in clearing
the ENTRY_ACCEL_MASK before re-parsing it. [Tk Bug 1012852]
* macosx/tkMacOSXScrlbr.c (UpdateControlValues): Don't set the
control value BEFORE setting the min and max or the control manager
will reset it for you. [Tk Bug 1202181]
* macosx/tkMacOSXXStubs.c (TkMacOSXXGetPixel, TkMacOSXXPutPixel):
Restore the port to what it was before putting we were called.
[Tk Bug 1202223]
Diffstat (limited to 'macosx/tkMacOSXXStubs.c')
| -rw-r--r-- | macosx/tkMacOSXXStubs.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c index aca8651..033e917 100644 --- a/macosx/tkMacOSXXStubs.c +++ b/macosx/tkMacOSXXStubs.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.2.2.5 2005/05/14 20:53:31 das Exp $ + * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.2.2.6 2005/05/15 20:57:08 wolfsuit Exp $ */ #include "tkInt.h" @@ -761,10 +761,11 @@ TkMacOSXXGetPixel( int x, int y) { - CGrafPtr grafPtr; + CGrafPtr grafPtr, oldPort; RGBColor cPix; unsigned long r, g, b, c; grafPtr = (CGrafPtr)image->data; + GetPort(&oldPort); SetPort(grafPtr); GetCPixel(x,y,&cPix); if (image->obdata) { @@ -778,6 +779,7 @@ TkMacOSXXGetPixel( b = cPix . blue; } c = (r<<16)|(g<<8)|(b); + SetPort(oldPort); return c; } @@ -788,10 +790,11 @@ TkMacOSXXPutPixel( int y, unsigned long pixel) { - CGrafPtr grafPtr; + CGrafPtr grafPtr, oldPort; RGBColor cPix; unsigned long r, g, b; grafPtr = (CGrafPtr)image->data; + GetPort(&oldPort); SetPort(grafPtr); r = (pixel & image->red_mask)>>16; g = (pixel & image->green_mask)>>8; @@ -807,6 +810,7 @@ TkMacOSXXPutPixel( cPix . blue = b; } SetCPixel(x,y,&cPix); + SetPort(oldPort); return 0; } |