diff options
| author | pspjuth <peter.spjuth@gmail.com> | 2012-08-26 17:07:19 (GMT) |
|---|---|---|
| committer | pspjuth <peter.spjuth@gmail.com> | 2012-08-26 17:07:19 (GMT) |
| commit | 2c2a2e6522dcfc11aaa8017b47bc14485313349b (patch) | |
| tree | d0cf2a1e6e56525333957dd5fe2aab36bf174a4c /carbon/tkMacOSXColor.c | |
| parent | fc0e57edc8cb5ad99ea9540032237367f8b0a777 (diff) | |
| parent | e4c7ef5bdf6375e1860418b1ec92c07f88660cc8 (diff) | |
| download | tk-pspjuth_canvas.zip tk-pspjuth_canvas.tar.gz tk-pspjuth_canvas.tar.bz2 | |
merge trunkpspjuth_canvas
Diffstat (limited to 'carbon/tkMacOSXColor.c')
| -rw-r--r-- | carbon/tkMacOSXColor.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/carbon/tkMacOSXColor.c b/carbon/tkMacOSXColor.c index e139038..4915553 100644 --- a/carbon/tkMacOSXColor.c +++ b/carbon/tkMacOSXColor.c @@ -12,8 +12,6 @@ * * 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.2 2009/06/29 14:35:01 das Exp $ */ #include "tkMacOSXPrivate.h" @@ -593,7 +591,7 @@ TkpGetColor( } } - if (XParseColor(display, colormap, name, &color) == 0) { + if (TkParseColor(display, colormap, name, &color) == 0) { return NULL; } @@ -715,14 +713,15 @@ XCreateColormap( return index++; } -void +int XFreeColormap( Display* display, /* Display. */ Colormap colormap) /* Colormap. */ { + return Success; } -void +int XFreeColors( Display* display, /* Display. */ Colormap colormap, /* Colormap. */ @@ -735,4 +734,5 @@ XFreeColors( * needs to be done to release colors as there really is * no colormap in the Tk sense. */ + return Success; } |