20100310-1612

7 files changed, 30 insertions, 28 deletions

diff --git a/CHANGES b/CHANGES
index 39956ea4..c0f60384 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+20100310
+	stop tabs(2) from issuing pointless tk cmd that produces diagnostics
 20100305
 	add emu/Linux/audio-oss.c from saoret.one [issue 226]
 20100226
diff --git a/appl/lib/tabs.b b/appl/lib/tabs.b
index d2754320..1453984e 100644
--- a/appl/lib/tabs.b
+++ b/appl/lib/tabs.b
@@ -138,23 +138,23 @@ tabsctl(t: ref Tk->Toplevel,
 		(lab, widg) = tabs[id];
 		tag := "tag" + string id;
 		cmd(t, dot+" lower sel" + string id);
-		pos := cmd(t, dot+" coords " + tag);
-		if(len pos >= 1 && pos[0] != '!'){
-			(p, nil) := parsept(pos);
-			cmd(t, dot+" coords "+tag+" "+string(p.x+1)+
-				" "+string(p.y+1));
-		}
+#		pos := cmd(t, dot+" coords " + tag);
+#		if(len pos >= 1 && pos[0] != '!'){
+#			(p, nil) := parsept(pos);
+#			cmd(t, dot+" coords "+tag+" "+string(p.x+1)+
+#				" "+string(p.y+1));
+#		}
 		if(id > 0)
 			cmd(t, dot+" lower "+ tag + " tag"+string (id - 1));
 		cmd(t, dot+" delete win" + string id);
 	}
 	id = nid;
 	(lab, widg) = tabs[id];
-	pos := tk->cmd(t, dot+" coords tag" + string id);
-	if(len pos >= 1 && pos[0] != '!'){
-		(p, nil) := parsept(pos);
-		cmd(t, dot+" coords tag"+string id+" "+string(p.x-1)+" "+string(p.y-1));
-	}
+#	pos := tk->cmd(t, dot+" coords tag" + string id);
+#	if(len pos >= 1 && pos[0] != '!'){
+#		(p, nil) := parsept(pos);
+#		cmd(t, dot+" coords tag"+string id+" "+string(p.x-1)+" "+string(p.y-1));
+#	}
 	cmd(t, dot+" raise tag"+string id);
 	cmd(t, dot+" raise sel"+string id);
 	cmd(t, dot+" create window "+string TABSBord+" "+
diff --git a/dis/lib/tabs.dis b/dis/lib/tabs.dis
index 333dab58..6fd302eb 100644
--- a/dis/lib/tabs.dis
+++ b/dis/lib/tabs.dis
diff --git a/include/tk.h b/include/tk.h
index bd919b5d..cff4aa54 100644
--- a/include/tk.h
+++ b/include/tk.h
@@ -216,7 +216,7 @@ struct TkVar
 
 struct TkPanelimage
 {
-	void*		image;		/* really Draw_Image */
+	void*		image;		/* Image paired with Draw_Image: see lookupimage in libinterp/draw.c */
 	int			ref;
 	TkPanelimage*	link;
 };
diff --git a/include/version.h b/include/version.h
index 847a6e5b..cb7e2de4 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1 +1 @@
-#define VERSION	"Fourth Edition (20100307)"
+#define VERSION	"Fourth Edition (20100310)"
diff --git a/man/9/bind b/man/9/bind
index 103e61a3..844ebd65 100644
--- a/man/9/bind
+++ b/man/9/bind
@@ -5,7 +5,7 @@ bind \- Arrange for events to invoke Tk scripts
 \f5bind\fI tag sequence script\fR
 .sp
 \f5bind\fI tag sequence \f5+\fIscript\fR
-.SH INTRODUCTION
+.SH DESCRIPTION
 The \f5bind\fR command associates Tk scripts with window events.
 If all three arguments are specified, \f5bind\fR will
 arrange for \fIscript\fR (a Tk script) to be evaluated whenever
@@ -22,7 +22,7 @@ If \fIscript\fR is prefixed with a ``-'', then any existing binding for
 \fIsequence\fR, whose script is exactly the same as \fIscript\fR, is removed.
 The \fItag\fR argument gives the pathname of the window
 to which \fIsequence\fR is bound.
-.SH "EVENT PATTERNS"
+.SS Event Patterns
 The \fIsequence\fR argument specifies a sequence of one or more
 event patterns, with optional white space between the patterns.  Each
 event pattern may
@@ -32,11 +32,11 @@ may not be a space character or the character \f5<\fR.  This form of
 pattern matches a \f5KeyPress\fR event for the particular
 character.  The second form of pattern is longer but more general.
 It has the following syntax:
-.RS
+.IP
 .EX
 \f5<\fIevent\f5-\fIevent\f5-\fR...\f5-\fIevent\f5>\fR
 .EE
-.RE
+.PP
 The following events are accepted:
 .TP
 .BR Key \ or\  Keypress
@@ -98,7 +98,14 @@ The event of the widget getting the keyboard focus.
 .TP
 .B FocusOut
 The event of the widget losing the keyboard focus.
+.TP
+.B Destroy
+The event of the widget being destroyed.
+See
+.IR destroy  (9)
+for details of widget destruction.
 .RE
+.PP
 The event sequence can contain any combination of the above
 events. They are treated independently, and if any of the
 events occur, the sequence matches. You cannot combine
@@ -106,14 +113,7 @@ key presses of more than one key. Events will not be combined
 on delivery, except that
 .B Motion
 events may be combined with button presses (possibly doubled).
-.TP
-.B Destroy
-The event of the widget being destroyed.
-See
-.IR destroy  (9)
-for details of widget destruction.
-
-.SH "BINDING SCRIPTS AND SUBSTITUTIONS"
+.SS Binding Scripts and Substitutions
 The \fIscript\fR argument to \f5bind\fR is a Tk script,
 which will be executed whenever the given event sequence occurs.
 If \fIscript\fR contains
diff --git a/man/9/variable b/man/9/variable
index b1bcc141..9b954f22 100644
--- a/man/9/variable
+++ b/man/9/variable
@@ -20,6 +20,6 @@ The special variable
 holds the text of the last Tk error encountered.
 It resets when queried.
 .SH SEE ALSO
-.IR checkbutton (9)
-.IR choicebutton (9)
-.IR radiobutton (9),
+.IR checkbutton (9),
+.IR choicebutton (9),
+.IR radiobutton (9)