merged trunk

11 files changed, 137 insertions, 74 deletions

diff --git a/doc/bind.n b/doc/bind.n
index 17acb52..d189376 100644
--- a/doc/bind.n
+++ b/doc/bind.n
@@ -205,9 +205,7 @@ always routed to the window that currently has focus. When the event
 is received you can use the \fB%D\fR substitution to get the
 \fIdelta\fR field for the event, which is a integer value describing how
 the mouse wheel has moved.  The smallest value for which the
-system will report is defined by the OS.  On Windows 95 & 98 machines
-this value is at least 120 before it is reported.  However, higher
-resolution devices may be available in the future.  The sign of the
+system will report is defined by the OS. The sign of the
 value determines which direction your widget should scroll.  Positive
 values should scroll up and negative values should scroll down.
 .IP "\fBKeyPress\fR, \fBKeyRelease\fR" 5
@@ -527,9 +525,7 @@ The \fIborder_width\fR field from the event.  Valid only for
 .IP \fB%D\fR 5
 This reports the \fIdelta\fR value of a \fBMouseWheel\fR event.  The
 \fIdelta\fR value represents the rotation units the mouse wheel has
-been moved.  On Windows 95 & 98 systems the smallest value for the
-delta is 120.  Future systems may support higher resolution values for
-the delta.  The sign of the value represents the direction the mouse
+been moved. The sign of the value represents the direction the mouse
 wheel was scrolled.
 .IP \fB%E\fR 5
 The \fIsend_event\fR field from the event.  Valid for all event types.
@@ -541,6 +537,9 @@ event generated by \fBSendEvent\fR.
 .IP \fB%K\fR 5
 The keysym corresponding to the event, substituted as a textual
 string.  Valid only for \fBKeyPress\fR and \fBKeyRelease\fR events.
+.IP \fB%M\fR 5
+The number of script-based binding patterns matched so far for the
+event.  Valid for all event types.
 .IP \fB%N\fR 5
 The keysym corresponding to the event, substituted as a decimal
 number.  Valid only for \fBKeyPress\fR and \fBKeyRelease\fR events.
diff --git a/doc/chooseDirectory.n b/doc/chooseDirectory.n
index 295c75b..86c593d 100644
--- a/doc/chooseDirectory.n
+++ b/doc/chooseDirectory.n
@@ -19,8 +19,11 @@ possible as command line arguments:
 .TP
 \fB\-initialdir\fR \fIdirname\fR
 Specifies that the directories in \fIdirectory\fR should be displayed
-when the dialog pops up. If this parameter is not specified, then
-the directories in the current working directory are displayed. If the
+when the dialog pops up. If this parameter is not specified,
+the initial directory defaults to the current working directory 
+on non-Windows systems and on Windows systems prior to Vista.
+On Vista and later systems, the initial directory defaults to the last
+user-selected directory for the application. If the
 parameter specifies a relative path, the return value will convert the
 relative path to an absolute path.
 .TP
diff --git a/doc/colors.n b/doc/colors.n
index ee44f7b..dc7007b 100644
--- a/doc/colors.n
+++ b/doc/colors.n
@@ -3,8 +3,6 @@
 '\" Copyright (c) 2003 ActiveState Corporation.
 '\" Copyright (c) 2006-2007 Daniel A. Steffen <das@users.sourceforge.net>
 '\" Copyright (c) 2008 Donal K. Fellows
-'\" 
-'\" 
 '\"
 .TH colors n 8.3 Tk "Tk Built-In Commands"
 .so man.macros
@@ -29,6 +27,7 @@ AntiqueWhite1	255	239 	219
 AntiqueWhite2	238	223 	204
 AntiqueWhite3	205	192 	176
 AntiqueWhite4	139	131 	120
+agua	0	255	255
 aquamarine	127	255 	212
 aquamarine1	127	255 	212
 aquamarine2	118	238 	198
@@ -93,6 +92,7 @@ cornsilk1	255	248 	220
 cornsilk2	238	232 	205
 cornsilk3	205	200 	177
 cornsilk4	139	136 	120
