summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2008-12-22 09:19:39 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2008-12-22 09:19:39 (GMT)
commit67a6558f3087f86aca224da622bb38cf66cb2c6f (patch)
tree96615986ff59e0cd457419ba6849f31b212dced6
parent292082ecad0ae29c005cde1e4e3d1d07f24d9a01 (diff)
downloadtk-67a6558f3087f86aca224da622bb38cf66cb2c6f.zip
tk-67a6558f3087f86aca224da622bb38cf66cb2c6f.tar.gz
tk-67a6558f3087f86aca224da622bb38cf66cb2c6f.tar.bz2
Forgot that I had to add code to propagate the tkwin through the psInfoPtr.
-rw-r--r--ChangeLog4
-rw-r--r--generic/tkCanvPs.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 64082fb..8838600 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
2008-12-22 Donal K. Fellows <dkf@users.sf.net>
- * generic/tkCanvPs.c (Tk_PostscriptFont): Backport of font size and
- reflection fix. [Bug 2107938]
+ * generic/tkCanvPs.c (Tk_PostscriptFont,TkCanvPostscriptCmd): Backport
+ of font size and reflection fix. [Bug 2107938]
2008-12-22 Alexandre Ferrieux <ferrieux@users.sourceforge.net>
diff --git a/generic/tkCanvPs.c b/generic/tkCanvPs.c
index 079b38b..7752da8 100644
--- a/generic/tkCanvPs.c
+++ b/generic/tkCanvPs.c
@@ -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: tkCanvPs.c,v 1.19.2.1 2008/12/22 01:43:39 dkf Exp $
+ * RCS: @(#) $Id: tkCanvPs.c,v 1.19.2.2 2008/12/22 09:19:40 dkf Exp $
*/
#include "tkInt.h"
@@ -42,6 +42,7 @@ typedef struct TkColormapData { /* Hold color information for a window */
*/
typedef struct TkPostscriptInfo {
+ Tk_Window tkwin; /* The canvas being printed. */
int x, y, width, height; /* Area to print, in canvas pixel
* coordinates. */
int x2, y2; /* x+width and y+height. */
@@ -191,6 +192,7 @@ TkCanvPostscriptCmd(
}
oldInfoPtr = canvasPtr->psInfo;
canvasPtr->psInfo = (Tk_PostscriptInfo) psInfoPtr;
+ psInfo.tkwin = canvasPtr->tkwin;
psInfo.x = canvasPtr->xOrigin;
psInfo.y = canvasPtr->yOrigin;
psInfo.width = -1;