summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2004-11-12 23:53:10 (GMT)
committerhobbs <hobbs>2004-11-12 23:53:10 (GMT)
commitae02c48f9de58524e10641d9405f72c806bb5431 (patch)
tree957ab105f1d36540343530cad9a83117d652f6f9
parentf85b8afb4ef1172832162a896e590395ec674c7f (diff)
downloadtk-ae02c48f9de58524e10641d9405f72c806bb5431.zip
tk-ae02c48f9de58524e10641d9405f72c806bb5431.tar.gz
tk-ae02c48f9de58524e10641d9405f72c806bb5431.tar.bz2
* generic/tkCmds.c (Tk_TkObjCmd): use correct screen data when
-displayof arg is passed to [tk scaling]. [Bug 800178]
-rw-r--r--ChangeLog11
-rw-r--r--generic/tkCmds.c10
2 files changed, 12 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 3c062a8..049cef7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,16 @@
+2004-11-12 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * generic/tkCmds.c (Tk_TkObjCmd): use correct screen data when
+ -displayof arg is passed to [tk scaling]. [Bug 800178]
+
2004-11-12 Daniel Steffen <das@users.sourceforge.net>
* doc/SetOptions.3:
* doc/text.n: fixed *roff errors uncovered by running 'make html'.
- * macosx/tkMacOSXFont.c (Tk_MeasureChars,Tk_DrawChars,etc): Make
- sure that the lastSubFontPtr remains valid even when the subfont
- array is reallocated. [Bug 618872]
+ * macosx/tkMacOSXFont.c (Tk_MeasureChars,Tk_DrawChars,etc): Make
+ sure that the lastSubFontPtr remains valid even when the subfont
+ array is reallocated. [Bug 618872]
2004-11-11 Reinhard Max <max@suse.de>
diff --git a/generic/tkCmds.c b/generic/tkCmds.c
index dfd9af1..b51fd80 100644
--- a/generic/tkCmds.c
+++ b/generic/tkCmds.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: tkCmds.c,v 1.34 2004/06/30 22:18:01 dkf Exp $
+ * RCS: @(#) $Id: tkCmds.c,v 1.35 2004/11/12 23:53:12 hobbs Exp $
*/
#include "tkPort.h"
@@ -753,12 +753,11 @@ Tk_TkObjCmd(clientData, interp, objc, objv)
return TCL_ERROR;
}
- screenPtr = Tk_Screen(tkwin);
-
skip = TkGetDisplayOf(interp, objc - 2, objv + 2, &tkwin);
if (skip < 0) {
return TCL_ERROR;
}
+ screenPtr = Tk_Screen(tkwin);
if (objc - skip == 2) {
d = 25.4 / 72;
d *= WidthOfScreen(screenPtr);
@@ -787,7 +786,7 @@ Tk_TkObjCmd(clientData, interp, objc, objv)
break;
}
case TK_USE_IM: {
- TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
+ TkDisplay *dispPtr;
int skip;
if (Tcl_IsSafe(interp)) {
@@ -800,9 +799,8 @@ Tk_TkObjCmd(clientData, interp, objc, objv)
skip = TkGetDisplayOf(interp, objc-2, objv+2, &tkwin);
if (skip < 0) {
return TCL_ERROR;
- } else if (skip) {
- dispPtr = ((TkWindow *) tkwin)->dispPtr;
}
+ dispPtr = ((TkWindow *) tkwin)->dispPtr;
if ((objc - skip) == 3) {
/*
* In the case where TK_USE_INPUT_METHODS is not defined,