diff options
Diffstat (limited to 'generic/tkColor.h')
| -rw-r--r-- | generic/tkColor.h | 72 |
1 files changed, 34 insertions, 38 deletions
diff --git a/generic/tkColor.h b/generic/tkColor.h index 2a59e05..d4679cf 100644 --- a/generic/tkColor.h +++ b/generic/tkColor.h @@ -1,13 +1,12 @@ /* * tkColor.h -- * - * Declarations of data types and functions used by the - * Tk color module. + * Declarations of data types and functions used by the Tk color module. * * Copyright (c) 1996-1997 by Sun Microsystems, Inc. * - * See the file "license.terms" for information on usage and redistribution - * of this file, and for a DISCLAIMER OF ALL WARRANTIES. + * See the file "license.terms" for information on usage and redistribution of + * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #ifndef _TKCOLOR @@ -16,14 +15,14 @@ #include <tkInt.h> #ifdef BUILD_tk -# undef TCL_STORAGE_CLASS -# define TCL_STORAGE_CLASS DLLEXPORT +#undef TCL_STORAGE_CLASS +#define TCL_STORAGE_CLASS DLLEXPORT #endif /* - * One of the following data structures is used to keep track of - * each color that is being used by the application; typically there - * is a colormap entry allocated for each of these colors. + * One of the following data structures is used to keep track of each color + * that is being used by the application; typically there is a colormap entry + * allocated for each of these colors. */ #define TK_COLOR_BY_NAME 1 @@ -34,39 +33,38 @@ typedef struct TkColor { XColor color; /* Information about this color. */ unsigned int magic; /* Used for quick integrity check on this - * structure. Must always have the - * value COLOR_MAGIC. */ + * structure. Must always have the value + * COLOR_MAGIC. */ GC gc; /* Simple gc with this color as foreground - * color and all other fields defaulted. - * May be None. */ - Screen *screen; /* Screen where this color is valid. Used - * to delete it, and to find its display. */ + * color and all other fields defaulted. May + * be None. */ + Screen *screen; /* Screen where this color is valid. Used to + * delete it, and to find its display. */ Colormap colormap; /* Colormap from which this entry was * allocated. */ - Visual *visual; /* Visual associated with colormap. */ + Visual *visual; /* Visual associated with colormap. */ int resourceRefCount; /* Number of active uses of this color (each * active use corresponds to a call to - * Tk_AllocColorFromObj or Tk_GetColor). - * If this count is 0, then this TkColor + * Tk_AllocColorFromObj or Tk_GetColor). If + * this count is 0, then this TkColor * structure is no longer valid and it isn't - * present in a hash table: it is being - * kept around only because there are objects - * referring to it. The structure is freed - * when resourceRefCount and objRefCount - * are both 0. */ + * present in a hash table: it is being kept + * around only because there are objects + * referring to it. The structure is freed + * when resourceRefCount and objRefCount are + * both 0. */ int objRefCount; /* The number of Tcl objects that reference * this structure. */ - int type; /* TK_COLOR_BY_NAME or TK_COLOR_BY_VALUE */ + int type; /* TK_COLOR_BY_NAME or TK_COLOR_BY_VALUE. */ Tcl_HashEntry *hashPtr; /* Pointer to hash table entry for this * structure. (for use in deleting entry). */ struct TkColor *nextPtr; /* Points to the next TkColor structure with - * the same color name. Colors with the - * same name but different screens or - * colormaps are chained together off a - * single entry in nameTable. For colors in - * valueTable (those allocated by - * Tk_GetColorByValue) this field is always - * NULL. */ + * the same color name. Colors with the same + * name but different screens or colormaps are + * chained together off a single entry in + * nameTable. For colors in valueTable (those + * allocated by Tk_GetColorByValue) this field + * is always NULL. */ } TkColor; /* @@ -74,14 +72,12 @@ typedef struct TkColor { */ #ifndef TkpFreeColor -EXTERN void TkpFreeColor _ANSI_ARGS_((TkColor *tkColPtr)); +MODULE_SCOPE void TkpFreeColor(TkColor *tkColPtr); #endif -EXTERN TkColor * TkpGetColor _ANSI_ARGS_((Tk_Window tkwin, - Tk_Uid name)); -EXTERN TkColor * TkpGetColorByValue _ANSI_ARGS_((Tk_Window tkwin, - XColor *colorPtr)); +MODULE_SCOPE TkColor * TkpGetColor(Tk_Window tkwin, Tk_Uid name); +MODULE_SCOPE TkColor * TkpGetColorByValue(Tk_Window tkwin, XColor *colorPtr); -# undef TCL_STORAGE_CLASS -# define TCL_STORAGE_CLASS DLLIMPORT +#undef TCL_STORAGE_CLASS +#define TCL_STORAGE_CLASS DLLIMPORT #endif /* _TKCOLOR */ |