Merge trunk

7 files changed, 36 insertions, 21 deletions

diff --git a/doc/bind.n b/doc/bind.n
index f3948b8..871e167 100644
--- a/doc/bind.n
+++ b/doc/bind.n
@@ -510,6 +510,9 @@ For \fBButton\fR, \fBButtonRelease\fR, \fBMotion\fR,
 \fBKey\fR, \fBKeyRelease\fR, and \fBMouseWheel\fR events,
 \fB%x\fR and \fB%y\fR indicate the position of the mouse pointer
 relative to the receiving window.
+For key events on the Macintosh these are the coordinates of the
+mouse at the moment when an X11 KeyEvent is sent to Tk, which could
+be slightly later than the time of the physical press or release.
 For \fBEnter\fR and \fBLeave\fR events, the position where the
 mouse pointer crossed the window, relative to the receiving window.
 For \fBConfigure\fR and \fBCreate\fR requests, the \fIx\fR and \fIy\fR
diff --git a/doc/colors.n b/doc/colors.n
index 0d3c162..9234824 100644
--- a/doc/colors.n
+++ b/doc/colors.n
@@ -944,6 +944,7 @@ systemControlAccentColor
 systemControlTextColor
 systemDisabledControlTextColor
 systemLabelColor
+systemLinkColor
 systemSelectedTextBackgroundColor
 systemSelectedTextColor
 systemTextBackgroundColor
diff --git a/doc/entry.n b/doc/entry.n
index 4589af0..9eea51b 100644
--- a/doc/entry.n
+++ b/doc/entry.n
@@ -449,9 +449,10 @@ insertion cursor in the entry without affecting the selection.
 If any normal printing characters are typed in an entry, they are
 inserted at the point of the insertion cursor.
 .IP [7]
-The view in the entry can be adjusted by dragging with mouse button 2.
-If mouse button 2 is clicked without moving the mouse, the selection
-is copied into the entry at the position of the mouse cursor.
+The view in the entry can be adjusted by dragging with the middle
+mouse button (button 2, or button 3 in TkAqua). If the middle mouse
+button is clicked without moving the mouse, the selection is copied
+into the entry at the position of the mouse cursor.
 .IP [8]
 If the mouse is dragged out of the entry on the left or right sides
 while button 1 is pressed, the entry will automatically scroll to
diff --git a/doc/spinbox.n b/doc/spinbox.n
index 6719ca3..39961aa 100644
--- a/doc/spinbox.n
+++ b/doc/spinbox.n
@@ -517,9 +517,10 @@ insertion cursor in the spinbox without affecting the selection.
 If any normal printing characters are typed in a spinbox, they are
 inserted at the point of the insertion cursor.
 .IP [7]
-The view in the spinbox can be adjusted by dragging with mouse button 2.
-If mouse button 2 is clicked without moving the mouse, the selection
-is copied into the spinbox at the position of the mouse cursor.
+The view in the spinbox can be adjusted by dragging with the middle
+mouse button (button 2, or button 3 in TkAqua). If the middle mouse
+button is clicked without moving the mouse, the selection is copied
+into the spinbox at the position of the mouse cursor.
 .IP [8]
 If the mouse is dragged out of the spinbox on the left or right sides
 while button 1 is pressed, the spinbox will automatically scroll to
diff --git a/doc/text.n b/doc/text.n
index 61929e6..8915f71 100644
--- a/doc/text.n
+++ b/doc/text.n
@@ -2027,10 +2027,11 @@ integer. This command used to be used for scrolling, but now it is obsolete.
 .SH BINDINGS
 .PP
 Tk automatically creates class bindings for texts that give them the following
-default behavior. In the descriptions below,
+default behavior.
+In the descriptions below,
 .QW word
-is dependent on the value of the \fBtcl_wordchars\fR variable. See
-\fBtclvars\fR(n).
+is dependent on the value of
+the \fBtcl_wordchars\fR variable.  See \fBtclvars\fR(n).
 .IP [1]
 Clicking mouse button 1 positions the insertion cursor just before the
 character underneath the mouse cursor, sets the input focus to this widget,
