diff options
| author | stanton <stanton> | 1998-09-30 02:15:12 (GMT) |
|---|---|---|
| committer | stanton <stanton> | 1998-09-30 02:15:12 (GMT) |
| commit | 3c1a537631e7e5fdc7c237b92a582824afea1fda (patch) | |
| tree | 1da3d93d793cd6abb62cd2204f5e4f73406f2752 /generic/tk.h | |
| parent | c16d45ef706cbb616125e57ec8a1f809bae3c9df (diff) | |
| download | tk-3c1a537631e7e5fdc7c237b92a582824afea1fda.zip tk-3c1a537631e7e5fdc7c237b92a582824afea1fda.tar.gz tk-3c1a537631e7e5fdc7c237b92a582824afea1fda.tar.bz2 | |
Merged 8.0.3 changes into 8.1
Diffstat (limited to 'generic/tk.h')
| -rw-r--r-- | generic/tk.h | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/generic/tk.h b/generic/tk.h index ac48a9c..bee1073 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tk.h 1.217 98/02/18 18:33:32 + * RCS: @(#) $Id: tk.h,v 1.1.4.2 1998/09/30 02:16:35 stanton Exp $ */ #ifndef _TK @@ -21,9 +21,10 @@ * When version numbers change here, you must also go into the following files * and update the version numbers: * + * README * unix/configure.in - * win/makefile.bc - * win/makefile.vc + * win/makefile.bc (Not for patch release updates) + * win/makefile.vc (Not for patch release updates) * library/tk.tcl * README, win/README, unix/README, and mac/README * @@ -79,6 +80,11 @@ # include <stddef.h> #endif +#ifdef BUILD_tk +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif + /* * Decide whether or not to use input methods. */ @@ -791,6 +797,10 @@ typedef struct Tk_Item { * pixel drawn in item. Item area * includes x1 and y1 but not x2 * and y2. */ + int reserved1; /* This padding is for compatibility */ + char *reserved2; /* with Jan Nijtmans dash patch */ + int reserved3; + char *reserved4; /* *------------------------------------------------------------------ @@ -895,6 +905,10 @@ typedef struct Tk_ItemType { * from an item. */ struct Tk_ItemType *nextPtr; /* Used to link types together into * a list. */ + char *reserved1; /* Reserved for future extension. */ + int reserved2; /* Carefully compatible with */ + char *reserved3; /* Jan Nijtmans dash patch */ + char *reserved4; } Tk_ItemType; #endif @@ -1000,6 +1014,7 @@ struct Tk_ImageType { /* Next in list of all image types currently * known. Filled in by Tk, not by image * manager. */ + char *reserved; /* reserved for future expansion */ }; /* @@ -1032,6 +1047,7 @@ typedef struct Tk_PhotoImageBlock { int offset[3]; /* Address differences between the red, green * and blue components of the pixel and the * pixel as a whole. */ + int reserved; /* Reserved for extensions (dash patch) */ } Tk_PhotoImageBlock; /* @@ -1760,4 +1776,8 @@ EXTERN int Tk_WmCmd _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); #endif /* RESOURCE_INCLUDED */ + +#undef TCL_STORAGE_CLASS +#define TCL_STORAGE_CLASS DLLIMPORT + #endif /* _TK */ |