From f3c805f63724d88a8dffc0b5c91573aa5b503c29 Mon Sep 17 00:00:00 2001 From: dkf Date: Tue, 14 Jul 2009 08:40:43 +0000 Subject: Corrected definition of -height and -width for canvas' window items. [2326602] --- ChangeLog | 3 +++ doc/canvas.n | 14 +++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a3d1bf..6ce5afc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2009-07-14 Donal K. Fellows + * 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 1899914..fe885dd 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.34 2008/01/30 12:00:38 dkf Exp $ +'\" RCS: @(#) $Id: canvas.n,v 1.34.2.1 2009/07/14 08:40:43 dkf Exp $ '\" .so man.macros .TH canvas n 8.3 Tk "Tk Built-In Commands" @@ -1790,6 +1790,7 @@ The following standard options are supported by window items: The following extra options are supported for window items: .TP \fB\-anchor \fIanchorPos\fR +. \fIAnchorPos\fR tells how to position the window relative to the positioning point for the item; it may have any of the forms accepted by \fBTk_GetAnchor\fR. For example, if \fIanchorPos\fR @@ -1799,20 +1800,23 @@ its top center point is at the positioning point. This option defaults to \fBcenter\fR. .TP \fB\-height \fIpixels\fR +. 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 +. Specifies the window to associate with this item. The window specified by \fIpathName\fR must either be a child of the canvas widget or a child of some ancestor of the canvas widget. -- cgit v0.12