summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2004-11-12 23:54:39 (GMT)
committerhobbs <hobbs>2004-11-12 23:54:39 (GMT)
commitf7ef97c981ab1aaf7b30223f9f9722bf010d502c (patch)
treed72799fa91f5d07ba82a48339c36a245adc04a20
parenta5c5bd1720e72b656862dd1df28652a4ce369bf6 (diff)
downloadtk-f7ef97c981ab1aaf7b30223f9f9722bf010d502c.zip
tk-f7ef97c981ab1aaf7b30223f9f9722bf010d502c.tar.gz
tk-f7ef97c981ab1aaf7b30223f9f9722bf010d502c.tar.bz2
* generic/tkCmds.c (Tk_TkObjCmd): use correct screen data when
-displayof arg is passed to [tk scaling]. [Bug 800178]
-rw-r--r--ChangeLog27
-rw-r--r--generic/tkCmds.c10
2 files changed, 20 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index 16456cd..9c78fea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,13 @@
+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>
- * 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 Daniel Steffen <das@users.sourceforge.net>
@@ -92,8 +97,8 @@
2004-10-27 Don Porter <dgp@users.sourceforge.net>
- * library/xmfbox.tcl (MotifFDialog_BuildUI): Fix [Bug 987169] in
- the Motif file dialogs as well. Backport of DKF bug fix.
+ * library/xmfbox.tcl (MotifFDialog_BuildUI): Fix [Bug 987169] in
+ the Motif file dialogs as well. Backport of DKF bug fix.
2004-10-26 David Gravereaux <davygrvy@pobox.com>
@@ -119,13 +124,13 @@
2004-10-26 Don Porter <dgp@users.sourceforge.net>
- * tests/safe.test (safe-1.3): Made test less sensitve to the
- full set of existing aliases in an interp, so the it only tests
- whether the tested ones are present.
+ * tests/safe.test (safe-1.3): Made test less sensitve to the
+ full set of existing aliases in an interp, so the it only tests
+ whether the tested ones are present.
- * unix/Makefile.in: Copied LD_LIBRARY_PATH machinery from
- `make shell` target to other similar targets so that just built
- libraries are tested, rather than previous installations.
+ * unix/Makefile.in: Copied LD_LIBRARY_PATH machinery from
+ `make shell` target to other similar targets so that just built
+ libraries are tested, rather than previous installations.
2004-10-26 Reinhard Max <max@suse.de>
diff --git a/generic/tkCmds.c b/generic/tkCmds.c
index c9d684e..d8c91b1 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.31.2.1 2004/06/29 23:20:26 hobbs Exp $
+ * RCS: @(#) $Id: tkCmds.c,v 1.31.2.2 2004/11/12 23:54:54 hobbs Exp $
*/
#include "tkPort.h"
@@ -755,12 +755,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);
@@ -789,7 +788,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)) {
@@ -802,9 +801,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,