+crymson	220	20	60
 cyan	0	255 	255
 cyan1	0	255 	255
 cyan2	0	238 	238
@@ -191,6 +191,7 @@ floral white	255	250 	240
 FloralWhite	255	250 	240
 forest green	34	139 	34
 ForestGreen	34	139 	34
+fuchsia	255	0	255
 gainsboro	220	220 	220
 ghost white	248	248 	255
 GhostWhite	248	248 	255
@@ -204,7 +205,7 @@ goldenrod1	255	193 	37
 goldenrod2	238	180 	34
 goldenrod3	205	155 	29
 goldenrod4	139	105 	20
-gray	190	190 	190
+gray	128	128	128
 gray0	0	0 	0
 gray1	3	3 	3
 gray2	5	5 	5
@@ -306,14 +307,14 @@ gray97	247	247 	247
 gray98	250	250 	250
 gray99	252	252 	252
 gray100	255	255 	255
-green	0	255 	0
+green	0	128 	0
 green yellow	173	255 	47
 green1	0	255 	0
 green2	0	238 	0
 green3	0	205 	0
 green4	0	139 	0
 GreenYellow	173	255 	47
-grey	190	190 	190
+grey	128	128	128
 grey0	0	0 	0
 grey1	3	3 	3
 grey2	5	5 	5
@@ -432,6 +433,7 @@ IndianRed1	255	106 	106
 IndianRed2	238	99 	99
 IndianRed3	205	85 	85
 IndianRed4	139	58 	58
+indigo	75	0	130
 ivory	255	255 	240
 ivory1	255	255 	240
 ivory2	238	238 	224
@@ -523,6 +525,7 @@ LightYellow1	255	255 	224
 LightYellow2	238	238 	209
 LightYellow3	205	205 	180
 LightYellow4	139	139 	122
+lime	0	255	0
 lime green	50	205 	50
 LimeGreen	50	205 	50
 linen	250	240 	230
@@ -531,7 +534,7 @@ magenta1	255	0 	255
 magenta2	238	0 	238
 magenta3	205	0 	205
 magenta4	139	0 	139
-maroon	176	48 	96
+maroon	128	0 	0
 maroon1	255	52 	179
 maroon2	238	48 	167
 maroon3	205	41 	144
@@ -584,6 +587,7 @@ navy blue	0	0 	128
 NavyBlue	0	0 	128
 old lace	253	245 	230
 OldLace	253	245 	230
+olive	128	128	0
 olive drab	107	142 	35
 OliveDrab	107	142 	35
 OliveDrab1	192	255 	62
@@ -647,7 +651,7 @@ plum3	205	150 	205
 plum4	139	102 	139
 powder blue	176	224 	230
 PowderBlue	176	224 	230
-purple	160	32 	240
+purple	128	0 	128
 purple1	155	48 	255
 purple2	145	44 	238
 purple3	125	38 	205
@@ -694,6 +698,7 @@ sienna1	255	130 	71
 sienna2	238	121 	66
 sienna3	205	104 	57
 sienna4	139	71 	38
+silver	192	192	192
 sky blue	135	206 	235
 SkyBlue	135	206 	235
 SkyBlue1	135	206 	255
@@ -736,6 +741,7 @@ tan1	255	165 	79
 tan2	238	154 	73
 tan3	205	133 	63
 tan4	139	90 	43
+teal	0	128	128
 thistle	216	191 	216
 thistle1	255	225 	255
 thistle2	238	210 	238
@@ -927,19 +933,19 @@ On Windows, the following additional system colors are available
 .RS
 .DS
 .ta 6c
