Updated to tk 8.4.1

[pf3gnuchains/sourceware.git] / tk / doc / ConfigWidg.3

diff --git a/tk/doc/ConfigWidg.3 b/tk/doc/ConfigWidg.3
index c558352..dd4be4e 100644 (file)
--- a/tk/doc/ConfigWidg.3
+++ b/tk/doc/ConfigWidg.3
@@ -40,7 +40,7 @@ Pointer to table specifying legal configuration options for this
 widget.
 .AP int argc in
 Number of arguments in \fIargv\fR.
-.AP char **argv in
+.AP "CONST char" **argv in
 Command-line options for configuring widget.
 .AP char *widgRec in/out
 Points to widget record structure.  Fields in this structure get
@@ -55,7 +55,7 @@ selectively disable entries in \fIspecs\fR.
 The name of the type of a widget record.
 .AP "field name" field in
 The name of a field in records of type \fItype\fR.
-.AP char *argvName in
+.AP "CONST char" *argvName in
 The name used on Tcl command lines to refer to a particular option
 (e.g. when creating a widget or invoking the \fBconfigure\fR widget
 command).  If non-NULL, then information is returned only for this
@@ -66,6 +66,12 @@ Display containing widget whose record is being freed;  needed in
 order to free up resources.
 .BE
 .SH DESCRIPTION
+.VS 8.1 
+.PP 
+Note: \fBTk_ConfigureWidget\fP should be replaced with the new
+\fBTcl_Obj\fP based API \fBTk_SetOptions\fP.  The old interface is
+retained for backward compatibility.
+.VE 
 .PP
 \fBTk_ConfigureWidget\fR is called to configure various aspects of a
 widget, such as colors, fonts, border width, etc.
@@ -259,7 +265,7 @@ will never match any arguments.
 \fBTK_CONFIG_FONT\fR
 The value must be an ASCII string identifying a font in a form
 suitable for passing to \fBTk_GetFont\fR.  The value is converted
-to an (\fBXFontStruct *\fR) by calling \fBTk_GetFont\fR and the result
+to a \fBTk_Font\fR by calling \fBTk_GetFont\fR and the result
 is stored in the target.
 If TK_CONFIG_NULL_OK is specified in \fIspecFlags\fR then the value
 may be an empty string, in which case the target will be set to NULL.
@@ -613,8 +619,10 @@ The library implementation of frames
 implementation of buttons (tkButton.c) has a much more complex
 table that uses many of the fancy \fIspecFlags\fR mechanisms.
 
+.SH "SEE ALSO"
+Tk_SetOptions(3)
+
 .SH KEYWORDS
 anchor, bitmap, boolean, border, cap style, color, configuration options,
 cursor, custom, double, font, integer, join style, justify, millimeters,
 pixels, relief, synonym, uid
-