summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2009-07-14 08:38:13 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2009-07-14 08:38:13 (GMT)
commit0c4d260f03b28a644623131ea0a7b6e3ecc9fbb0 (patch)
tree0f75cca4d4e50e3f57380da656167d1fb118e3c5
parent3838e46bebc8572acbd194c2ac1b6e69d9095237 (diff)
downloadtk-0c4d260f03b28a644623131ea0a7b6e3ecc9fbb0.zip
tk-0c4d260f03b28a644623131ea0a7b6e3ecc9fbb0.tar.gz
tk-0c4d260f03b28a644623131ea0a7b6e3ecc9fbb0.tar.bz2
Corrected definition of -height and -width for canvas' window items. [2326602]
-rw-r--r--ChangeLog3
-rw-r--r--doc/canvas.n10
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 17b3c22..5a80546 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2009-07-14 Donal K. Fellows <dkf@users.sf.net>
+ * doc/canvas.n (WINDOW ITEMS): [Bug 2326602]: Corrected definition of
+ the -height and -width options for these items.
+
* unix/configure.in: [Bug 2496018]: Allow the disabling of the use of
XScreenSaver at configuration time, so as to permit better control of
dependencies in the embedded case.
diff --git a/doc/canvas.n b/doc/canvas.n
index daa7a72..b87e770 100644
--- a/doc/canvas.n
+++ b/doc/canvas.n
@@ -6,7 +6,7 @@
'\" See the file "license.terms" for information on usage and redistribution
'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
'\"
-'\" RCS: @(#) $Id: canvas.n,v 1.43 2009/05/05 09:18:08 dkf Exp $
+'\" RCS: @(#) $Id: canvas.n,v 1.44 2009/07/14 08:38:13 dkf Exp $
'\"
.so man.macros
.TH canvas n 8.3 Tk "Tk Built-In Commands"
@@ -1860,16 +1860,16 @@ The following extra options are supported for window items:
Specifies the height to assign to the item's window.
\fIPixels\fR may have any of the
forms described in the \fBCOORDINATES\fR section above.
-If this option is not specified, or if it is specified as an empty
-string, then the window is given whatever height it requests internally.
+If this option is not specified, or if it is specified as zero,
+then the window is given whatever height it requests internally.
.TP
\fB\-width \fIpixels\fR
.
Specifies the width to assign to the item's window.
\fIPixels\fR may have any of the
forms described in the \fBCOORDINATES\fR section above.
-If this option is not specified, or if it is specified as an empty
-string, then the window is given whatever width it requests internally.
+If this option is not specified, or if it is specified as zero,
+then the window is given whatever width it requests internally.
.TP
\fB\-window \fIpathName\fR
.