-3dDarkShadow	Highlight
-3dLight	HighlightText
-ActiveBorder	InactiveBorder
-ActiveCaption	InactiveCaption
-AppWorkspace	InactiveCaptionText
-Background	InfoBackground
-ButtonFace	InfoText
-ButtonHighlight	Menu
-ButtonShadow	MenuText
-ButtonText	Scrollbar
-CaptionText	Window
-DisabledText	WindowFrame
-GrayText	WindowText
+system3dDarkShadow	systemHighlight
+system3dLight	systemHighlightText
+systemActiveBorder	systemInactiveBorder
+systemActiveCaption	systemInactiveCaption
+systemAppWorkspace	systemInactiveCaptionText
+systemBackground	systemInfoBackground
+systemButtonFace	systemInfoText
+systemButtonHighlight	systemMenu
+systemButtonShadow	systemMenuText
+systemButtonText	systemScrollbar
+systemCaptionText	systemWindow
+systemDisabledText	systemWindowFrame
+systemGrayText	systemWindowText
 .DE
 .RE
 .SH "SEE ALSO"
diff --git a/doc/event.n b/doc/event.n
index 11782dd..7a3cfca 100644
--- a/doc/event.n
+++ b/doc/event.n
@@ -546,7 +546,7 @@ the physical event.
 .PP
 Bindings on a virtual event may be created before the virtual event exists.
 Indeed, the virtual event never actually needs to be defined, for instance,
-on platforms where the specific virtual event would meaningless or
+on platforms where the specific virtual event would be meaningless or
 ungeneratable.
 .PP
 When a definition of a virtual event changes at run time, all windows
diff --git a/doc/getOpenFile.n b/doc/getOpenFile.n
index 95884bb..f5e92ff 100644
--- a/doc/getOpenFile.n
+++ b/doc/getOpenFile.n
@@ -65,8 +65,11 @@ discussion on the contents of \fIfilePatternList\fR.
 \fB\-initialdir\fR \fIdirectory\fR
 .
 Specifies that the files in \fIdirectory\fR should be displayed
-when the dialog pops up. If this parameter is not specified, then
-the files in the current working directory are displayed. If the
+when the dialog pops up. If this parameter is not specified, 
+the initial directory defaults to the current working directory 
+on non-Windows systems and on Windows systems prior to Vista.
+On Vista and later systems, the initial directory defaults to the last
+user-selected directory for the application. If the
 parameter specifies a relative path, the return value will convert the
 relative path to an absolute path.
 .TP
diff --git a/doc/listbox.n b/doc/listbox.n
index 1da40fd..0f263b4 100644
--- a/doc/listbox.n
+++ b/doc/listbox.n
@@ -453,7 +453,7 @@ it and deselects any other selected item.
 In \fBbrowse\fR mode it is also possible to drag the selection
 with button 1.
 On button 1, the listbox will also take focus if it has a \fBnormal\fR
-state and \fB\-takefocus\fR is true.
+state.
 .PP
 If the selection mode is \fBmultiple\fR or \fBextended\fR,
 any number of elements may be selected at once, including discontiguous
@@ -469,9 +469,12 @@ Most people will probably want to use \fBbrowse\fR mode for
 single selections and \fBextended\fR mode for multiple selections;
 the other modes appear to be useful only in special situations.
 .PP
-Any time the selection changes in the listbox, the virtual event
-\fB<<ListboxSelect>>\fR will be generated.  It is easiest to bind
-to this event to be made aware of any changes to listbox selection.
+Any time the set of selected item(s) in the listbox is updated by the
+user through the keyboard or mouse, the virtual event
+\fB<<ListboxSelect>>\fR will be generated. This virtual event will not
+be generated when adjusting the selection with the \fIpathName
+\fBselection\fR  command. It is easiest to bind to this event to be
+made aware of any user changes to listbox selection.
 .PP
 In addition to the above behavior, the following additional behavior
 is defined by the default bindings:
diff --git a/doc/menu.n b/doc/menu.n
index e26c2d8..1067f38 100644
--- a/doc/menu.n
+++ b/doc/menu.n
@@ -304,16 +304,10 @@ operations on the widget.  It has the following general form:
 determine the exact behavior of the command.
 .PP
 Many of the widget commands for a menu take as one argument an
