diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-08-31 08:35:52 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-08-31 08:35:52 (GMT) |
commit | 83a33e47ae22f827311e39064237fb508d36254d (patch) | |
tree | 4f302ebc3477d785c5209d80e8d020ab0b81cff1 /generic/tk.h | |
parent | 5e690a71b5a1b19c7d50cd22695ba6a25be4d32a (diff) | |
download | tk-83a33e47ae22f827311e39064237fb508d36254d.zip tk-83a33e47ae22f827311e39064237fb508d36254d.tar.gz tk-83a33e47ae22f827311e39064237fb508d36254d.tar.bz2 |
No deprecation warnings when building Tk itself without -DTK_NO_DEPRECATION. Re-generate tkDecls.h (formatting).
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 1cb10e2..afca810 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 |