diff options
| author | dgp <dgp@users.sourceforge.net> | 2017-09-01 02:22:42 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2017-09-01 02:22:42 (GMT) |
| commit | 67f0b5a99fac8356afb78c9e429bbe6c9d911f0b (patch) | |
| tree | 237c3e0c4134a51fb9715ed9c0e15cf2550e5f30 /generic/tk.h | |
| parent | 8d10e02a9ffeee4273a550b3d1e21d3a4a5e8719 (diff) | |
| parent | 83a33e47ae22f827311e39064237fb508d36254d (diff) | |
| download | tk-67f0b5a99fac8356afb78c9e429bbe6c9d911f0b.zip tk-67f0b5a99fac8356afb78c9e429bbe6c9d911f0b.tar.gz tk-67f0b5a99fac8356afb78c9e429bbe6c9d911f0b.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tk.h')
| -rw-r--r-- | generic/tk.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/generic/tk.h b/generic/tk.h index 2106a57..242b77e 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -1566,12 +1566,13 @@ typedef int (Tk_SelectionProc) (ClientData clientData, int offset, *---------------------------------------------------------------------- * * Allow users to say that they don't want to alter their source to add extra - * arguments to Tk_PhotoPutBlock() et al; DO NOT DEFINE THIS WHEN BUILDING TK. + * arguments to Tk_PhotoPutBlock() et al. * * This goes after the inclusion of the stubbed-decls so that the declarations * of what is actually there can be correct. */ +#if !defined(TK_NO_DEPRECATED) && !defined(BUILD_tk) #ifdef USE_COMPOSITELESS_PHOTO_PUT_BLOCK # ifdef Tk_PhotoPutBlock # undef Tk_PhotoPutBlock @@ -1604,6 +1605,7 @@ typedef int (Tk_SelectionProc) (ClientData clientData, int offset, # endif # define Tk_PhotoSetSize Tk_PhotoSetSize_Panic #endif /* USE_PANIC_ON_PHOTO_ALLOC_FAILURE */ +#endif /* !TK_NO_DEPRECATED && !BUILD_tk */ #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT |