]>
Commit | Line | Data |
---|---|---|
32cb05cb JB |
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 | |
3 | @@ -1881,7 +1881,7 @@ | |
4 | ClientData clientData; /* Not used. */ | |
5 | Tcl_Interp *interp; | |
6 | int argc; | |
7 | - char **argv; | |
8 | + CONST84 char **argv; | |
9 | { | |
10 | return NewGraph(interp, argc, argv, TYPE_ELEM_LINE); | |
11 | } | |
12 | @@ -1908,7 +1908,7 @@ | |
13 | ClientData clientData; /* Not used. */ | |
14 | Tcl_Interp *interp; | |
15 | int argc; | |
16 | - char **argv; | |
17 | + CONST84 char **argv; | |
18 | { | |
19 | return NewGraph(interp, argc, argv, TYPE_ELEM_BAR); | |
20 | } | |
21 | @@ -1935,7 +1935,7 @@ | |
22 | ClientData clientData; /* Not used. */ | |
23 | Tcl_Interp *interp; | |
24 | int argc; | |
25 | - char **argv; | |
26 | + CONST84 char **argv; | |
27 | { | |
28 | return NewGraph(interp, argc, argv, TYPE_ELEM_STRIP); | |
29 | } | |
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 | |
32 | @@ -1447,7 +1447,7 @@ | |
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. */ | |
38 | { | |
39 | int *outFdPtr, *errFdPtr; | |
40 | int nProcs; | |
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 | |
43 | @@ -95,7 +95,7 @@ | |
44 | Tcl_CmdProc *proc; /* Not used. */ | |
45 | ClientData cmdClientData; /* Not used. */ | |
46 | int argc; | |
47 | - char **argv; /* Command after parsing, but before | |
48 | + CONST84 char **argv; /* Command after parsing, but before | |
49 | * evaluation */ | |
50 | { | |
51 | static unsigned char traceStack[200]; | |
52 | @@ -241,7 +241,7 @@ | |
53 | ClientData clientData; /* Not used. */ | |
54 | Tcl_Interp *interp; | |
55 | int argc; | |
56 | - char **argv; | |
57 | + CONST84 char **argv; | |
58 | { | |
59 | static Tcl_Trace token; | |
60 | static int level; | |
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 | |
63 | @@ -392,7 +392,7 @@ | |
64 | ClientData clientData; /* Not used. */ | |
65 | Tcl_Interp *interp; /* */ | |
66 | int argc; | |
67 | - char **argv; | |
68 | + CONST84 char **argv; | |
69 | { | |
70 | Tcl_AppendResult(interp, "command \"", argv[0], "\" shouldn't be invoked", | |
71 | (char *)NULL); | |
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 | |
74 | @@ -972,7 +972,7 @@ | |
75 | ClientData clientData; /* Not used. */ | |
76 | Tcl_Interp *interp; | |
77 | int argc; | |
78 | - char **argv; | |
79 | + CONST84 char **argv; | |
80 | { | |
81 | Blt_OpProc opProc; | |
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 | |
85 | @@ -4227,7 +4227,7 @@ | |
86 | ClientData clientData; /* Interpreter-specific data. */ | |
87 | Tcl_Interp *interp; | |
88 | int argc; | |
89 | - char **argv; | |
90 | + CONST84 char **argv; | |
91 | { | |
92 | Blt_OpProc opProc; | |
93 | ||
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 | |
96 | @@ -140,7 +140,7 @@ | |
97 | Tcl_CmdProc *cmdProc; /* Not used. */ | |
98 | ClientData cmdClientData; /* Not used. */ | |
99 | int argc; | |
100 | - char **argv; /* Command after parsing, but before | |
101 | + CONST84 char **argv; /* Command after parsing, but before | |
102 | * evaluation */ | |
103 | { | |
104 | Watch *watchPtr = (Watch *)clientData; | |
105 | @@ -793,7 +793,7 @@ | |
106 | ClientData clientData; /* Not used. */ | |
107 | Tcl_Interp *interp; | |
108 | int argc; | |
109 | - char **argv; | |
110 | + CONST84 char **argv; | |
111 | { | |
112 | Blt_OpProc opProc; | |
113 | int result; | |
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 | |
116 | @@ -51,7 +51,7 @@ | |
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. */ | |
122 | { | |
123 | int percent; | |
124 | ||
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 */ | |
130 | int argc; | |
131 | - char **argv; | |
132 | + CONST84 char **argv; | |
133 | { | |
134 | Tk_Window tkwin; | |
135 | Blt_OpProc opProc; | |
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 */ | |
141 | int argc; | |
142 | - char **argv; | |
143 | + CONST84 char **argv; | |
144 | { | |
145 | Blt_OpProc opProc; | |
146 | int result; | |
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 */ | |
157 | { | |
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. */ | |
166 | { | |
167 | Hierbox *hboxPtr; | |
168 | Tk_Window tkwin; | |
32cb05cb JB |
169 | --- blt2.4u/src/bltHtext.c.orig 2000-05-25 23:40:56.000000000 +0200 |
170 | +++ blt2.4u/src/bltHtext.c 2003-06-17 00:08:30.000000000 +0200 | |
171 | @@ -2222,8 +2222,8 @@ | |
172 | TextVarProc(clientData, interp, name1, name2, flags) | |
173 | ClientData clientData; /* Information about widget. */ | |
174 | Tcl_Interp *interp; /* Interpreter containing variable. */ | |
175 | - char *name1; /* Name of variable. */ | |
176 | - char *name2; /* Second part of variable name. */ | |
177 | + CONST84 char *name1; /* Name of variable. */ | |
178 | + CONST84 char *name2; /* Second part of variable name. */ | |
179 | int flags; /* Information about what happened. */ | |
180 | { | |
181 | HText *textPtr = (HText *)clientData; | |
182 | @@ -4383,7 +4383,7 @@ | |
183 | ClientData clientData; /* Information about hypertext widget. */ | |
184 | Tcl_Interp *interp; /* Current interpreter. */ | |
185 | int argc; /* Number of arguments. */ | |
186 | - char **argv; /* Argument strings. */ | |
187 | + CONST84 char **argv; /* Argument strings. */ | |
188 | { | |
189 | Blt_OpProc opProc; | |
190 | int result; | |
191 | @@ -4422,7 +4422,7 @@ | |
192 | ClientData clientData; /* Main window associated with interpreter. */ | |
193 | Tcl_Interp *interp; /* Current interpreter. */ | |
194 | int argc; /* Number of arguments. */ | |
195 | - char **argv; /* Argument strings. */ | |
196 | + CONST84 char **argv; /* Argument strings. */ | |
197 | { | |
198 | HText *textPtr; | |
199 | Screen *screenPtr; | |
200 | --- blt2.4u/src/bltImage.c.orig 2000-06-23 02:40:06.000000000 +0200 | |
201 | +++ blt2.4u/src/bltImage.c 2003-06-17 00:09:35.000000000 +0200 | |
202 | @@ -359,7 +359,7 @@ | |
203 | dest.offset[2] = Tk_Offset(Pix32, Blue); | |
204 | dest.pixelPtr = (unsigned char *)ColorimageData(image); | |
205 | Tk_PhotoSetSize(photo, width, height); | |
206 | - Tk_PhotoPutBlock(photo, &dest, 0, 0, width, height); | |
207 | + Tk_PhotoPutBlock_NoComposite(photo, &dest, 0, 0, width, height); | |
208 | } | |
209 | ||
210 | /* | |
211 | --- blt2.4u/src/bltTable.c.orig 2000-06-13 02:21:51.000000000 +0200 | |
212 | +++ blt2.4u/src/bltTable.c 2003-06-17 00:10:30.000000000 +0200 | |
213 | @@ -4841,7 +4841,7 @@ | |
214 | ClientData clientData; /* Interpreter-specific data. */ | |
215 | Tcl_Interp *interp; | |
216 | int argc; | |
217 | - char **argv; | |
218 | + CONST84 char **argv; | |
219 | { | |
220 | TableInterpData *dataPtr = (TableInterpData *)clientData; | |
221 | Blt_OpProc opProc; | |
222 | --- blt2.4u/src/bltTabnotebook.c.orig 2000-06-23 02:40:06.000000000 +0200 | |
223 | +++ blt2.4u/src/bltTabnotebook.c 2003-06-17 00:10:59.000000000 +0200 | |
224 | @@ -5635,7 +5635,7 @@ | |
225 | ClientData clientData; /* Main window associated with interpreter. */ | |
226 | Tcl_Interp *interp; /* Current interpreter. */ | |
227 | int argc; /* Number of arguments. */ | |
228 | - char **argv; /* Argument strings. */ | |
229 | + CONST84 char **argv; /* Argument strings. */ | |
230 | { | |
231 | Notebook *nbPtr; | |
232 | Tk_Window tkwin; | |
233 | --- blt2.4u/src/bltTabset.c.orig 2000-06-23 02:40:06.000000000 +0200 | |
234 | +++ blt2.4u/src/bltTabset.c 2003-06-17 00:11:26.000000000 +0200 | |
235 | @@ -5766,7 +5766,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. */ | |
241 | { | |
242 | Tabset *setPtr; | |
243 | Tk_Window tkwin; | |
244 | --- blt2.4u/src/bltWinop.c.orig 2000-06-23 02:40:06.000000000 +0200 | |
245 | +++ blt2.4u/src/bltWinop.c 2003-06-17 00:12:09.000000000 +0200 | |
246 | @@ -682,7 +682,7 @@ | |
247 | dest.offset[0] = src.offset[0]; | |
248 | dest.offset[1] = src.offset[1]; | |
249 | dest.offset[2] = src.offset[2]; | |
250 | - Tk_PhotoPutBlock(destPhoto, &dest, 0, 0, dest.width, dest.height); | |
251 | + Tk_PhotoPutBlock_NoComposite(destPhoto, &dest, 0, 0, dest.width, dest.height); | |
252 | return TCL_OK; | |
253 | } | |
254 | if (filter == NULL) { | |
255 | @@ -841,7 +841,7 @@ | |
256 | ClientData clientData; /* Main window of interpreter. */ | |
257 | Tcl_Interp *interp; /* Current interpreter. */ | |
258 | int argc; /* Number of arguments. */ | |
259 | - char **argv; /* Argument strings. */ | |
260 | + CONST84 char **argv; /* Argument strings. */ | |
261 | { | |
262 | Blt_OpProc opProc; | |
263 | int result; | |
264 | --- blt2.4u/src/tkButton.c.orig 2000-06-23 03:40:48.000000000 +0200 | |
265 | +++ blt2.4u/src/tkButton.c 2003-06-17 00:12:50.000000000 +0200 | |
266 | @@ -632,7 +632,7 @@ | |
267 | * interpreter. */ | |
268 | Tcl_Interp *interp; /* Current interpreter. */ | |
269 | int argc; /* Number of arguments. */ | |
270 | - char **argv; /* Argument strings. */ | |
271 | + CONST84 char **argv; /* Argument strings. */ | |
272 | { | |
273 | return ButtonCreate(clientData, interp, argc, argv, TYPE_BUTTON); | |
274 | } | |
275 | @@ -643,7 +643,7 @@ | |
276 | * interpreter. */ | |
277 | Tcl_Interp *interp; /* Current interpreter. */ | |
278 | int argc; /* Number of arguments. */ | |
279 | - char **argv; /* Argument strings. */ | |
280 | + CONST84 char **argv; /* Argument strings. */ | |
281 | { | |
282 | return ButtonCreate(clientData, interp, argc, argv, TYPE_CHECK_BUTTON); | |
283 | } | |
284 | @@ -654,7 +654,7 @@ | |
285 | * interpreter. */ | |
286 | Tcl_Interp *interp; /* Current interpreter. */ | |
287 | int argc; /* Number of arguments. */ | |
288 | - char **argv; /* Argument strings. */ | |
289 | + CONST84 char **argv; /* Argument strings. */ | |
290 | { | |
291 | return ButtonCreate(clientData, interp, argc, argv, TYPE_LABEL); | |
292 | } | |
293 | @@ -665,7 +665,7 @@ | |
294 | * interpreter. */ | |
295 | Tcl_Interp *interp; /* Current interpreter. */ | |
296 | int argc; /* Number of arguments. */ | |
297 | - char **argv; /* Argument strings. */ | |
298 | + CONST84 char **argv; /* Argument strings. */ | |
299 | { | |
300 | return ButtonCreate(clientData, interp, argc, argv, TYPE_RADIO_BUTTON); | |
301 | } | |
302 | --- blt2.4u/src/tkFrame.c.orig 2000-03-07 21:35:38.000000000 +0100 | |
303 | +++ blt2.4u/src/tkFrame.c 2003-06-17 00:17:01.000000000 +0200 | |
32cb05cb JB |
304 | @@ -274,7 +272,7 @@ |
305 | * interpreter. */ | |
306 | Tcl_Interp *interp; /* Current interpreter. */ | |
307 | int argc; /* Number of arguments. */ | |
308 | - char **argv; /* Argument strings. */ | |
309 | + CONST84 char **argv; /* Argument strings. */ | |
310 | { | |
311 | return TkCreateFrame(clientData, interp, argc, argv, 0, (char *)NULL); | |
312 | } | |
313 | @@ -285,7 +283,7 @@ | |
314 | * interpreter. */ | |
315 | Tcl_Interp *interp; /* Current interpreter. */ | |
316 | int argc; /* Number of arguments. */ | |
317 | - char **argv; /* Argument strings. */ | |
318 | + CONST84 char **argv; /* Argument strings. */ | |
319 | { | |
320 | return TkCreateFrame(clientData, interp, argc, argv, 1, (char *)NULL); | |
321 | } | |
32cb05cb JB |
322 | --- blt2.4u/src/bltTed.c.orig 2000-05-25 23:40:57.000000000 +0200 |
323 | +++ blt2.4u/src/bltTed.c 2003-06-17 00:13:40.000000000 +0200 | |
324 | @@ -1813,7 +1813,7 @@ | |
325 | ClientData clientData; /* Thread-specific data. */ | |
326 | Tcl_Interp *interp; | |
327 | int argc; | |
328 | - char **argv; | |
329 | + CONST84 char **argv; | |
330 | { | |
331 | Blt_OpProc opProc; | |
332 | int result; |