merge trunkpspjuth_canvas

1 files changed, 23 insertions, 26 deletions

diff --git a/doc/SetOptions.3 b/doc/SetOptions.3
index 20098cc..1851f1f 100644
--- a/doc/SetOptions.3
+++ b/doc/SetOptions.3
@@ -4,8 +4,6 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: SetOptions.3,v 1.18 2008/06/30 22:57:02 dkf Exp $
-'\" 
 .so man.macros
 .TH Tk_SetOptions 3 8.1 Tk "Tk Library Procedures"
 .BS
@@ -261,7 +259,7 @@ typedef struct {
     int \fIobjOffset\fR;
     int \fIinternalOffset\fR;
     int \fIflags\fR;
-    ClientData \fIclientData\fR;
+    const void *\fIclientData\fR;
     int \fItypeMask\fR;
 } \fBTk_OptionSpec\fR;
 .CE
@@ -440,10 +438,9 @@ from \fBTcl_GetStringFromObj\fR.
 \fBTK_OPTION_SYNONYM\fR
 This type is used to provide alternative names for an option (for
 example, \fB\-bg\fR is often used as a synonym for \fB\-background\fR).
-The \fBclientData\fR field is a (char *) pointer that gives
-the name of another option in the same table.  Whenever the
-synonym option is used, the information from the other option
-will be used instead.
+The \fBclientData\fR field is a string that gives the name of another
+option in the same table.  Whenever the synonym option is used, the
+information from the other option will be used instead.
 .TP
 \fBTK_OPTION_WINDOW\fR
 The value must be a window path name.  The internal form is a
@@ -521,31 +518,31 @@ typedef struct Tk_ObjCustomOption {
 } \fBTk_ObjCustomOption\fR;
 
 typedef int \fBTk_CustomOptionSetProc\fR(
-        ClientData \fIclientData\fR,
-        Tcl_Interp *\fIinterp\fR,
-        Tk_Window \fItkwin\fR,
-        Tcl_Obj **\fIvaluePtr\fR,
-        char *\fIrecordPtr\fR,
-        int \fIinternalOffset\fR,
-        char *\fIsaveInternalPtr\fR,
-        int \fIflags\fR);
+    ClientData \fIclientData\fR,
+    Tcl_Interp *\fIinterp\fR,
+    Tk_Window \fItkwin\fR,
+    Tcl_Obj **\fIvaluePtr\fR,
+    char *\fIrecordPtr\fR,
+    int \fIinternalOffset\fR,
+    char *\fIsaveInternalPtr\fR,
+    int \fIflags\fR);
 
 typedef Tcl_Obj *\fBTk_CustomOptionGetProc\fR(
-        ClientData \fIclientData\fR,
-        Tk_Window \fItkwin\fR,
-        char *\fIrecordPtr\fR,
-        int \fIinternalOffset\fR);
+    ClientData \fIclientData\fR,
+    Tk_Window \fItkwin\fR,
+    char *\fIrecordPtr\fR,
+    int \fIinternalOffset\fR);
 
 typedef void \fBTk_CustomOptionRestoreProc\fR(
-        ClientData \fIclientData\fR,
-        Tk_Window \fItkwin\fR,
-        char *\fIinternalPtr\fR,
-        char *\fIsaveInternalPtr\fR);
+    ClientData \fIclientData\fR,
+    Tk_Window \fItkwin\fR,
+    char *\fIinternalPtr\fR,
+    char *\fIsaveInternalPtr\fR);
 
 typedef void \fBTk_CustomOptionFreeProc\fR(
-        ClientData \fIclientData\fR,
-        Tk_Window \fItkwin\fR,
-        char *\fIinternalPtr\fR);
+    ClientData \fIclientData\fR,
+    Tk_Window \fItkwin\fR,
+    char *\fIinternalPtr\fR);
 .CE
 .PP
 The Tk_ObjCustomOption structure contains six fields: a name