-indicator of which entry of the menu to operate on.  These
+indicator of which entry of the menu to operate on. These
 indicators are called \fIindex\fRes and may be specified in
 any of the following forms:
 .TP 12
-\fInumber\fR
-.
-Specifies the entry numerically, where 0 corresponds
-to the top-most entry of the menu, 1 to the entry below it, and
-so on.
-.TP 12
 \fBactive\fR
 .
 Indicates the entry that is currently active.  If no entry is
@@ -348,6 +342,12 @@ For example,
 .QW \fB@0\fR
 indicates the top-most entry in the window.
 .TP 12
+\fInumber\fR
+.
+Specifies the entry numerically, where 0 corresponds
+to the top-most entry of the menu, 1 to the entry below it, and
+so on.
+.TP 12
 \fIpattern\fR
 .
 If the index does not satisfy one of the above forms then this
@@ -356,6 +356,9 @@ each entry in the menu, in order from the top down, until a
 matching entry is found.  The rules of \fBstring match\fR
 are used.
 .PP
+If the index could match more than one of the above forms, then
+the form earlier in the above list takes precedence.
+.PP
 The following widget commands are possible for menu widgets:
 .TP
 \fIpathName \fBactivate \fIindex\fR
diff --git a/doc/messageBox.n b/doc/messageBox.n
index 0b4554c..5ce1745 100644
--- a/doc/messageBox.n
+++ b/doc/messageBox.n
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH tk_messageBox n 4.2 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
@@ -50,9 +50,8 @@ displayed.
 .TP
 \fB\-message\fR \fIstring\fR
 .
-Specifies the message to display in this message box. This option is ignored
-on Mac OS X, where platform guidelines forbid the use of a title on this kind
-of dialog.
+Specifies the message to display in this message box. The
+default value is an empty string.
 .TP
 \fB\-parent\fR \fIwindow\fR
 .
@@ -61,8 +60,9 @@ box is displayed on top of its parent window.
 .TP
 \fB\-title\fR \fItitleString\fR
 .
-Specifies a string to display as the title of the message box. The
-default value is an empty string.
+Specifies a string to display as the title of the message box. This option
+is ignored on Mac OS X, where platform guidelines forbid the use of a title
+on this kind of dialog.
 .TP
 \fB\-type\fR \fIpredefinedType\fR
 .
diff --git a/doc/panedwindow.n b/doc/panedwindow.n
index c199e63..e2c954a 100644
--- a/doc/panedwindow.n
+++ b/doc/panedwindow.n
@@ -29,6 +29,16 @@ drawn as squares.  May be any value accepted by \fBTk_GetPixels\fR.
 Specifies a desired height for the overall panedwindow widget. May be any
 value accepted by \fBTk_GetPixels\fR. If an empty string, the widget will be
 made high enough to allow all contained widgets to have their natural height.
+.OP \-proxybackground proxyBackground ProxyBackground
+Background color to use when drawing the proxy. If an empty string, the
+value of the \fB-background\fR option will be used.
+.OP \-proxyborderwidth proxyBorderWidth ProxyBorderWidth
+Specifies the borderwidth of the proxy. May be any value accepted by
+\fBTk_GetPixels\fR.
+.OP \-proxyrelief proxyRelief ProxyRelief
+Relief to use when drawing the proxy. May be any of the standard Tk
+relief values. If an empty string, the value of the \fB-sashrelief\fR
+option will be used.
 .OP \-opaqueresize opaqueResize OpaqueResize
 Specifies whether panes should be resized as a sash is moved (true),
 or if resizing should be deferred until the sash is placed (false).
@@ -311,6 +321,15 @@ adjusted.
 When a pane is resized from outside (e.g. it is packed to expand and
 fill, and the containing toplevel is resized), space is added to the final
 (rightmost or bottommost) pane in the window.
