Merge trunk.

Tweak bindings in cscroll demo. 
Remove comment in text.tcl which is no longer necessary

1 files changed, 0 insertions, 11 deletions

diff --git a/library/text.tcl b/library/text.tcl
index f25f639..00806f7 100644
--- a/library/text.tcl
+++ b/library/text.tcl
@@ -441,17 +441,6 @@ bind Text <B2-Motion> {
 }
 set ::tk::Priv(prevPos) {}
 
-# The MouseWheel will typically only fire on Windows and MacOS X.
-# However, someone could use the "event generate" command to produce one
-# on other platforms.  We must be careful not to round -ve values of %D
-# down to zero.
-
-# We must make sure that positive and negative movements are rounded
-# equally to integers, avoiding the problem that
-#     (int)1/3 = 0,
-# but
-#     (int)-1/3 = -1
-# The following code ensure equal +/- behaviour.
 bind Text <MouseWheel> {
     tk::MouseWheel y %D -3.0 pixels
 }