1 diff -Nur cdk-4.9.10-20020727.orig/include/alphalist.h cdk-4.9.10-20020727/include/alphalist.h
2 --- cdk-4.9.10-20020727.orig/include/alphalist.h Sun Jul 14 23:49:37 2002
3 +++ cdk-4.9.10-20020727/include/alphalist.h Fri Mar 28 14:40:43 2003
12 -#include <cdkscreen.h>
13 -#include <cdk_objs.h>
14 +#include <cdk/binding.h>
15 +#include <cdk/cdkscreen.h>
16 +#include <cdk/cdk_objs.h>
26 +#include <cdk/entry.h>
27 +#include <cdk/scroll.h>
30 * Define the CDK alphalist widget structure.
31 diff -Nur cdk-4.9.10-20020727.orig/include/binding.h cdk-4.9.10-20020727/include/binding.h
32 --- cdk-4.9.10-20020727.orig/include/binding.h Tue Apr 30 23:43:10 2002
33 +++ cdk-4.9.10-20020727/include/binding.h Fri Mar 28 14:40:48 2003
43 diff -Nur cdk-4.9.10-20020727.orig/include/button.h cdk-4.9.10-20020727/include/button.h
44 --- cdk-4.9.10-20020727.orig/include/button.h Thu Jul 11 00:19:03 2002
45 +++ cdk-4.9.10-20020727/include/button.h Fri Mar 28 14:41:54 2003
58 -#include <cdkscreen.h>
59 -#include <cdk_objs.h>
60 +#include <cdk/binding.h>
61 +#include <cdk/cdkscreen.h>
62 +#include <cdk/cdk_objs.h>
66 diff -Nur cdk-4.9.10-20020727.orig/include/buttonbox.h cdk-4.9.10-20020727/include/buttonbox.h
67 --- cdk-4.9.10-20020727.orig/include/buttonbox.h Tue Jul 16 02:54:51 2002
68 +++ cdk-4.9.10-20020727/include/buttonbox.h Fri Mar 28 14:42:05 2003
77 -#include <cdkscreen.h>
78 -#include <cdk_objs.h>
79 +#include <cdk/binding.h>
80 +#include <cdk/cdkscreen.h>
81 +#include <cdk/cdk_objs.h>
85 diff -Nur cdk-4.9.10-20020727.orig/include/calendar.h cdk-4.9.10-20020727/include/calendar.h
86 --- cdk-4.9.10-20020727.orig/include/calendar.h Sun Jul 14 23:49:37 2002
87 +++ cdk-4.9.10-20020727/include/calendar.h Fri Mar 28 14:42:15 2003
96 -#include <cdkscreen.h>
97 -#include <cdk_objs.h>
98 +#include <cdk/binding.h>
99 +#include <cdk/cdkscreen.h>
100 +#include <cdk/cdk_objs.h>
104 diff -Nur cdk-4.9.10-20020727.orig/include/cdk.h cdk-4.9.10-20020727/include/cdk.h
105 --- cdk-4.9.10-20020727.orig/include/cdk.h Sat Jul 20 02:20:56 2002
106 +++ cdk-4.9.10-20020727/include/cdk.h Fri Mar 28 14:42:59 2003
111 -#include <cdk_config.h>
112 -#include <cdk_version.h>
113 +#include <cdk/cdk_config.h>
114 +#include <cdk/cdk_version.h>
118 @@ -283,45 +283,45 @@
120 * These header files define miscellaneous values and prototypes.
122 -#include <cdkscreen.h>
123 -#include <curdefs.h>
124 -#include <binding.h>
125 -#include <cdk_util.h>
126 -#include <cdk_objs.h>
127 +#include <cdk/cdkscreen.h>
128 +#include <cdk/curdefs.h>
129 +#include <cdk/binding.h>
130 +#include <cdk/cdk_util.h>
131 +#include <cdk/cdk_objs.h>
134 * Include the CDK widget header files.
136 -#include <alphalist.h>
137 -#include <buttonbox.h>
138 -#include <calendar.h>
142 -#include <fselect.h>
144 -#include <histogram.h>
145 -#include <itemlist.h>
147 -#include <marquee.h>
154 -#include <selection.h>
156 -#include <swindow.h>
157 -#include <template.h>
159 -#include <traverse.h>
161 +#include <cdk/alphalist.h>
162 +#include <cdk/buttonbox.h>
163 +#include <cdk/calendar.h>
164 +#include <cdk/dialog.h>
165 +#include <cdk/entry.h>
166 +#include <cdk/fscale.h>
167 +#include <cdk/fselect.h>
168 +#include <cdk/graph.h>
169 +#include <cdk/histogram.h>
170 +#include <cdk/itemlist.h>
171 +#include <cdk/label.h>
172 +#include <cdk/marquee.h>
173 +#include <cdk/matrix.h>
174 +#include <cdk/mentry.h>
175 +#include <cdk/menu.h>
176 +#include <cdk/radio.h>
177 +#include <cdk/scale.h>
178 +#include <cdk/scroll.h>
179 +#include <cdk/selection.h>
180 +#include <cdk/slider.h>
181 +#include <cdk/swindow.h>
182 +#include <cdk/template.h>
183 +#include <cdk/viewer.h>
184 +#include <cdk/traverse.h>
185 +#include <cdk/button.h>
188 * Low-level object drawing
191 +#include <cdk/draw.h>
195 diff -Nur cdk-4.9.10-20020727.orig/include/cdk_objs.h cdk-4.9.10-20020727/include/cdk_objs.h
196 --- cdk-4.9.10-20020727.orig/include/cdk_objs.h Sat Jul 27 01:33:16 2002
197 +++ cdk-4.9.10-20020727/include/cdk_objs.h Fri Mar 28 14:43:11 2003
203 +#include <cdk/cdk.h>
205 -#include <binding.h>
206 -#include <cdkscreen.h>
207 +#include <cdk/binding.h>
208 +#include <cdk/cdkscreen.h>
212 diff -Nur cdk-4.9.10-20020727.orig/include/cdk_util.h cdk-4.9.10-20020727/include/cdk_util.h
213 --- cdk-4.9.10-20020727.orig/include/cdk_util.h Mon Jul 15 00:09:15 2002
214 +++ cdk-4.9.10-20020727/include/cdk_util.h Fri Mar 28 14:43:20 2003
220 +#include <cdk/cdk.h>
222 -#include <binding.h>
223 -#include <cdkscreen.h>
224 +#include <cdk/binding.h>
225 +#include <cdk/cdkscreen.h>
229 diff -Nur cdk-4.9.10-20020727.orig/include/cdkscreen.h cdk-4.9.10-20020727/include/cdkscreen.h
230 --- cdk-4.9.10-20020727.orig/include/cdkscreen.h Wed Jul 17 23:06:24 2002
231 +++ cdk-4.9.10-20020727/include/cdkscreen.h Fri Mar 28 14:43:27 2003
237 +#include <cdk/cdk.h>
241 diff -Nur cdk-4.9.10-20020727.orig/include/curdefs.h cdk-4.9.10-20020727/include/curdefs.h
242 --- cdk-4.9.10-20020727.orig/include/curdefs.h Wed May 1 00:04:15 2002
243 +++ cdk-4.9.10-20020727/include/curdefs.h Fri Mar 28 14:43:38 2003
249 +#include <cdk/cdk.h>
253 diff -Nur cdk-4.9.10-20020727.orig/include/dialog.h cdk-4.9.10-20020727/include/dialog.h
254 --- cdk-4.9.10-20020727.orig/include/dialog.h Sun Jul 14 23:49:37 2002
255 +++ cdk-4.9.10-20020727/include/dialog.h Fri Mar 28 14:43:47 2003
261 +#include <cdk/cdk.h>
263 -#include <binding.h>
264 -#include <cdkscreen.h>
265 -#include <cdk_objs.h>
266 +#include <cdk/binding.h>
267 +#include <cdk/cdkscreen.h>
268 +#include <cdk/cdk_objs.h>
272 diff -Nur cdk-4.9.10-20020727.orig/include/draw.h cdk-4.9.10-20020727/include/draw.h
273 --- cdk-4.9.10-20020727.orig/include/draw.h Wed Jul 17 12:04:54 2002
274 +++ cdk-4.9.10-20020727/include/draw.h Fri Mar 28 14:43:54 2003
280 +#include <cdk/cdk.h>
282 -#include <binding.h>
283 -#include <cdkscreen.h>
284 -#include <cdk_objs.h>
285 +#include <cdk/binding.h>
286 +#include <cdk/cdkscreen.h>
287 +#include <cdk/cdk_objs.h>
291 diff -Nur cdk-4.9.10-20020727.orig/include/entry.h cdk-4.9.10-20020727/include/entry.h
292 --- cdk-4.9.10-20020727.orig/include/entry.h Sat Jul 27 18:34:02 2002
293 +++ cdk-4.9.10-20020727/include/entry.h Fri Mar 28 14:44:05 2003
299 +#include <cdk/cdk.h>
301 -#include <binding.h>
302 -#include <cdkscreen.h>
303 -#include <cdk_objs.h>
304 +#include <cdk/binding.h>
305 +#include <cdk/cdkscreen.h>
306 +#include <cdk/cdk_objs.h>
310 diff -Nur cdk-4.9.10-20020727.orig/include/fscale.h cdk-4.9.10-20020727/include/fscale.h
311 --- cdk-4.9.10-20020727.orig/include/fscale.h Sun Jul 14 23:49:37 2002
312 +++ cdk-4.9.10-20020727/include/fscale.h Fri Mar 28 14:44:13 2003
318 +#include <cdk/cdk.h>
320 -#include <binding.h>
321 -#include <cdkscreen.h>
322 -#include <cdk_objs.h>
323 +#include <cdk/binding.h>
324 +#include <cdk/cdkscreen.h>
325 +#include <cdk/cdk_objs.h>
329 diff -Nur cdk-4.9.10-20020727.orig/include/fselect.h cdk-4.9.10-20020727/include/fselect.h
330 --- cdk-4.9.10-20020727.orig/include/fselect.h Sun Jul 14 23:49:37 2002
331 +++ cdk-4.9.10-20020727/include/fselect.h Fri Mar 28 14:44:22 2003
337 +#include <cdk/cdk.h>
339 -#include <binding.h>
340 -#include <cdkscreen.h>
341 -#include <cdk_objs.h>
344 +#include <cdk/binding.h>
345 +#include <cdk/cdkscreen.h>
346 +#include <cdk/cdk_objs.h>
347 +#include <cdk/entry.h>
348 +#include <cdk/scroll.h>
352 diff -Nur cdk-4.9.10-20020727.orig/include/graph.h cdk-4.9.10-20020727/include/graph.h
353 --- cdk-4.9.10-20020727.orig/include/graph.h Sun Jul 14 23:49:37 2002
354 +++ cdk-4.9.10-20020727/include/graph.h Fri Mar 28 14:44:31 2003
360 +#include <cdk/cdk.h>
362 -#include <binding.h>
363 -#include <cdkscreen.h>
364 -#include <cdk_objs.h>
365 +#include <cdk/binding.h>
366 +#include <cdk/cdkscreen.h>
367 +#include <cdk/cdk_objs.h>
371 diff -Nur cdk-4.9.10-20020727.orig/include/histogram.h cdk-4.9.10-20020727/include/histogram.h
372 --- cdk-4.9.10-20020727.orig/include/histogram.h Sun Jul 14 23:49:37 2002
373 +++ cdk-4.9.10-20020727/include/histogram.h Fri Mar 28 14:44:41 2003
379 +#include <cdk/cdk.h>
381 -#include <binding.h>
382 -#include <cdkscreen.h>
383 -#include <cdk_objs.h>
384 +#include <cdk/binding.h>
385 +#include <cdk/cdkscreen.h>
386 +#include <cdk/cdk_objs.h>
390 diff -Nur cdk-4.9.10-20020727.orig/include/itemlist.h cdk-4.9.10-20020727/include/itemlist.h
391 --- cdk-4.9.10-20020727.orig/include/itemlist.h Sun Jul 14 23:49:37 2002
392 +++ cdk-4.9.10-20020727/include/itemlist.h Fri Mar 28 14:44:49 2003
398 +#include <cdk/cdk.h>
400 -#include <binding.h>
401 -#include <cdkscreen.h>
402 -#include <cdk_objs.h>
403 +#include <cdk/binding.h>
404 +#include <cdk/cdkscreen.h>
405 +#include <cdk/cdk_objs.h>
409 diff -Nur cdk-4.9.10-20020727.orig/include/label.h cdk-4.9.10-20020727/include/label.h
410 --- cdk-4.9.10-20020727.orig/include/label.h Sun Jul 14 23:49:37 2002
411 +++ cdk-4.9.10-20020727/include/label.h Fri Mar 28 14:44:58 2003
417 +#include <cdk/cdk.h>
419 -#include <binding.h>
420 -#include <cdkscreen.h>
421 -#include <cdk_objs.h>
422 +#include <cdk/binding.h>
423 +#include <cdk/cdkscreen.h>
424 +#include <cdk/cdk_objs.h>
428 diff -Nur cdk-4.9.10-20020727.orig/include/marquee.h cdk-4.9.10-20020727/include/marquee.h
429 --- cdk-4.9.10-20020727.orig/include/marquee.h Sun Jul 14 23:49:37 2002
430 +++ cdk-4.9.10-20020727/include/marquee.h Fri Mar 28 14:45:06 2003
436 +#include <cdk/cdk.h>
438 -#include <binding.h>
439 -#include <cdkscreen.h>
440 -#include <cdk_objs.h>
441 +#include <cdk/binding.h>
442 +#include <cdk/cdkscreen.h>
443 +#include <cdk/cdk_objs.h>
447 diff -Nur cdk-4.9.10-20020727.orig/include/matrix.h cdk-4.9.10-20020727/include/matrix.h
448 --- cdk-4.9.10-20020727.orig/include/matrix.h Sat Jul 27 18:36:19 2002
449 +++ cdk-4.9.10-20020727/include/matrix.h Fri Mar 28 14:45:14 2003
455 +#include <cdk/cdk.h>
457 -#include <binding.h>
458 -#include <cdkscreen.h>
459 -#include <cdk_objs.h>
460 +#include <cdk/binding.h>
461 +#include <cdk/cdkscreen.h>
462 +#include <cdk/cdk_objs.h>
466 diff -Nur cdk-4.9.10-20020727.orig/include/mentry.h cdk-4.9.10-20020727/include/mentry.h
467 --- cdk-4.9.10-20020727.orig/include/mentry.h Sat Jul 27 18:37:27 2002
468 +++ cdk-4.9.10-20020727/include/mentry.h Fri Mar 28 14:45:22 2003
474 +#include <cdk/cdk.h>
476 -#include <binding.h>
477 -#include <cdkscreen.h>
478 -#include <cdk_objs.h>
479 +#include <cdk/binding.h>
480 +#include <cdk/cdkscreen.h>
481 +#include <cdk/cdk_objs.h>
485 diff -Nur cdk-4.9.10-20020727.orig/include/menu.h cdk-4.9.10-20020727/include/menu.h
486 --- cdk-4.9.10-20020727.orig/include/menu.h Sun Jul 14 23:49:37 2002
487 +++ cdk-4.9.10-20020727/include/menu.h Fri Mar 28 14:45:31 2003
493 +#include <cdk/cdk.h>
495 -#include <binding.h>
496 -#include <cdkscreen.h>
497 -#include <cdk_objs.h>
498 +#include <cdk/binding.h>
499 +#include <cdk/cdkscreen.h>
500 +#include <cdk/cdk_objs.h>
504 diff -Nur cdk-4.9.10-20020727.orig/include/radio.h cdk-4.9.10-20020727/include/radio.h
505 --- cdk-4.9.10-20020727.orig/include/radio.h Sun Jul 14 23:49:37 2002
506 +++ cdk-4.9.10-20020727/include/radio.h Fri Mar 28 14:45:45 2003
512 +#include <cdk/cdk.h>
514 -#include <binding.h>
515 -#include <cdkscreen.h>
516 -#include <cdk_objs.h>
517 +#include <cdk/binding.h>
518 +#include <cdk/cdkscreen.h>
519 +#include <cdk/cdk_objs.h>
523 diff -Nur cdk-4.9.10-20020727.orig/include/scale.h cdk-4.9.10-20020727/include/scale.h
524 --- cdk-4.9.10-20020727.orig/include/scale.h Sun Jul 14 23:49:37 2002
525 +++ cdk-4.9.10-20020727/include/scale.h Fri Mar 28 14:45:57 2003
531 +#include <cdk/cdk.h>
533 -#include <binding.h>
534 -#include <cdkscreen.h>
535 -#include <cdk_objs.h>
536 +#include <cdk/binding.h>
537 +#include <cdk/cdkscreen.h>
538 +#include <cdk/cdk_objs.h>
542 diff -Nur cdk-4.9.10-20020727.orig/include/scroll.h cdk-4.9.10-20020727/include/scroll.h
543 --- cdk-4.9.10-20020727.orig/include/scroll.h Sun Jul 14 23:49:37 2002
544 +++ cdk-4.9.10-20020727/include/scroll.h Fri Mar 28 14:46:07 2003
550 +#include <cdk/cdk.h>
552 -#include <binding.h>
553 -#include <cdkscreen.h>
554 -#include <cdk_objs.h>
555 +#include <cdk/binding.h>
556 +#include <cdk/cdkscreen.h>
557 +#include <cdk/cdk_objs.h>
561 diff -Nur cdk-4.9.10-20020727.orig/include/selection.h cdk-4.9.10-20020727/include/selection.h
562 --- cdk-4.9.10-20020727.orig/include/selection.h Sun Jul 14 23:49:37 2002
563 +++ cdk-4.9.10-20020727/include/selection.h Fri Mar 28 14:46:17 2003
569 +#include <cdk/cdk.h>
571 -#include <binding.h>
572 -#include <cdkscreen.h>
573 -#include <cdk_objs.h>
574 +#include <cdk/binding.h>
575 +#include <cdk/cdkscreen.h>
576 +#include <cdk/cdk_objs.h>
580 diff -Nur cdk-4.9.10-20020727.orig/include/slider.h cdk-4.9.10-20020727/include/slider.h
581 --- cdk-4.9.10-20020727.orig/include/slider.h Sun Jul 14 23:49:37 2002
582 +++ cdk-4.9.10-20020727/include/slider.h Fri Mar 28 14:46:26 2003
588 +#include <cdk/cdk.h>
590 -#include <binding.h>
591 -#include <cdkscreen.h>
592 -#include <cdk_objs.h>
593 +#include <cdk/binding.h>
594 +#include <cdk/cdkscreen.h>
595 +#include <cdk/cdk_objs.h>
599 diff -Nur cdk-4.9.10-20020727.orig/include/swindow.h cdk-4.9.10-20020727/include/swindow.h
600 --- cdk-4.9.10-20020727.orig/include/swindow.h Sun Jul 14 23:49:37 2002
601 +++ cdk-4.9.10-20020727/include/swindow.h Fri Mar 28 14:46:34 2003
607 +#include <cdk/cdk.h>
609 -#include <binding.h>
610 -#include <cdkscreen.h>
611 -#include <cdk_objs.h>
612 +#include <cdk/binding.h>
613 +#include <cdk/cdkscreen.h>
614 +#include <cdk/cdk_objs.h>
618 diff -Nur cdk-4.9.10-20020727.orig/include/template.h cdk-4.9.10-20020727/include/template.h
619 --- cdk-4.9.10-20020727.orig/include/template.h Sat Jul 27 18:39:09 2002
620 +++ cdk-4.9.10-20020727/include/template.h Fri Mar 28 14:46:42 2003
626 +#include <cdk/cdk.h>
628 -#include <binding.h>
629 -#include <cdkscreen.h>
630 -#include <cdk_objs.h>
631 +#include <cdk/binding.h>
632 +#include <cdk/cdkscreen.h>
633 +#include <cdk/cdk_objs.h>
637 diff -Nur cdk-4.9.10-20020727.orig/include/traverse.h cdk-4.9.10-20020727/include/traverse.h
638 --- cdk-4.9.10-20020727.orig/include/traverse.h Wed Jul 10 23:41:50 2002
639 +++ cdk-4.9.10-20020727/include/traverse.h Fri Mar 28 14:46:51 2003
641 #ifndef CDKTRAVERSE_H
642 #define CDKTRAVERSE_H 1
649 +#include <cdk/cdk.h>
651 -#include <binding.h>
652 -#include <cdkscreen.h>
653 -#include <cdk_objs.h>
654 +#include <cdk/binding.h>
655 +#include <cdk/cdkscreen.h>
656 +#include <cdk/cdk_objs.h>
660 diff -Nur cdk-4.9.10-20020727.orig/include/viewer.h cdk-4.9.10-20020727/include/viewer.h
661 --- cdk-4.9.10-20020727.orig/include/viewer.h Sun Jul 14 23:49:37 2002
662 +++ cdk-4.9.10-20020727/include/viewer.h Fri Mar 28 14:47:00 2003
668 +#include <cdk/cdk.h>
670 -#include <binding.h>
671 -#include <cdkscreen.h>
672 -#include <cdk_objs.h>
673 +#include <cdk/binding.h>
674 +#include <cdk/cdkscreen.h>
675 +#include <cdk/cdk_objs.h>