fix/regen

3 files changed, 38 insertions, 27 deletions

diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 580b056..4758f37 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.66 2010/12/02 11:38:29 dkf Exp $
+# RCS: @(#) $Id: tkInt.decls,v 1.67 2010/12/02 13:36:45 dkf Exp $
 
 library tk
 
@@ -618,21 +618,21 @@ declare 180 {
 declare 181 {
     void TkDrawAngledTextLayout(Display *display, Drawable drawable, GC gc,
 	    Tk_TextLayout layout, int x, int y, double angle, int firstChar,
-	    int lastChar);
+	    int lastChar)
 }
 declare 182 {
     void TkUnderlineAngledTextLayout(Display *display, Drawable drawable,
 	    GC gc, Tk_TextLayout layout, int x, int y, double angle,
-	    int underline);
+	    int underline)
 }
 declare 183 {
     int TkIntersectAngledTextLayout(Tk_TextLayout layout, int x, int y,
-	    int width, int height, double angle);
+	    int width, int height, double angle)
 }
 declare 184 {
     void TkDrawAngledChars(Display *display,Drawable drawable, GC gc,
 	    Tk_Font tkfont, const char *source, int numBytes, double x,
-	    double y, double angle);
+	    double y, double angle)
 }
 
 ##############################################################################
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index 18c2946..6632322 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.55 2010/12/02 13:00:17 dkf Exp $
+ * RCS: @(#) $Id: tkIntDecls.h,v 1.56 2010/12/02 13:36:45 dkf Exp $
  */
 
 #ifndef _TKINTDECLS
@@ -582,13 +582,24 @@ 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);;
+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);;
+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);;
+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);;
+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;
@@ -874,10 +885,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 */
+    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
@@ -1292,14 +1303,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 */
+#define TkDrawAngledTextLayout \
+	(tkIntStubsPtr->tkDrawAngledTextLayout) /* 181 */
+#define TkUnderlineAngledTextLayout \
+	(tkIntStubsPtr->tkUnderlineAngledTextLayout) /* 182 */
+#define TkIntersectAngledTextLayout \
+	(tkIntStubsPtr->tkIntersectAngledTextLayout) /* 183 */
+#define TkDrawAngledChars \
+	(tkIntStubsPtr->tkDrawAngledChars) /* 184 */
 
 #endif /* defined(USE_TK_STUBS) */
 
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index d9e01a1..8405d12 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.78 2010/12/02 13:00:17 dkf Exp $
+ * RCS: @(#) $Id: tkStubInit.c,v 1.79 2010/12/02 13:36:45 dkf Exp $
  */
 
 #include "tkInt.h"
@@ -331,10 +331,10 @@ static const TkIntStubs tkIntStubs = {
     TkOrientPrintProc, /* 178 */
     TkSmoothParseProc, /* 179 */
     TkSmoothPrintProc, /* 180 */
-    &lastChar);, /* 181 */
-    &underline);, /* 182 */
-    &angle);, /* 183 */
-    &angle);, /* 184 */
+    TkDrawAngledTextLayout, /* 181 */
+    TkUnderlineAngledTextLayout, /* 182 */
+    TkIntersectAngledTextLayout, /* 183 */
+    TkDrawAngledChars, /* 184 */
 };
 
 static const TkIntPlatStubs tkIntPlatStubs = {