From 09557ea5fa152ae25ceebe28524a67d75e0d00e1 Mon Sep 17 00:00:00 2001 From: nijtmans Date: Sat, 27 Jun 2009 19:33:35 +0000 Subject: 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. --- ChangeLog | 9 ++++++++- generic/tkInt.decls | 20 ++++++++++++++------ generic/tkInt.h | 14 +------------- generic/tkIntDecls.h | 47 ++++++++++++++++++++++++++++++++++++----------- generic/tkStubInit.c | 4 +++- 5 files changed, 62 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index 08d35c3..64926b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-06-27 Jan Nijtmans + + * generic/tkInt.decls (added TkSmooth(Parse|Print)Proc, + removed TkTile(Parse|Print)Proc which don't exist): + Follow-up to [Bug 2804935]: Expose these functions through the + internal stub table as they are useful to existing third-party code. + 2009-06-26 Daniel Steffen * carbon/ (new directory): copy of current state of 'macosx' @@ -12,7 +19,7 @@ 2009-06-22 Jan Nijtmans - * generic/tkCanvUtil.c fix [Bug #220935] canvas dash update problem + * generic/tkCanvUtil.c fix [Bug 220935] canvas dash update problem 2009-06-12 Donal K. Fellows diff --git a/generic/tkInt.decls b/generic/tkInt.decls index f6f5482..504935f 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.55 2009/06/12 12:46:11 dkf Exp $ +# RCS: @(#) $Id: tkInt.decls,v 1.56 2009/06/27 19:33:35 nijtmans Exp $ library tk @@ -574,7 +574,7 @@ declare 169 generic { Tk_Window tkwin, const char *value, char *widgRec, int offset) } declare 170 generic { - const char *TkStatePrintProc(ClientData clientData, Tk_Window tkwin, + CONST86 char *TkStatePrintProc(ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr) } declare 171 generic { @@ -582,7 +582,7 @@ declare 171 generic { Tk_Window tkwin, const char *value, char *widgRec, int offset) } declare 172 generic { - const char *TkCanvasDashPrintProc(ClientData clientData, Tk_Window tkwin, + CONST86 char *TkCanvasDashPrintProc(ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr) } declare 173 generic { @@ -590,7 +590,7 @@ declare 173 generic { Tk_Window tkwin, const char *value, char *widgRec, int offset) } declare 174 generic { - const char *TkOffsetPrintProc(ClientData clientData, Tk_Window tkwin, + CONST86 char *TkOffsetPrintProc(ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr) } declare 175 generic { @@ -598,7 +598,7 @@ declare 175 generic { Tk_Window tkwin, const char *value, char *widgRec, int offset) } declare 176 generic { - const char *TkPixelPrintProc(ClientData clientData, Tk_Window tkwin, + CONST86 char *TkPixelPrintProc(ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr) } declare 177 generic { @@ -606,7 +606,15 @@ declare 177 generic { Tk_Window tkwin, const char *value, char *widgRec, int offset) } declare 178 generic { - const char *TkOrientPrintProc(ClientData clientData, Tk_Window tkwin, + CONST86 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 { + CONST86 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 fc2e394..badad64 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.102 2009/06/12 12:46:11 dkf Exp $ + * RCS: $Id: tkInt.h,v 1.103 2009/06/27 19:33:35 nijtmans Exp $ */ #ifndef _TKINT @@ -1163,18 +1163,6 @@ MODULE_SCOPE int TkGetDoublePixels(Tcl_Interp *interp, Tk_Window tkwin, 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 const 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 const 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, diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h index 0efb8c4..5ddb1a1 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.45 2009/06/12 23:03:23 dkf Exp $ + * RCS: @(#) $Id: tkIntDecls.h,v 1.46 2009/06/27 19:33:35 nijtmans Exp $ */ #ifndef _TKINTDECLS @@ -1051,7 +1051,7 @@ EXTERN int TkStateParseProc (ClientData clientData, #ifndef TkStatePrintProc_TCL_DECLARED #define TkStatePrintProc_TCL_DECLARED /* 170 */ -EXTERN const char * TkStatePrintProc (ClientData clientData, +EXTERN CONST86 char * TkStatePrintProc (ClientData clientData, Tk_Window tkwin, char * widgRec, int offset, Tcl_FreeProc ** freeProcPtr); #endif @@ -1066,7 +1066,7 @@ EXTERN int TkCanvasDashParseProc (ClientData clientData, #ifndef TkCanvasDashPrintProc_TCL_DECLARED #define TkCanvasDashPrintProc_TCL_DECLARED /* 172 */ -EXTERN const char * TkCanvasDashPrintProc (ClientData clientData, +EXTERN CONST86 char * TkCanvasDashPrintProc (ClientData clientData, Tk_Window tkwin, char * widgRec, int offset, Tcl_FreeProc ** freeProcPtr); #endif @@ -1081,7 +1081,7 @@ EXTERN int TkOffsetParseProc (ClientData clientData, #ifndef TkOffsetPrintProc_TCL_DECLARED #define TkOffsetPrintProc_TCL_DECLARED /* 174 */ -EXTERN const char * TkOffsetPrintProc (ClientData clientData, +EXTERN CONST86 char * TkOffsetPrintProc (ClientData clientData, Tk_Window tkwin, char * widgRec, int offset, Tcl_FreeProc ** freeProcPtr); #endif @@ -1096,7 +1096,7 @@ EXTERN int TkPixelParseProc (ClientData clientData, #ifndef TkPixelPrintProc_TCL_DECLARED #define TkPixelPrintProc_TCL_DECLARED /* 176 */ -EXTERN const char * TkPixelPrintProc (ClientData clientData, +EXTERN CONST86 char * TkPixelPrintProc (ClientData clientData, Tk_Window tkwin, char * widgRec, int offset, Tcl_FreeProc ** freeProcPtr); #endif @@ -1111,7 +1111,22 @@ EXTERN int TkOrientParseProc (ClientData clientData, #ifndef TkOrientPrintProc_TCL_DECLARED #define TkOrientPrintProc_TCL_DECLARED /* 178 */ -EXTERN const char * TkOrientPrintProc (ClientData clientData, +EXTERN CONST86 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 CONST86 char * TkSmoothPrintProc (ClientData clientData, Tk_Window tkwin, char * widgRec, int offset, Tcl_FreeProc ** freeProcPtr); #endif @@ -1389,15 +1404,17 @@ typedef struct TkIntStubs { int (*tkBTreeNumLines) (TkTextBTree tree, const struct TkText * textPtr); /* 167 */ void (*tkTextInsertDisplayProc) (struct TkText * textPtr, struct TkTextDispChunk * chunkPtr, int x, int y, int height, int baseline, Display * display, Drawable dst, int screenY); /* 168 */ int (*tkStateParseProc) (ClientData clientData, Tcl_Interp * interp, Tk_Window tkwin, const char * value, char * widgRec, int offset); /* 169 */ - const char * (*tkStatePrintProc) (ClientData clientData, Tk_Window tkwin, char * widgRec, int offset, Tcl_FreeProc ** freeProcPtr); /* 170 */ + CONST86 char * (*tkStatePrintProc) (ClientData clientData, Tk_Window tkwin, char * widgRec, int offset, Tcl_FreeProc ** freeProcPtr); /* 170 */ int (*tkCanvasDashParseProc) (ClientData clientData, Tcl_Interp * interp, Tk_Window tkwin, const char * value, char * widgRec, int offset); /* 171 */ - const char * (*tkCanvasDashPrintProc) (ClientData clientData, Tk_Window tkwin, char * widgRec, int offset, Tcl_FreeProc ** freeProcPtr); /* 172 */ + CONST86 char * (*tkCanvasDashPrintProc) (ClientData clientData, Tk_Window tkwin, char * widgRec, int offset, Tcl_FreeProc ** freeProcPtr); /* 172 */ int (*tkOffsetParseProc) (ClientData clientData, Tcl_Interp * interp, Tk_Window tkwin, const char * value, char * widgRec, int offset); /* 173 */ - const char * (*tkOffsetPrintProc) (ClientData clientData, Tk_Window tkwin, char * widgRec, int offset, Tcl_FreeProc ** freeProcPtr); /* 174 */ + CONST86 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 */ - const char * (*tkPixelPrintProc) (ClientData clientData, Tk_Window tkwin, char * widgRec, int offset, Tcl_FreeProc ** freeProcPtr); /* 176 */ + CONST86 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 */ - const char * (*tkOrientPrintProc) (ClientData clientData, Tk_Window tkwin, char * widgRec, int offset, Tcl_FreeProc ** freeProcPtr); /* 178 */ + CONST86 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 */ + CONST86 char * (*tkSmoothPrintProc) (ClientData clientData, Tk_Window tkwin, char * widgRec, int offset, Tcl_FreeProc ** freeProcPtr); /* 180 */ } TkIntStubs; #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) @@ -2151,6 +2168,14 @@ extern const TkIntStubs *tkIntStubsPtr; #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 e9632a5..868311c 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.69 2009/06/12 23:03:23 dkf Exp $ + * RCS: @(#) $Id: tkStubInit.c,v 1.70 2009/06/27 19:33:35 nijtmans Exp $ */ #include "tkInt.h" @@ -330,6 +330,8 @@ static const TkIntStubs tkIntStubs = { TkPixelPrintProc, /* 176 */ TkOrientParseProc, /* 177 */ TkOrientPrintProc, /* 178 */ + TkSmoothParseProc, /* 179 */ + TkSmoothPrintProc, /* 180 */ }; static const TkIntPlatStubs tkIntPlatStubs = { -- cgit v0.12