No deprecation warnings when building Tk itself without -DTK_NO_DEPRECATION. Re-generate tkDecls.h (formatting).

3 files changed, 17 insertions, 17 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
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index 1aa087f..8ba2f44 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.h
@@ -17,10 +17,12 @@
 #define TCL_STORAGE_CLASS DLLEXPORT
 #endif
 
-#if defined(TK_NO_DEPRECATED) && defined(BUILD_tk)
+#if !defined(BUILD_tk)
+# define TK_DEPRECATED(msg) EXTERN TCL_DEPRECATED_API(msg)
+#elif defined(TK_NO_DEPRECATED)
 # define TK_DEPRECATED(msg) MODULE_SCOPE
 #else
-# define TK_DEPRECATED(msg) EXTERN TCL_DEPRECATED_API(msg)
+# define TK_DEPRECATED(msg) EXTERN
 #endif
 
 /*
@@ -288,8 +290,7 @@ EXTERN void		Tk_FreePixmap(Display *display, Pixmap pixmap);
 EXTERN void		Tk_FreeTextLayout(Tk_TextLayout textLayout);
 /* 77 */
 TK_DEPRECATED("function does nothing, call can be removed")
-void Tk_FreeXId(
-				Display *display, XID xid);
+void			Tk_FreeXId(Display *display, XID xid);
 /* 78 */
 EXTERN GC		Tk_GCForColor(XColor *colorPtr, Drawable drawable);
 /* 79 */
@@ -480,13 +481,12 @@ EXTERN int		Tk_ParseArgv(Tcl_Interp *interp, Tk_Window tkwin,
 				const Tk_ArgvInfo *argTable, int flags);
 /* 144 */
 TK_DEPRECATED("function signature changed")
-void Tk_PhotoPutBlock_NoComposite(
-				Tk_PhotoHandle handle,
+void			Tk_PhotoPutBlock_NoComposite(Tk_PhotoHandle handle,
 				Tk_PhotoImageBlock *blockPtr, int x, int y,
 				int width, int height);
 /* 145 */
 TK_DEPRECATED("function signature changed")
-void Tk_PhotoPutZoomedBlock_NoComposite(
+void			Tk_PhotoPutZoomedBlock_NoComposite(
 				Tk_PhotoHandle handle,
 				Tk_PhotoImageBlock *blockPtr, int x, int y,
 				int width, int height, int zoomX, int zoomY,
@@ -498,15 +498,15 @@ EXTERN int		Tk_PhotoGetImage(Tk_PhotoHandle handle,
 EXTERN void		Tk_PhotoBlank(Tk_PhotoHandle handle);
 /* 148 */
 TK_DEPRECATED("function signature changed")
-void Tk_PhotoExpand_Panic(
-				Tk_PhotoHandle handle, int width, int height);
+void			Tk_PhotoExpand_Panic(Tk_PhotoHandle handle,
+				int width, int height);
 /* 149 */
 EXTERN void		Tk_PhotoGetSize(Tk_PhotoHandle handle, int *widthPtr,
 				int *heightPtr);
 /* 150 */
 TK_DEPRECATED("function signature changed")
-void Tk_PhotoSetSize_Panic(
-				Tk_PhotoHandle handle, int width, int height);
+void			Tk_PhotoSetSize_Panic(Tk_PhotoHandle handle,
+				int width, int height);
 /* 151 */
 EXTERN int		Tk_PointToChar(Tk_TextLayout layout, int x, int y);
 /* 152 */
@@ -790,14 +790,12 @@ EXTERN void		Tk_SetCaretPos(Tk_Window tkwin, int x, int y,
 				int height);
 /* 246 */
 TK_DEPRECATED("function signature changed")
-void Tk_PhotoPutBlock_Panic(
-				Tk_PhotoHandle handle,
+void			Tk_PhotoPutBlock_Panic(Tk_PhotoHandle handle,
 				Tk_PhotoImageBlock *blockPtr, int x, int y,
 				int width, int height, int compRule);
 /* 247 */
 TK_DEPRECATED("function signature changed")
-void Tk_PhotoPutZoomedBlock_Panic(
-				Tk_PhotoHandle handle,
+void			Tk_PhotoPutZoomedBlock_Panic(Tk_PhotoHandle handle,
 				Tk_PhotoImageBlock *blockPtr, int x, int y,
 				int width, int height, int zoomX, int zoomY,
 				int subsampleX, int subsampleY, int compRule);
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 19deb98..c8f5775 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -637,7 +637,7 @@ declare 184 {
 
 # Debugging / testing functions for photo images
 declare 185 {
-    int TkDebugPhotoStringMatchDef(Tcl_Interp *inter, Tcl_Obj *data, 
+    int TkDebugPhotoStringMatchDef(Tcl_Interp *inter, Tcl_Obj *data,
             Tcl_Obj *formatString, int *widthPtr, int *heightPtr)
 }