diff options
| author | marc_culler <marc.culler@gmail.com> | 2020-12-16 21:05:42 (GMT) |
|---|---|---|
| committer | marc_culler <marc.culler@gmail.com> | 2020-12-16 21:05:42 (GMT) |
| commit | cd23bb7744ae30da1a75220c07ff6d9527270019 (patch) | |
| tree | 23ac6ca6cd311f07357f857a60b34a37a93bb701 /macosx/tkMacOSXColor.c | |
| parent | 11b82246f4a51641ec77f71bdd78312cfac9651b (diff) | |
| parent | 59d5e464aca4d537b556e7d2e2a6f51267652347 (diff) | |
| download | tk-cd23bb7744ae30da1a75220c07ff6d9527270019.zip tk-cd23bb7744ae30da1a75220c07ff6d9527270019.tar.gz tk-cd23bb7744ae30da1a75220c07ff6d9527270019.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'macosx/tkMacOSXColor.c')
| -rw-r--r-- | macosx/tkMacOSXColor.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c index 3c155f6..2bc78ca 100644 --- a/macosx/tkMacOSXColor.c +++ b/macosx/tkMacOSXColor.c @@ -520,6 +520,7 @@ TkMacOSXSetColorInContext( OSStatus err = noErr; CGColorRef cgColor = nil; SystemColorDatum *entry = GetEntryFromPixel(pixel); + CGRect rect; if (entry) { switch (entry->type) { @@ -581,7 +582,7 @@ TkpGetColor( Colormap colormap = tkwin ? Tk_Colormap(tkwin) : noColormap; NSView *view = nil; static Bool initialized = NO; - static NSColorSpace* sRGB = NULL; + static NSColorSpace* sRGB = nil; if (!initialized) { initialized = YES; |