+.PP
+Unlike slave windows managed by e.g. pack or grid, the panes managed by a
+panedwindow do not change width or height to accomodate changes in the
+requested widths or heights of the panes, once these have become mapped.
+Therefore it may be advisable, particularly when creating layouts
+interactively, to not add a pane to the panedwindow widget until after the
+geometry requests of that pane has been finalized (i.e., all components of
+the pane inserted, all options affecting geometry set to their proper
+values, etc.).
 .SH "SEE ALSO"
 ttk::panedwindow(n)
 .SH KEYWORDS
diff --git a/doc/spinbox.n b/doc/spinbox.n
index 1e8cb3a..7227cf1 100644
--- a/doc/spinbox.n
+++ b/doc/spinbox.n
@@ -196,7 +196,7 @@ dangerous to mix.  Any problems have been overcome so that using the
 the spinbox widget.  Using the \fB\-textvariable\fR for read-only purposes will
 never cause problems.  The danger comes when you try set the
 \fB\-textvariable\fR to something that the \fB\-validatecommand\fR would not
-accept, which causes \fB\-validate\fR to become \fInone\fR (the
+accept, which causes \fB\-validate\fR to become \fBnone\fR (the
 \fB\-invalidcommand\fR will not be triggered).  The same happens
 when an error occurs evaluating the \fB\-validatecommand\fR.
 .PP
@@ -216,6 +216,16 @@ in the \fB\-validatecommand\fR or \fB\-invalidcommand\fR (whichever one you
 were editing the spinbox widget from).  It is also recommended to not set an
 associated \fB\-textvariable\fR during validation, as that can cause the
 spinbox widget to become out of sync with the \fB\-textvariable\fR.
+.PP
+Also, the \fBvalidate\fR option will set itself to \fBnone\fR when the
+spinbox value gets changed because of adjustment of \fBfrom\fR or \fBto\fR
+and the \fBvalidateCommand\fR returns false. For instance
+.CS
+     \fIspinbox pathName \-from 1 \-to 10 \-validate all \-vcmd {return 0}\fR
+.CE
+will in fact set the \fBvalidate\fR option to \fBnone\fR because the default
+value for the spinbox gets changed (due to the \fBfrom\fR and \fBto\fR
+options) to a value not accepted by the validation script.
 .SH "WIDGET COMMAND"
 .PP
 The \fBspinbox\fR command creates a new Tcl command whose
diff --git a/doc/text.n b/doc/text.n
index e55c4a0..976503b 100644
--- a/doc/text.n
+++ b/doc/text.n
@@ -634,15 +634,23 @@ embedded window annotation causes a window to be displayed at a particular
 point in the text. There may be any number of embedded windows in a text
 widget, and any widget may be used as an embedded window (subject to the usual
 rules for geometry management, which require the text window to be the parent
-of the embedded window or a descendant of its parent). The embedded window's
-position on the screen will be updated as the text is modified or scrolled,
-and it will be mapped and unmapped as it moves into and out of the visible
-area of the text widget. Each embedded window occupies one unit's worth of
-index space in the text widget, and it may be referred to either by the name
-of its embedded window or by its position in the widget's index space. If the
-range of text containing the embedded window is deleted then the window is
-destroyed. Similarly if the text widget as a whole is deleted, then the window
-is destroyed.
+of the embedded window or a descendant of its parent).
+.PP
+The embedded window's position on the screen will be updated as the text is
+modified or scrolled, and it will be mapped and unmapped as it moves into and
+out of the visible area of the text widget. Each embedded window occupies one
+unit's worth of index space in the text widget, and it may be referred to
+either by the name of its embedded window or by its position in the widget's
+index space. If the range of text containing the embedded window is deleted
+then the window is destroyed. Similarly if the text widget as a whole is
+deleted, then the window is destroyed.
+.PP
+Eliding an embedded window immediately after scheduling it for creation via
+\fIpathName \fBwindow create \fIindex \fB-create\fR will prevent it from being
+effectively created. Uneliding an elided embedded window scheduled for creation
+via \fIpathName \fBwindow create \fIindex \fB-create\fR will automatically
+trigger the associated creation script. After destroying an elided embedded
+window, the latter won't get automatically recreated.
 .PP
 When an embedded window is added to a text widget with the \fIpathName
 \fBwindow create\fR widget command, several configuration options may be