@@ -2059,10 +2060,11 @@ insertion cursor without affecting the selection.
 If any normal printing characters are typed, they are inserted at the point of
 the insertion cursor.
 .IP [7]
-The view in the widget can be adjusted by dragging with mouse button 2. If
-mouse button 2 is clicked without moving the mouse, the selection is copied
-into the text at the position of the mouse cursor. The Insert key also inserts
-the selection, but at the position of the insertion cursor.
+The view in the widget can be adjusted by dragging with the middle mouse
+button (button 2, or button 3 in TkAqua). If the middle mouse button is
+clicked without moving the mouse, the selection is copied into the text at the
+position of the mouse cursor. The Insert key also inserts the selection,
+but at the position of the insertion cursor.
 .IP [8]
 If the mouse is dragged out of the widget while button 1 is pressed, the entry
 will automatically scroll to make more text visible (if there is more text
diff --git a/doc/ttk_entry.n b/doc/ttk_entry.n
index cb58005..552700a 100644
--- a/doc/ttk_entry.n
+++ b/doc/ttk_entry.n
@@ -353,9 +353,10 @@ insert cursor in the entry without affecting the selection.
 If any normal printing characters are typed in an entry, they are
 inserted at the point of the insert cursor.
 .IP \0\(bu 4
-The view in the entry can be adjusted by dragging with mouse button 2.
-If mouse button 2 is clicked without moving the mouse, the selection
-is copied into the entry at the position of the mouse cursor.
+The view in the entry can be adjusted by dragging with the middle
+mouse button (button 2, or button 3 in TkAqua). If the middle mouse
+button is clicked without moving the mouse, the selection is copied
+into the entry at the position of the mouse cursor.
 .IP \0\(bu 4
 If the mouse is dragged out of the entry on the left or right sides
 while button 1 is pressed, the entry will automatically scroll to
diff --git a/doc/ttk_treeview.n b/doc/ttk_treeview.n
index bcd995b..a126dd2 100644
--- a/doc/ttk_treeview.n
+++ b/doc/ttk_treeview.n
@@ -344,6 +344,11 @@ Modify or query the widget state; see \fIttk::widget(n)\fR.
 \fIpathName \fBtag \fIargs...\fR
 .RS
 .TP
+\fIpathName \fBtag add \fItag items\fR
+Adds the specified \fItag\fR to each of the listed \fIitems\fR.
+If \fItag\fR is already present for a particular item,
+then the \fB\-tags\fR for that item are unchanged.
+.TP
 \fIpathName \fBtag bind \fItagName \fR?\fIsequence\fR? ?\fIscript\fR?
 Add a Tk binding script for the event sequence \fIsequence\fR
 to the tag \fItagName\fR.  When an X event is delivered to an item,
@@ -372,6 +377,12 @@ With no additional arguments,
 returns a dictionary of the option settings for \fItagName\fR.
 See \fBTAG OPTIONS\fR for the list of available options.
 .TP
+\fIpathName \fBtag delete \fItagName\fR
+Deletes all tag information for the \fItagName\fR argument. The
+command removes the tag from all items in the widget and also deletes any
+other information associated with the tag, such as bindings and display
+information. The command returns an empty string.
+.TP
 \fIpathName \fBtag has \fItagName\fR ?\fIitem\fR?
 If \fIitem\fR is specified, returns 1 or 0
 depending on whether the specified item has the named tag.
@@ -381,11 +392,6 @@ the specified tag.
 \fIpathName \fBtag names\fR
 Returns a list of all tags used by the widget.
 .TP
-\fIpathName \fBtag add \fItag items\fR
-Adds the specified \fItag\fR to each of the listed \fIitems\fR.
-If \fItag\fR is already present for a particular item,
-then the \fB\-tags\fR for that item are unchanged.
-.TP
 \fIpathName \fBtag remove \fItag\fR ?\fIitems\fR?
 Removes the specified \fItag\fR from each of the listed \fIitems\fR.
 If \fIitems\fR is omitted, removes \fItag\fR from each item in the tree.