Expose TkSmooth(Parse|Print)Proc through the internal stub table. It was the last set of internal function of this type which was not exposed yet.

Removed TkTile(Parse|Print)Proc from tkInt.h, because they don't exist.
Follow-up to [Bug 2804935], now all Tk*(Parse|Print)Proc functions are exposed through the internal stub table.

5 files changed, 81 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index e77fd48..693f3ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-27  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* generic/tkInt.decls (Tk(Orient|Smooth)(Parse|Print)Proc):
+	Backport [Bug 2804935]: Expose these functions through
+	the internal stub table as they are useful to existing third-party code.
+
 2009-06-23  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* generic/tkCanvUtil.c fix [Bug #220935] canvas dash update problem
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 0b2dde4..a254c26 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -10,7 +10,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: tkInt.decls,v 1.44.2.1 2009/04/27 10:39:57 dkf Exp $
+# RCS: @(#) $Id: tkInt.decls,v 1.44.2.2 2009/06/27 19:53:16 nijtmans Exp $
 
 library tk
 
@@ -552,6 +552,22 @@ declare 176 generic {
     char *TkPixelPrintProc(ClientData clientData, Tk_Window tkwin,
 	    char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
 }
+declare 177 generic {
+    int TkOrientParseProc(ClientData clientData, Tcl_Interp *interp,
+	    Tk_Window tkwin, CONST char *value, char *widgRec, int offset)
+}
+declare 178 generic {
+    char *TkOrientPrintProc(ClientData clientData, Tk_Window tkwin,
+	    char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
+}
+declare 179 generic {
+    int TkSmoothParseProc(ClientData clientData, Tcl_Interp *interp,
+	    Tk_Window tkwin, CONST char *value, char *widgRec, int offset)
+}
+declare 180 generic {
+    char *TkSmoothPrintProc(ClientData clientData, Tk_Window tkwin,
+	    char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
+}
 
 ##############################################################################
 
diff --git a/generic/tkInt.h b/generic/tkInt.h
index 3d35753..c929f05 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -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: tkInt.h,v 1.82.2.3 2009/04/27 10:39:57 dkf Exp $
+ * RCS: $Id: tkInt.h,v 1.82.2.4 2009/06/27 19:53:16 nijtmans Exp $
  */
 
 #ifndef _TKINT
@@ -1126,27 +1126,9 @@ MODULE_SCOPE int	TkCanvasGetCoordObj(Tcl_Interp *interp,
 			    double *doublePtr);
 MODULE_SCOPE int	TkGetDoublePixels(Tcl_Interp *interp, Tk_Window tkwin,
 			    const char *string, double *doublePtr);
-MODULE_SCOPE int	TkOrientParseProc(ClientData clientData,
-			    Tcl_Interp *interp, Tk_Window tkwin,
-			    const char *value, char *widgRec, int offset);
-MODULE_SCOPE char *	TkOrientPrintProc(ClientData clientData,
-			    Tk_Window tkwin, char *widgRec, int offset,
-			    Tcl_FreeProc **freeProcPtr);
 MODULE_SCOPE int	TkPostscriptImage(Tcl_Interp *interp, Tk_Window tkwin,
 			    Tk_PostscriptInfo psInfo, XImage *ximage,
 			    int x, int y, int width, int height);
-MODULE_SCOPE int	TkSmoothParseProc(ClientData clientData,
-			    Tcl_Interp *interp, Tk_Window tkwin,
-			    const char *value, char *recordPtr, int offset);
-MODULE_SCOPE char *	TkSmoothPrintProc(ClientData clientData,
-			    Tk_Window tkwin, char *recordPtr, int offset,
-			    Tcl_FreeProc **freeProcPtr);
-MODULE_SCOPE int	TkTileParseProc(ClientData clientData,
-			    Tcl_Interp *interp, Tk_Window tkwin,
-			    const char *value, char *widgRec, int offset);
-MODULE_SCOPE char *	TkTilePrintProc(ClientData clientData, Tk_Window tkwin,
-			    char *widgRec, int offset,
-			    Tcl_FreeProc **freeProcPtr);
 MODULE_SCOPE void       TkMapTopFrame(Tk_Window tkwin);
 MODULE_SCOPE XEvent *	TkpGetBindingXEvent(Tcl_Interp *interp);
 MODULE_SCOPE void	TkCreateExitHandler(Tcl_ExitProc *proc,
@@ -1194,7 +1176,7 @@ MODULE_SCOPE int	TkUnsupported1ObjCmd(ClientData clientData,
 #define TCL_STORAGE_CLASS DLLIMPORT
 
 #endif /* _TKINT */
-
+
 /*
  * Local Variables:
  * mode: c
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index aa9ee77..6649870 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -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: tkIntDecls.h,v 1.31.2.1 2009/04/27 10:39:57 dkf Exp $
+ * RCS: @(#) $Id: tkIntDecls.h,v 1.31.2.2 2009/06/27 19:53:16 nijtmans Exp $
  */
 
 #ifndef _TKINTDECLS
@@ -1029,6 +1029,36 @@ EXTERN char *		TkPixelPrintProc (ClientData clientData,
 				Tk_Window tkwin, char * widgRec, int offset, 
 				Tcl_FreeProc ** freeProcPtr);
 #endif
+#ifndef TkOrientParseProc_TCL_DECLARED
+#define TkOrientParseProc_TCL_DECLARED
+/* 177 */
+EXTERN int		TkOrientParseProc (ClientData clientData, 
+				Tcl_Interp * interp, Tk_Window tkwin, 
+				CONST char * value, char * widgRec, 
+				int offset);
+#endif
+#ifndef TkOrientPrintProc_TCL_DECLARED
+#define TkOrientPrintProc_TCL_DECLARED
+/* 178 */
+EXTERN char *		TkOrientPrintProc (ClientData clientData, 
+				Tk_Window tkwin, char * widgRec, int offset, 
+				Tcl_FreeProc ** freeProcPtr);
+#endif
+#ifndef TkSmoothParseProc_TCL_DECLARED
+#define TkSmoothParseProc_TCL_DECLARED
+/* 179 */
+EXTERN int		TkSmoothParseProc (ClientData clientData, 
+				Tcl_Interp * interp, Tk_Window tkwin, 
+				CONST char * value, char * widgRec, 
+				int offset);
+#endif
+#ifndef TkSmoothPrintProc_TCL_DECLARED
+#define TkSmoothPrintProc_TCL_DECLARED
+/* 180 */
+EXTERN char *		TkSmoothPrintProc (ClientData clientData, 
+				Tk_Window tkwin, char * widgRec, int offset, 
+				Tcl_FreeProc ** freeProcPtr);
+#endif
 
 typedef struct TkIntStubs {
     int magic;
@@ -1310,6 +1340,10 @@ typedef struct TkIntStubs {
     char * (*tkOffsetPrintProc) (ClientData clientData, Tk_Window tkwin, char * widgRec, int offset, Tcl_FreeProc ** freeProcPtr); /* 174 */
     int (*tkPixelParseProc) (ClientData clientData, Tcl_Interp * interp, Tk_Window tkwin, const char * value, char * widgRec, int offset); /* 175 */
     char * (*tkPixelPrintProc) (ClientData clientData, Tk_Window tkwin, char * widgRec, int offset, Tcl_FreeProc ** freeProcPtr); /* 176 */
+    int (*tkOrientParseProc) (ClientData clientData, Tcl_Interp * interp, Tk_Window tkwin, CONST char * value, char * widgRec, int offset); /* 177 */
+    char * (*tkOrientPrintProc) (ClientData clientData, Tk_Window tkwin, char * widgRec, int offset, Tcl_FreeProc ** freeProcPtr); /* 178 */
+    int (*tkSmoothParseProc) (ClientData clientData, Tcl_Interp * interp, Tk_Window tkwin, CONST char * value, char * widgRec, int offset); /* 179 */
+    char * (*tkSmoothPrintProc) (ClientData clientData, Tk_Window tkwin, char * widgRec, int offset, Tcl_FreeProc ** freeProcPtr); /* 180 */
 } TkIntStubs;
 
 #ifdef __cplusplus
@@ -2029,6 +2063,22 @@ extern TkIntStubs *tkIntStubsPtr;
 #define TkPixelPrintProc \
 	(tkIntStubsPtr->tkPixelPrintProc) /* 176 */
 #endif
+#ifndef TkOrientParseProc
+#define TkOrientParseProc \
+	(tkIntStubsPtr->tkOrientParseProc) /* 177 */
+#endif
+#ifndef TkOrientPrintProc
+#define TkOrientPrintProc \
+	(tkIntStubsPtr->tkOrientPrintProc) /* 178 */
+#endif
+#ifndef TkSmoothParseProc
+#define TkSmoothParseProc \
+	(tkIntStubsPtr->tkSmoothParseProc) /* 179 */
+#endif
+#ifndef TkSmoothPrintProc
+#define TkSmoothPrintProc \
+	(tkIntStubsPtr->tkSmoothPrintProc) /* 180 */
+#endif
 
 #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
 
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 42e919b..bf00408 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkStubInit.c,v 1.60.2.1 2009/04/27 10:39:57 dkf Exp $
+ * RCS: @(#) $Id: tkStubInit.c,v 1.60.2.2 2009/06/27 19:53:16 nijtmans Exp $
  */
 
 #include "tkInt.h"
@@ -334,6 +334,10 @@ TkIntStubs tkIntStubs = {
     TkOffsetPrintProc, /* 174 */
     TkPixelParseProc, /* 175 */
     TkPixelPrintProc, /* 176 */
+    TkOrientParseProc, /* 177 */
+    TkOrientPrintProc, /* 178 */
+    TkSmoothParseProc, /* 179 */
+    TkSmoothPrintProc, /* 180 */
 };
 
 TkIntPlatStubs tkIntPlatStubs = {