diff options
| -rw-r--r-- | generic/tkIntDecls.h | 22 | ||||
| -rw-r--r-- | generic/tkStubInit.c | 6 |
2 files changed, 26 insertions, 2 deletions
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h index 6eaf8f9..18c2946 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.54 2010/08/21 16:35:32 nijtmans Exp $ + * RCS: @(#) $Id: tkIntDecls.h,v 1.55 2010/12/02 13:00:17 dkf Exp $ */ #ifndef _TKINTDECLS @@ -581,6 +581,14 @@ EXTERN int TkSmoothParseProc(ClientData clientData, EXTERN CONST86 char * TkSmoothPrintProc(ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); +/* 181 */ +EXTERN void TkDrawAngledTextLayout(Display *display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, double angle, int firstChar, int lastChar);; +/* 182 */ +EXTERN void TkUnderlineAngledTextLayout(Display *display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, double angle, int underline);; +/* 183 */ +EXTERN int TkIntersectAngledTextLayout(Tk_TextLayout layout, int x, int y, int width, int height, double angle);; +/* 184 */ +EXTERN void TkDrawAngledChars(Display *display,Drawable drawable, GC gc, Tk_Font tkfont, const char *source, int numBytes, double x, double y, double angle);; typedef struct TkIntStubs { int magic; @@ -866,6 +874,10 @@ typedef struct TkIntStubs { 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 */ + void TkDrawAngledTextLayout(Display *display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, double angle, int firstChar, int *lastChar);; /* 181 */ + void TkUnderlineAngledTextLayout(Display *display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, double angle, int *underline);; /* 182 */ + int TkIntersectAngledTextLayout(Tk_TextLayout layout, int x, int y, int width, int height, double *angle);; /* 183 */ + void TkDrawAngledChars(Display *display,Drawable drawable, GC gc, Tk_Font tkfont, const char *source, int numBytes, double x, double y, double *angle);; /* 184 */ } TkIntStubs; #ifdef __cplusplus @@ -1280,6 +1292,14 @@ extern const TkIntStubs *tkIntStubsPtr; (tkIntStubsPtr->tkSmoothParseProc) /* 179 */ #define TkSmoothPrintProc \ (tkIntStubsPtr->tkSmoothPrintProc) /* 180 */ +#define lastChar); \ + (*tkIntStubsPtr->lastChar);) /* 181 */ +#define underline); \ + (*tkIntStubsPtr->underline);) /* 182 */ +#define angle); \ + (*tkIntStubsPtr->angle);) /* 183 */ +#define angle); \ + (*tkIntStubsPtr->angle);) /* 184 */ #endif /* defined(USE_TK_STUBS) */ diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index 7ba1353..d9e01a1 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.77 2010/09/28 10:42:05 nijtmans Exp $ + * RCS: @(#) $Id: tkStubInit.c,v 1.78 2010/12/02 13:00:17 dkf Exp $ */ #include "tkInt.h" @@ -331,6 +331,10 @@ static const TkIntStubs tkIntStubs = { TkOrientPrintProc, /* 178 */ TkSmoothParseProc, /* 179 */ TkSmoothPrintProc, /* 180 */ + &lastChar);, /* 181 */ + &underline);, /* 182 */ + &angle);, /* 183 */ + &angle);, /* 184 */ }; static const TkIntPlatStubs tkIntPlatStubs = { |