Changed some _Old and _OLD to more descriptive terms.

3 files changed, 14 insertions, 14 deletions

diff --git a/generic/tk.decls b/generic/tk.decls
index 445845a..d3a7866 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -11,7 +11,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.decls,v 1.19 2002/06/14 13:35:47 dkf Exp $
+# RCS: @(#) $Id: tk.decls,v 1.20 2002/06/14 14:07:50 dkf Exp $
 
 library tk
 
@@ -708,13 +708,13 @@ declare 143 generic {
 }
 
 declare 144 generic {
-    void Tk_PhotoPutBlock_Old (Tk_PhotoHandle handle, \
+    void Tk_PhotoPutBlock_NoComposite (Tk_PhotoHandle handle, \
 	    Tk_PhotoImageBlock *blockPtr, int x, int y, \
 	    int width, int height)
 }
 
 declare 145 generic {
-    void Tk_PhotoPutZoomedBlock_Old (Tk_PhotoHandle handle, \
+    void Tk_PhotoPutZoomedBlock_NoComposite (Tk_PhotoHandle handle, \
 	    Tk_PhotoImageBlock *blockPtr, int x, int y, \
 	    int width, int height, int zoomX, int zoomY, \
 	    int subsampleX, int subsampleY)
diff --git a/generic/tk.h b/generic/tk.h
index fecb2ab..81e6e36 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.59 2002/06/14 13:35:47 dkf Exp $
+ * RCS: @(#) $Id: tk.h,v 1.60 2002/06/14 14:07:51 dkf Exp $
  */
 
 #ifndef _TK
@@ -1476,16 +1476,16 @@ typedef int (Tk_SelectionProc) _ANSI_ARGS_((ClientData clientData,
  * declarations of what is actually there can be correct.
  */
 
-#ifdef USE_OLD_PHOTO_PUT_BLOCK
+#ifdef USE_COMPOSITELESS_PHOTO_PUT_BLOCK
 #   ifdef Tk_PhotoPutBlock
 #	undef Tk_PhotoPutBlock
 #   endif
-#   define Tk_PhotoPutBlock		Tk_PhotoPutBlock_Old
+#   define Tk_PhotoPutBlock		Tk_PhotoPutBlock_NoComposite
 #   ifdef Tk_PhotoPutZoomedBlock
 #	undef Tk_PhotoPutZoomedBlock
 #   endif
-#   define Tk_PhotoPutZoomedBlock	Tk_PhotoPutZoomedBlock_Old
-#endif /* USE_OLD_PHOTO_PUT_BLOCK */
+#   define Tk_PhotoPutZoomedBlock	Tk_PhotoPutZoomedBlock_NoComposite
+#endif /* USE_COMPOSITELESS_PHOTO_PUT_BLOCK */
 
 /*
  * Tcl commands exported by Tk:
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index 032ce89..7f82a77 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -16,7 +16,7 @@
  *	   Department of Computer Science,
  *	   Australian National University.
  *
- * RCS: @(#) $Id: tkImgPhoto.c,v 1.31 2002/06/14 13:35:48 dkf Exp $
+ * RCS: @(#) $Id: tkImgPhoto.c,v 1.32 2002/06/14 14:07:51 dkf Exp $
  */
 
 #include "tkInt.h"
@@ -5505,16 +5505,16 @@ ImgPhotoPostscript(clientData, interp, tkwin, psInfo,
 /*
  *----------------------------------------------------------------------
  *
- * Tk_PhotoPutBlock_Old, Tk_PhotoPutZoomedBlock_Old --
+ * Tk_PhotoPutBlock_NoComposite, Tk_PhotoPutZoomedBlock_NoComposite --
  *
  * These backward-compatability functions just exist to fill slots in
- * stubs table.  For the behaviour of *_Old, refer to the
+ * stubs table.  For the behaviour of *_NoComposite, refer to the
  * corresponding function without the extra suffix.
  *
  *----------------------------------------------------------------------
  */
 void
-Tk_PhotoPutBlock_Old(handle, blockPtr, x, y, width, height)
+Tk_PhotoPutBlock_NoComposite(handle, blockPtr, x, y, width, height)
      Tk_PhotoHandle handle;
      Tk_PhotoImageBlock *blockPtr;
      int x, y, width, height;
@@ -5524,8 +5524,8 @@ Tk_PhotoPutBlock_Old(handle, blockPtr, x, y, width, height)
 }
 
 void
-Tk_PhotoPutZoomedBlock_Old(handle, blockPtr, x, y, width, height,
-			   zoomX, zoomY, subsampleX, subsampleY)
+Tk_PhotoPutZoomedBlock_NoComposite(handle, blockPtr, x, y, width, height,
+				   zoomX, zoomY, subsampleX, subsampleY)
      Tk_PhotoHandle handle;
      Tk_PhotoImageBlock *blockPtr;
      int x, y, width, height, zoomX, zoomY, subsampleX, subsampleY;