@@ -706,13 +714,22 @@ The final form of annotation in text widgets is an embedded image. Each
 embedded image annotation causes an image to be displayed at a particular
 point in the text. There may be any number of embedded images in a text
 widget, and a particular image may be embedded in multiple places in the same
-text widget. The embedded image's position on the screen will be updated as
-the text is modified or scrolled. Each embedded image occupies one unit's
-worth of index space in the text widget, and it may be referred to either by
-its position in the widget's index space, or the name it is assigned when the
-image is inserted into the text widget with \fIpathName \fBimage create\fR. If
-the range of text containing the embedded image is deleted then that copy of
-the image is removed from the screen.
+text widget.
+.PP
+The embedded image's position on the screen will be updated as the text is
+modified or scrolled. Each embedded image occupies one unit's worth of index
+space in the text widget, and it may be referred to either by its position in
+the widget's index space, or the name it is assigned when the image is inserted
+into the text widget with \fIpathName \fBimage create\fR. If the range of text
+containing the embedded image is deleted then that copy of the image is removed
+from the screen.
+.PP
+Eliding an embedded image immediately after scheduling it for creation via
+\fIpathName \fBimage create \fIindex \fB-create\fR will prevent it from being
+effectively created. Uneliding an elided embedded image scheduled for creation
+via \fIpathName \fBimage create \fIindex \fB-create\fR will automatically
+trigger the associated creation script. After destroying an elided embedded
+image, the latter won't get automatically recreated.
 .PP
 When an embedded image is added to a text widget with the \fIpathName \fBimage
 create\fR widget command, a name unique to this instance of the image is
@@ -959,11 +976,12 @@ each counting option given. Valid counting options are \fB\-chars\fR,
 \fB\-displaychars\fR, \fB\-displayindices\fR, \fB\-displaylines\fR,
 \fB\-indices\fR, \fB\-lines\fR, \fB\-xpixels\fR and \fB\-ypixels\fR. The
 default value, if no option is specified, is \fB\-indices\fR. There is an
-additional possible option \fB\-update\fR which is a modifier. If given, then
-all subsequent options ensure that any possible out of date information is
-recalculated. This currently only has any effect for the \fB\-ypixels\fR count
-(which, if \fB\-update\fR is not given, will use the text widget's current
-cached value for each line). The count options are interpreted as follows:
+additional possible option \fB\-update\fR which is a modifier. If given (and
+if the text widget is managed by a geometry manager), then all subsequent
+options ensure that any possible out of date information is recalculated.
+This currently only has any effect for the \fB\-ypixels\fR count (which, if
+\fB\-update\fR is not given, will use the text widget's current cached value
+for each line). The count options are interpreted as follows:
 .RS
 .IP \fB\-chars\fR
 count all characters, whether elided or not. Do not count embedded windows or
@@ -1071,8 +1089,8 @@ including \fIindex2\fR, including the text and information about marks, tags,
 and embedded windows. If \fIindex2\fR is not specified, then it defaults to
 one character past \fIindex1\fR. The information is returned in the following
 format:
-.LP
 .RS
+.LP
 \fIkey1 value1 index1 key2 value2 index2\fR ...
 .LP
 The possible \fIkey\fR values are \fBtext\fR, \fBmark\fR, \fBtagon\fR,
@@ -1974,9 +1992,8 @@ the clipboard.
 Control-t reverses the order of the two characters to the right of the
 insertion cursor.
 .IP [32]
-Control-z (and Control-underscore on UNIX when \fBtk_strictMotif\fR is true)
-undoes the last edit action if the \fB\-undo\fR option is true. Does nothing
-otherwise.
+Control-z undoes the last edit action if the \fB\-undo\fR option is true.
+Does nothing otherwise.
 .IP [33]
 Control-Z (or Control-y on Windows) reapplies the last undone edit action if
 the \fB\-undo\fR option is true. Does nothing otherwise.