20100325-1824

4 files changed, 10 insertions, 11 deletions

diff --git a/libtk/scale.c b/libtk/scale.c
index cf2a15ac..ca42a106 100644
--- a/libtk/scale.c
+++ b/libtk/scale.c
@@ -482,11 +482,11 @@ tkscalevert(Tk *tk, Image *i)
 	switch(tks->relief) {
 	case TKsunken:
 		tkbevel(i, p, sw, tks->sl, ScaleBW, d, l);
-		tkbevel(i, q, sw, 0, gw, l, d);
+		tkbevel(i, q, gw, 0, 1, l, d);
 		break;
 	case TKraised:
 		tkbevel(i, p, sw, tks->sl, ScaleBW, l, d);
-		tkbevel(i, q, sw, 0, gw, d, l);
+		tkbevel(i, q, gw, 0, 1, d, l);
 		break;
 	}
 	tks->pixpos = p.y;
diff --git a/libtk/utils.c b/libtk/utils.c
index 52b7181d..5e7030d3 100644
--- a/libtk/utils.c
+++ b/libtk/utils.c
@@ -929,7 +929,6 @@ tkulall(Image *i, Point o, Image *col, Font *f, char *text)
 	r.max = addpt(r.max, o);
 	r.min.x = o.x;
 	r.min.y = r.max.y - 1;
-	r.max.y += 1;
 	draw(i, r, col, nil, ZP);	
 }
 
@@ -948,7 +947,7 @@ tkul(Image *i, Point o, Image *col, int ul, Font *f, char *text)
 	*v = c;
 	r.min.x = r.max.x - r.min.x;
 	r.min.y = r.max.y - 1;
-	r.max.y += 2;
+	r.max.y++;
 	draw(i, r, col, nil, ZP);	
 }
 
diff --git a/man/9/checkbutton b/man/9/checkbutton
index dfc71001..32377761 100644
--- a/man/9/checkbutton
+++ b/man/9/checkbutton
@@ -105,12 +105,12 @@ checkbutton.
 .PP
 In addition, checkbuttons can be \fIselected\fR.
 If a checkbutton is selected then the indicator is normally
-drawn with a sunken relief and a special colour, and
+drawn with a sunken relief and a tick (check) mark, and
 a Tk variable associated with the checkbutton is set to the
 .B onvalue
 (normally 1).
-If the checkbutton is not selected, then the indicator is drawn with a
-raised relief and no special colour, and the associated variable is
+If the checkbutton is not selected, then the indicator is drawn as an empty box with
+raised relief, and the associated variable is
 set to the
 .B offvalue
 (normally 0).
diff --git a/man/9/radiobutton b/man/9/radiobutton
index a439e224..4841adc2 100644
--- a/man/9/radiobutton
+++ b/man/9/radiobutton
@@ -85,7 +85,7 @@ text, and initial relief.  The \f5radiobutton\fR command returns its
 there must not exist a window named \fIpathName\fR.
 .PP
 A radiobutton is a widget that displays a textual string, bitmap or image
-and a diamond called an \fIindicator\fR.
+and a circle called an \fIindicator\fR.
 If text is displayed, it must all be in a single font, but it
 can occupy multiple lines on the screen (if it contains newlines) and
 one of the characters may optionally be underlined using the
@@ -99,11 +99,11 @@ check button.
 .PP
 In addition, radiobuttons can be \fIselected\fR.
 If a radiobutton is selected, the indicator is normally
-drawn with a sunken relief and a special colour, and
+drawn as a circle containing a disc (possibly in a special colour), and
 a Tk variable associated with the radiobutton is set to a particular
 value.
-If the radiobutton is not selected, the indicator is drawn with a
-raised relief and no special colour.
+If the radiobutton is not selected, the indicator is drawn as an
+empty circle.
 Typically, several radiobuttons share a single variable and the
 value of the variable indicates which radiobutton is to be selected.
 When a radiobutton is selected it sets the value of the variable to