diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2003-03-06 15:05:20 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2003-03-06 15:05:20 (GMT) |
| commit | b180774f6bce433082da35c309b89e6bfa766152 (patch) | |
| tree | cf2cecb4facabb94108e75d9490c5b0fb25dd347 /generic/tk.h | |
| parent | 717fec397c31305a08d57a4ca6aa8bc9e038c5a6 (diff) | |
| download | tk-b180774f6bce433082da35c309b89e6bfa766152.zip tk-b180774f6bce433082da35c309b89e6bfa766152.tar.gz tk-b180774f6bce433082da35c309b89e6bfa766152.tar.bz2 | |
TIP#116 implementation. Docs still to come, tests will never be done because
they could never be done portably as they'd inevitably depend on the total
amount of memory available to the process... :^(
Diffstat (limited to 'generic/tk.h')
| -rw-r--r-- | generic/tk.h | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/generic/tk.h b/generic/tk.h index 9c9592a..debac6c 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -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: tk.h,v 1.75 2003/03/04 23:50:41 dgp Exp $ + * RCS: @(#) $Id: tk.h,v 1.76 2003/03/06 15:05:26 dkf Exp $ */ #ifndef _TK @@ -1577,7 +1577,7 @@ typedef int (Tk_SelectionProc) _ANSI_ARGS_((ClientData clientData, /* * Allow users to say that they don't want to alter their source to - * add the extra argument to Tk_PhotoPutBlock(); DO NOT DEFINE THIS + * add extra arguments to Tk_PhotoPutBlock() et al; DO NOT DEFINE THIS * WHEN BUILDING TK. * * This goes after the inclusion of the stubbed-decls so that the @@ -1593,13 +1593,34 @@ typedef int (Tk_SelectionProc) _ANSI_ARGS_((ClientData clientData, # undef Tk_PhotoPutZoomedBlock # endif # define Tk_PhotoPutZoomedBlock Tk_PhotoPutZoomedBlock_NoComposite +# define USE_PANIC_ON_PHOTO_ALLOC_FAILURE +#else /* !USE_COMPOSITELESS_PHOTO_PUT_BLOCK */ +# ifdef USE_PANIC_ON_PHOTO_ALLOC_FAILURE +# ifdef Tk_PhotoPutBlock +# undef Tk_PhotoPutBlock +# endif +# define Tk_PhotoPutBlock Tk_PhotoPutBlock_Panic +# ifdef Tk_PhotoPutZoomedBlock +# undef Tk_PhotoPutZoomedBlock +# endif +# define Tk_PhotoPutZoomedBlock Tk_PhotoPutZoomedBlock_Panic +# endif /* USE_PANIC_ON_PHOTO_ALLOC_FAILURE */ #endif /* USE_COMPOSITELESS_PHOTO_PUT_BLOCK */ +#ifdef USE_PANIC_ON_PHOTO_ALLOC_FAILURE +# ifdef Tk_PhotoExpand +# undef Tk_PhotoExpand +# endif +# define Tk_PhotoExpand Tk_PhotoExpand_Panic +# ifdef Tk_PhotoSetSize +# undef Tk_PhotoSetSize +# endif +# define Tk_PhotoSetSize Tk_PhotoSetSize_Panic +#endif /* USE_PANIC_ON_PHOTO_ALLOC_FAILURE */ /* * Tcl commands exported by Tk: */ - #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT |