* generic/tkInt.decls (TkDrawAngledTextLayout,TkDrawAngledChars,...):

	Expose angled text API for Emiliano Gavilan. Still only in internal
	stub table.

3 files changed, 31 insertions, 21 deletions

diff --git a/generic/tkFont.c b/generic/tkFont.c
index 54b3afa..b768bbd 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -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: tkFont.c,v 1.65 2010/01/05 08:49:49 dkf Exp $
+ * RCS: @(#) $Id: tkFont.c,v 1.66 2010/12/02 11:38:29 dkf Exp $
  */
 
 #include "tkInt.h"
@@ -524,7 +524,7 @@ Tk_FontObjCmd(
 	    s = Tcl_GetString(objv[n]);
 	    if (s[0] == '-' && s[1] != '-') {
 		optPtr = objv[n];
-		++n;
+		n++;
 	    } else {
 		optPtr = NULL;
 	    }
@@ -536,7 +536,7 @@ Tk_FontObjCmd(
 
 	if (n < objc) {
 	    if (!strcmp(Tcl_GetString(objv[n]), "--")) {
-		++n;
+		n++;
 	    }
 	}
 
@@ -546,7 +546,7 @@ Tk_FontObjCmd(
 
 	if (n < objc) {
 	    charPtr = objv[n];
-	    ++n;
+	    n++;
 	}
 
 	/*
@@ -2370,7 +2370,7 @@ TkDrawAngledTextLayout(
 			firstByte, lastByte - firstByte,
 			(int)(x + dx), (int)(y + dy));
 	    } else {
-		TkpDrawAngledChars(display, drawable, gc, layoutPtr->tkfont,
+		TkDrawAngledChars(display, drawable, gc, layoutPtr->tkfont,
 			firstByte, lastByte - firstByte, x+dx, y+dy, angle);
 	    }
 	}
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index e545da7..580b056 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.65 2010/09/28 10:42:05 nijtmans Exp $
+# RCS: @(#) $Id: tkInt.decls,v 1.66 2010/12/02 11:38:29 dkf Exp $
 
 library tk
 
@@ -613,6 +613,27 @@ declare 180 {
     CONST86 char *TkSmoothPrintProc(ClientData clientData, Tk_Window tkwin,
 	    char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
 }
+
+# Angled text API, exposed for Emiliano Gavilan's RBC work.
+declare 181 {
+    void TkDrawAngledTextLayout(Display *display, Drawable drawable, GC gc,
+	    Tk_TextLayout layout, int x, int y, double angle, int firstChar,
+	    int lastChar);
+}
+declare 182 {
+    void TkUnderlineAngledTextLayout(Display *display, Drawable drawable,
+	    GC gc, Tk_TextLayout layout, int x, int y, double angle,
+	    int underline);
+}
+declare 183 {
+    int TkIntersectAngledTextLayout(Tk_TextLayout layout, int x, int y,
+	    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);
+}
 
 ##############################################################################
 
@@ -968,7 +989,7 @@ declare 51 aqua {
 declare 53 aqua {
     unsigned long TkpGetMS(void)
 }
-
+
 ##############################################################################
 
 # Define the platform specific internal Xlib interfaces. These functions are
diff --git a/generic/tkInt.h b/generic/tkInt.h
index 7722da3..4ca9b05 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.123 2010/06/19 16:18:41 jenglish Exp $
+ * RCS: $Id: tkInt.h,v 1.124 2010/12/02 11:38:29 dkf Exp $
  */
 
 #ifndef _TKINT
@@ -1198,21 +1198,10 @@ MODULE_SCOPE void	TkpMakeTransparentWindowExist(Tk_Window tkwin,
 MODULE_SCOPE void	TkpCreateBusy(Tk_FakeWin *winPtr, Tk_Window tkRef,
 			    Window *parentPtr, Tk_Window tkParent,
 			    TkBusy busy);
-MODULE_SCOPE void	TkDrawAngledTextLayout(Display *display,
-			    Drawable drawable, GC gc, Tk_TextLayout layout,
-			    int x, int y, double angle, int firstChar,
-			    int lastChar);
-MODULE_SCOPE void	TkpDrawAngledChars(Display *display,Drawable drawable,
-			    GC gc, Tk_Font tkfont, const char *source,
-			    int numBytes, double x, double y, double angle);
-MODULE_SCOPE void	TkUnderlineAngledTextLayout(Display *display,
-			    Drawable drawable, GC gc, Tk_TextLayout layout,
-			    int x, int y, double angle, int underline);
-MODULE_SCOPE int	TkIntersectAngledTextLayout(Tk_TextLayout layout,
-			    int x,int y, int width, int height, double angle);
 MODULE_SCOPE int	TkBackgroundEvalObjv(Tcl_Interp *interp,
 			    int objc, Tcl_Obj *const *objv, int flags);
-MODULE_SCOPE void	TkSendVirtualEvent(Tk_Window tgtWin, const char *eventName);
+MODULE_SCOPE void	TkSendVirtualEvent(Tk_Window tgtWin,
+			    const char *eventName);
 MODULE_SCOPE Tcl_Command TkMakeEnsemble(Tcl_Interp *interp,
 			    const char *nsname, const char *name,
 			    ClientData clientData, const TkEnsemble *map);