1 --- blt2.4u/src/bltGraph.c.orig 2000-06-23 02:40:05.000000000 +0200
2 +++ blt2.4u/src/bltGraph.c 2003-06-16 23:55:02.000000000 +0200
4 ClientData clientData; /* Not used. */
10 return NewGraph(interp, argc, argv, TYPE_ELEM_LINE);
13 ClientData clientData; /* Not used. */
17 + CONST84 char **argv;
19 return NewGraph(interp, argc, argv, TYPE_ELEM_BAR);
22 ClientData clientData; /* Not used. */
26 + CONST84 char **argv;
28 return NewGraph(interp, argc, argv, TYPE_ELEM_STRIP);
30 --- blt2.4u/src/bltBgexec.c.orig 2000-06-13 02:25:53.000000000 +0200
31 +++ blt2.4u/src/bltBgexec.c 2003-06-16 23:55:33.000000000 +0200
33 ClientData clientData; /* Thread-specific data. */
34 Tcl_Interp *interp; /* Current interpreter. */
35 int argc; /* Number of arguments. */
36 - char **argv; /* Argument strings. */
37 + CONST84 char **argv; /* Argument strings. */
39 int *outFdPtr, *errFdPtr;
41 --- blt2.4u/src/bltDebug.c.orig 2000-06-13 02:21:51.000000000 +0200
42 +++ blt2.4u/src/bltDebug.c 2003-06-16 23:56:53.000000000 +0200
44 Tcl_CmdProc *proc; /* Not used. */
45 ClientData cmdClientData; /* Not used. */
47 - char **argv; /* Command after parsing, but before
48 + CONST84 char **argv; /* Command after parsing, but before
51 static unsigned char traceStack[200];
53 ClientData clientData; /* Not used. */
57 + CONST84 char **argv;
59 static Tcl_Trace token;
61 --- blt2.4u/src/bltNsUtil.c.orig 2000-06-13 02:21:51.000000000 +0200
62 +++ blt2.4u/src/bltNsUtil.c 2003-06-16 23:57:12.000000000 +0200
64 ClientData clientData; /* Not used. */
65 Tcl_Interp *interp; /* */
68 + CONST84 char **argv;
70 Tcl_AppendResult(interp, "command \"", argv[0], "\" shouldn't be invoked",
72 --- blt2.4u/src/bltSpline.c.orig 2000-06-13 02:21:51.000000000 +0200
73 +++ blt2.4u/src/bltSpline.c 2003-06-16 23:57:32.000000000 +0200
75 ClientData clientData; /* Not used. */
79 + CONST84 char **argv;
82 Blt_Vector *x, *y, *splX, *splY;
83 --- blt2.4u/src/bltVector.c.orig 2000-06-23 02:40:06.000000000 +0200
84 +++ blt2.4u/src/bltVector.c 2003-06-17 00:02:19.000000000 +0200
86 ClientData clientData; /* Interpreter-specific data. */
90 + CONST84 char **argv;
94 --- blt2.4u/src/bltWatch.c.orig 2000-06-13 02:21:52.000000000 +0200
95 +++ blt2.4u/src/bltWatch.c 2003-06-17 00:02:54.000000000 +0200
97 Tcl_CmdProc *cmdProc; /* Not used. */
98 ClientData cmdClientData; /* Not used. */
100 - char **argv; /* Command after parsing, but before
101 + CONST84 char **argv; /* Command after parsing, but before
104 Watch *watchPtr = (Watch *)clientData;
106 ClientData clientData; /* Not used. */
110 + CONST84 char **argv;
114 --- blt2.4u/src/bltBeep.c.orig 1999-10-08 08:40:46.000000000 +0200
115 +++ blt2.4u/src/bltBeep.c 2003-06-17 00:03:13.000000000 +0200
117 ClientData clientData; /* Main window associated with interpreter.*/
118 Tcl_Interp *interp; /* Current interpreter. */
119 int argc; /* Number of arguments. */
120 - char **argv; /* Argument strings. */
121 + CONST84 char **argv; /* Argument strings. */
125 --- blt2.4u/src/bltBitmap.c.orig 2000-05-05 06:49:37.000000000 +0200
126 +++ blt2.4u/src/bltBitmap.c 2003-06-17 00:03:31.000000000 +0200
127 @@ -1338,7 +1338,7 @@
128 ClientData clientData; /* Not used. */
129 Tcl_Interp *interp; /* Interpreter to report results to */
132 + CONST84 char **argv;
136 --- blt2.4u/src/bltBusy.c.orig 2000-05-25 23:40:56.000000000 +0200
137 +++ blt2.4u/src/bltBusy.c 2003-06-17 00:03:49.000000000 +0200
138 @@ -1137,7 +1137,7 @@
139 ClientData clientData; /* Interpreter-specific data. */
140 Tcl_Interp *interp; /* Interpreter associated with command */
143 + CONST84 char **argv;
147 --- blt2.4u/src/bltConfig.c.orig 2000-06-23 02:40:05.000000000 +0200
148 +++ blt2.4u/src/bltConfig.c 2003-06-17 00:05:32.000000000 +0200
149 @@ -1301,7 +1301,7 @@
150 ClientData clientData; /* Vectors of valid strings. */
151 Tcl_Interp *interp; /* Interpreter to send results back to */
152 Tk_Window tkwin; /* Not used. */
153 - char *string; /* String to match. */
154 + CONST84 char *string; /* String to match. */
155 char *widgRec; /* Widget record. */
156 int offset; /* Offset of field in record */
158 --- blt2.4u/src/bltHierbox.c.orig 2000-06-23 02:40:05.000000000 +0200
159 +++ blt2.4u/src/bltHierbox.c 2003-06-17 00:06:08.000000000 +0200
160 @@ -5166,7 +5166,7 @@
161 ClientData clientData; /* Main window associated with interpreter. */
162 Tcl_Interp *interp; /* Current interpreter. */
163 int argc; /* Number of arguments. */
164 - char **argv; /* Argument strings. */
165 + CONST84 char **argv; /* Argument strings. */
169 --- blt2.4u/src/bltHiertable.c.orig 2000-06-23 02:40:05.000000000 +0200
170 +++ blt2.4u/src/bltHiertable.c 2003-06-17 00:06:37.000000000 +0200
171 @@ -4865,7 +4865,7 @@
172 ClientData clientData; /* Main window associated with interpreter. */
173 Tcl_Interp *interp; /* Current interpreter. */
174 int argc; /* Number of arguments. */
175 - char **argv; /* Argument strings. */
176 + CONST84 char **argv; /* Argument strings. */
180 --- blt2.4u/src/bltHtext.c.orig 2000-05-25 23:40:56.000000000 +0200
181 +++ blt2.4u/src/bltHtext.c 2003-06-17 00:08:30.000000000 +0200
182 @@ -2222,8 +2222,8 @@
183 TextVarProc(clientData, interp, name1, name2, flags)
184 ClientData clientData; /* Information about widget. */
185 Tcl_Interp *interp; /* Interpreter containing variable. */
186 - char *name1; /* Name of variable. */
187 - char *name2; /* Second part of variable name. */
188 + CONST84 char *name1; /* Name of variable. */
189 + CONST84 char *name2; /* Second part of variable name. */
190 int flags; /* Information about what happened. */
192 HText *textPtr = (HText *)clientData;
193 @@ -4383,7 +4383,7 @@
194 ClientData clientData; /* Information about hypertext widget. */
195 Tcl_Interp *interp; /* Current interpreter. */
196 int argc; /* Number of arguments. */
197 - char **argv; /* Argument strings. */
198 + CONST84 char **argv; /* Argument strings. */
202 @@ -4422,7 +4422,7 @@
203 ClientData clientData; /* Main window associated with interpreter. */
204 Tcl_Interp *interp; /* Current interpreter. */
205 int argc; /* Number of arguments. */
206 - char **argv; /* Argument strings. */
207 + CONST84 char **argv; /* Argument strings. */
211 --- blt2.4u/src/bltImage.c.orig 2000-06-23 02:40:06.000000000 +0200
212 +++ blt2.4u/src/bltImage.c 2003-06-17 00:09:35.000000000 +0200
214 dest.offset[2] = Tk_Offset(Pix32, Blue);
215 dest.pixelPtr = (unsigned char *)ColorimageData(image);
216 Tk_PhotoSetSize(photo, width, height);
217 - Tk_PhotoPutBlock(photo, &dest, 0, 0, width, height);
218 + Tk_PhotoPutBlock_NoComposite(photo, &dest, 0, 0, width, height);
222 --- blt2.4u/src/bltTable.c.orig 2000-06-13 02:21:51.000000000 +0200
223 +++ blt2.4u/src/bltTable.c 2003-06-17 00:10:30.000000000 +0200
224 @@ -4841,7 +4841,7 @@
225 ClientData clientData; /* Interpreter-specific data. */
229 + CONST84 char **argv;
231 TableInterpData *dataPtr = (TableInterpData *)clientData;
233 --- blt2.4u/src/bltTabnotebook.c.orig 2000-06-23 02:40:06.000000000 +0200
234 +++ blt2.4u/src/bltTabnotebook.c 2003-06-17 00:10:59.000000000 +0200
235 @@ -5635,7 +5635,7 @@
236 ClientData clientData; /* Main window associated with interpreter. */
237 Tcl_Interp *interp; /* Current interpreter. */
238 int argc; /* Number of arguments. */
239 - char **argv; /* Argument strings. */
240 + CONST84 char **argv; /* Argument strings. */
244 --- blt2.4u/src/bltTabset.c.orig 2000-06-23 02:40:06.000000000 +0200
245 +++ blt2.4u/src/bltTabset.c 2003-06-17 00:11:26.000000000 +0200
246 @@ -5766,7 +5766,7 @@
247 ClientData clientData; /* Main window associated with interpreter. */
248 Tcl_Interp *interp; /* Current interpreter. */
249 int argc; /* Number of arguments. */
250 - char **argv; /* Argument strings. */
251 + CONST84 char **argv; /* Argument strings. */
255 --- blt2.4u/src/bltWinop.c.orig 2000-06-23 02:40:06.000000000 +0200
256 +++ blt2.4u/src/bltWinop.c 2003-06-17 00:12:09.000000000 +0200
258 dest.offset[0] = src.offset[0];
259 dest.offset[1] = src.offset[1];
260 dest.offset[2] = src.offset[2];
261 - Tk_PhotoPutBlock(destPhoto, &dest, 0, 0, dest.width, dest.height);
262 + Tk_PhotoPutBlock_NoComposite(destPhoto, &dest, 0, 0, dest.width, dest.height);
265 if (filter == NULL) {
267 ClientData clientData; /* Main window of interpreter. */
268 Tcl_Interp *interp; /* Current interpreter. */
269 int argc; /* Number of arguments. */
270 - char **argv; /* Argument strings. */
271 + CONST84 char **argv; /* Argument strings. */
275 --- blt2.4u/src/tkButton.c.orig 2000-06-23 03:40:48.000000000 +0200
276 +++ blt2.4u/src/tkButton.c 2003-06-17 00:12:50.000000000 +0200
279 Tcl_Interp *interp; /* Current interpreter. */
280 int argc; /* Number of arguments. */
281 - char **argv; /* Argument strings. */
282 + CONST84 char **argv; /* Argument strings. */
284 return ButtonCreate(clientData, interp, argc, argv, TYPE_BUTTON);
288 Tcl_Interp *interp; /* Current interpreter. */
289 int argc; /* Number of arguments. */
290 - char **argv; /* Argument strings. */
291 + CONST84 char **argv; /* Argument strings. */
293 return ButtonCreate(clientData, interp, argc, argv, TYPE_CHECK_BUTTON);
297 Tcl_Interp *interp; /* Current interpreter. */
298 int argc; /* Number of arguments. */
299 - char **argv; /* Argument strings. */
300 + CONST84 char **argv; /* Argument strings. */
302 return ButtonCreate(clientData, interp, argc, argv, TYPE_LABEL);
306 Tcl_Interp *interp; /* Current interpreter. */
307 int argc; /* Number of arguments. */
308 - char **argv; /* Argument strings. */
309 + CONST84 char **argv; /* Argument strings. */
311 return ButtonCreate(clientData, interp, argc, argv, TYPE_RADIO_BUTTON);
313 --- blt2.4u/src/tkFrame.c.orig 2000-03-07 21:35:38.000000000 +0100
314 +++ blt2.4u/src/tkFrame.c 2003-06-17 00:17:01.000000000 +0200
317 EXTERN Tk_Window TkCreateMainWindow _ANSI_ARGS_((Tcl_Interp * interp,
318 char * screenName, char * baseName));
319 -EXTERN void TkSetClassProcs _ANSI_ARGS_((Tk_Window tkwin, void *procs,
320 - ClientData instanceData));
321 EXTERN void TkpSetMainMenubar _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin,
323 EXTERN int TkpUseWindow _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin,
326 Tcl_Interp *interp; /* Current interpreter. */
327 int argc; /* Number of arguments. */
328 - char **argv; /* Argument strings. */
329 + CONST84 char **argv; /* Argument strings. */
331 return TkCreateFrame(clientData, interp, argc, argv, 0, (char *)NULL);
335 Tcl_Interp *interp; /* Current interpreter. */
336 int argc; /* Number of arguments. */
337 - char **argv; /* Argument strings. */
338 + CONST84 char **argv; /* Argument strings. */
340 return TkCreateFrame(clientData, interp, argc, argv, 1, (char *)NULL);
344 * Store backreference to frame widget in window structure.
346 - TkSetClassProcs(new, NULL, (ClientData)framePtr);
347 + Tk_SetClassProcs(new, NULL, (ClientData)framePtr);
350 mask = ExposureMask | StructureNotifyMask | FocusChangeMask;
351 --- blt2.4u/src/bltTed.c.orig 2000-05-25 23:40:57.000000000 +0200
352 +++ blt2.4u/src/bltTed.c 2003-06-17 00:13:40.000000000 +0200
353 @@ -1813,7 +1813,7 @@
354 ClientData clientData; /* Thread-specific data. */
358 + CONST84 char **argv;