merge trunk

2 files changed, 2 insertions, 13 deletions

diff --git a/doc/bind.n b/doc/bind.n
index de4502e..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.
diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c
index 790f5de..5c5aa9e 100644
--- a/macosx/tkMacOSXButton.c
+++ b/macosx/tkMacOSXButton.c
@@ -610,13 +610,6 @@ DrawButtonImageAndText(
 			width + butPtr->indicatorSpace,
 			height, &x, &y);
         x += butPtr->indicatorSpace;
-	if (dpPtr->relief == TK_RELIEF_SUNKEN) {
-	  x += dpPtr->offset;
-	  y += dpPtr->offset;
-	} else if (dpPtr->relief == TK_RELIEF_RAISED) {
-	  x -= dpPtr->offset;
-	  y -= dpPtr->offset;
-	}
 	if (pressed) {
 	  x += dpPtr->offset;
 	  y += dpPtr->offset;