diff options
| author | nijtmans <nijtmans> | 2010-08-19 05:23:12 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-08-19 05:23:12 (GMT) |
| commit | 9ded5f8369aab209295bca5b0926881c3da7325c (patch) | |
| tree | 72b70813b087449b08265630f630891ef2f496e8 | |
| parent | 6e6da6f513209d1b8877bbf4d285bbb5aec6437e (diff) | |
| download | tk-9ded5f8369aab209295bca5b0926881c3da7325c.zip tk-9ded5f8369aab209295bca5b0926881c3da7325c.tar.gz tk-9ded5f8369aab209295bca5b0926881c3da7325c.tar.bz2 | |
Move USE_OLD_IMAGE support after tkDecls.h
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | generic/tk.h | 14 |
2 files changed, 10 insertions, 7 deletions
@@ -2,7 +2,8 @@ * generic/ttk/ttkGenStubs.tcl [Patch 3034251] partly: remove some more unneeded ifdeffery, as in tcl/tools/genStubs.tcl. - * generic/*Decls.h (regenerated) + * generic/tk.h: Move USE_OLD_IMAGE support after tkDecls.h + * generic/*Decls.h (regenerated) * generic/ttk/ttkDecls.h 2010-08-11 Jeff Hobbs <jeffh@ActiveState.com> diff --git a/generic/tk.h b/generic/tk.h index 8e3e144..f4c3cdb 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.136 2010/07/16 22:06:05 nijtmans Exp $ + * RCS: @(#) $Id: tk.h,v 1.137 2010/08/19 05:23:12 nijtmans Exp $ */ #ifndef _TK @@ -1359,11 +1359,6 @@ struct Tk_PhotoImageFormat { * currently known. Filled in by Tk, not by * image format handler. */ }; - -#ifdef USE_OLD_IMAGE -#define Tk_CreateImageType Tk_CreateOldImageType -#define Tk_CreatePhotoImageFormat Tk_CreateOldPhotoImageFormat -#endif /* USE_OLD_IMAGE */ /* *---------------------------------------------------------------------- @@ -1523,6 +1518,13 @@ typedef int (Tk_SelectionProc) (ClientData clientData, int offset, #include "tkDecls.h" +#ifdef USE_OLD_IMAGE +#undef Tk_CreateImageType +#define Tk_CreateImageType Tk_CreateOldImageType +#undef Tk_CreatePhotoImageFormat +#define Tk_CreatePhotoImageFormat Tk_CreateOldPhotoImageFormat +#endif /* USE_OLD_IMAGE */ + /* *---------------------------------------------------------------------- * |