summaryrefslogtreecommitdiffstats
path: root/generic/tkCanvUtil.c
diff options
context:
space:
mode:
authorferrieux <ferrieux@users.sourceforge.net>2008-12-21 23:52:45 (GMT)
committerferrieux <ferrieux@users.sourceforge.net>2008-12-21 23:52:45 (GMT)
commit66e293b3ecc1bc3b72bb152c7e93a5380cd96d38 (patch)
tree6aaa853e62bf644e2a1ef9de0c9b5358fd47c650 /generic/tkCanvUtil.c
parent7755a72d4df91e7c456cf4f339693d7027c29076 (diff)
downloadtk-66e293b3ecc1bc3b72bb152c7e93a5380cd96d38.zip
tk-66e293b3ecc1bc3b72bb152c7e93a5380cd96d38.tar.gz
tk-66e293b3ecc1bc3b72bb152c7e93a5380cd96d38.tar.bz2
Backport of the Millipeter patch [1813597,2218964]
Diffstat (limited to 'generic/tkCanvUtil.c')
-rw-r--r--generic/tkCanvUtil.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/generic/tkCanvUtil.c b/generic/tkCanvUtil.c
index e0c9a3a..9bd60d4 100644
--- a/generic/tkCanvUtil.c
+++ b/generic/tkCanvUtil.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkCanvUtil.c,v 1.19 2008/03/11 22:31:19 das Exp $
+ * RCS: @(#) $Id: tkCanvUtil.c,v 1.19.2.1 2008/12/21 23:52:45 ferrieux Exp $
*/
#include "tkInt.h"
@@ -268,12 +268,7 @@ Tk_CanvasGetCoordFromObj(
{
TkCanvas *canvasPtr = (TkCanvas *) canvas;
- if (Tk_GetMMFromObj(canvasPtr->interp, canvasPtr->tkwin, obj,
- doublePtr) != TCL_OK) {
- return TCL_ERROR;
- }
- *doublePtr *= canvasPtr->pixelsPerMM;
- return TCL_OK;
+ return Tk_GetDoublePixelsFromObj(canvasPtr->interp, canvasPtr->tkwin, obj, doublePtr);
}
/*