Fix:	SE055

Problem:
	Remove redundant include/Window.h and include/WindowP.h (now
	replaced with include/xwindow.h and include/xwindowp.h.

Compatible with:
	Slash'EM 0.0.6E0F2

Author: J. Ali Harlow, ali@avrc.city.ac.uk

Date:	3 Mar 2000

diff -Nacr ../slashem-0.0.6E0F2/include/Window.h ./include/Window.h
*** ../slashem-0.0.6E0F2/include/Window.h	Mon Jan 17 13:29:47 2000
--- ./include/Window.h	Thu Jan  1 01:00:00 1970
***************
*** 1,95 ****
- /*	SCCS Id: @(#)Window.h	3.2	92/03/07	*/
- /* Copyright (c) Dean Luick, 1992				  */
- /* NetHack may be freely redistributed.  See license for details. */
- 
- #ifndef _Window_h
- #define _Window_h
- 
- /****************************************************************
-  *
-  * Window widget
-  *
-  ****************************************************************/
- 
- /* Resources:
- 
-  Name		     Class		RepType		Default Value
-  ----		     -----		-------		-------------
-  background	     Background		Pixel		XtDefaultBackground
-  border		     BorderColor	Pixel		XtDefaultForeground
-  borderWidth	     BorderWidth	Dimension	1
-  destroyCallback     Callback		Pointer		NULL
-  height		     Height		Dimension	0
-  mappedWhenManaged   MappedWhenManaged	Boolean		True
-  sensitive	     Sensitive		Boolean		True
-  width		     Width		Dimension	0
-  x		     Position		Position	0
-  y		     Position		Position	0
- 
-  rows		     Width		Dimension	21
-  columns	     Height		Dimension	80
-  foreground	     Color		Pixel		XtDefaultForeground
- 
-  black		     Color		Pixel		"black"
-  red		     Color		Pixel		"red"
-  green		     Color		Pixel		"pale green"
-  brown		     Color		Pixel		"brown"
-  blue		     Color		Pixel		"blue"
-  magenta	     Color		Pixel		"magenta"
-  cyan		     Color		Pixel		"light cyan"
-  gray		     Color		Pixel		"gray"
-  //no color
-  orange		     Color		Pixel		"orange"
-  bright_green	     Color		Pixel		"green"
-  yellow		     Color		Pixel		"yellow"
-  bright_blue	     Color		Pixel		"royal blue"
-  bright_magenta	     Color		Pixel		"violet"
-  bright_cyan	     Color		Pixel		"cyan"
-  white		     Color		Pixel		"white"
- 
-  font		     Font		XFontStruct*	XtDefaultFont
-  exposeCallback	     Callback		Callback	NULL
-  callback	     Callback		Callback	NULL
-  resizeCallback	     Callback		Callback	NULL
- */
- 
- /* define any special resource names here that are not in <X11/StringDefs.h> */
- 
- #define XtNrows			"rows"
- #define XtNcolumns		"columns"
- #define XtNblack		"black"
- #define XtNred			"red"
- #define XtNgreen		"green"
- #define XtNbrown		"brown"
- #define XtNblue			"blue"
- #define XtNmagenta		"magenta"
- #define XtNcyan			"cyan"
- #define XtNgray			"gray"
- #define XtNorange		"orange"
- #define XtNbright_green		"bright_green"
- #define XtNyellow		"yellow"
- #define XtNbright_blue		"bright_blue"
- #define XtNbright_magenta	"bright_magenta"
- #define XtNbright_cyan		"bright_cyan"
- #define XtNwhite		"white"
- #define XtNexposeCallback	"exposeCallback"
- #define XtNresizeCallback	"resizeCallback"
- 
- 
- extern XFontStruct *WindowFontStruct(/* Widget */);
- extern Font WindowFont(/* Widget */);
- 
- #define XtCWindowResource "WindowResource"
- #define XtCRows			"Rows"
- #define XtCColumns		"Columns"
- 
- /* declare specific WindowWidget class and instance datatypes */
- 
- typedef struct _WindowClassRec	*WindowWidgetClass;
- typedef struct _WindowRec	*WindowWidget;
- 
- /* declare the class constant */
- 
- extern WidgetClass windowWidgetClass;
- 
- #endif /* _Window_h */
--- 0 ----
diff -Nacr ../slashem-0.0.6E0F2/include/WindowP.h ./include/WindowP.h
*** ../slashem-0.0.6E0F2/include/WindowP.h	Mon Jan 17 13:29:47 2000
--- ./include/WindowP.h	Thu Jan  1 01:00:00 1970
***************
*** 1,72 ****
- /*	SCCS Id: @(#)WindowP.h	3.2	92/03/07	*/
- /* Copyright (c) Dean Luick, 1992				  */
- /* NetHack may be freely redistributed.  See license for details. */
- 
- #ifndef _WindowP_h
- #define _WindowP_h
- 
- #include "Window.h"
- 
- #ifndef SYSV
- #define PRESERVE_NO_SYSV	/* X11 include files may define SYSV */
- #endif
- 
- /* include superclass private header file */
- #include <X11/CoreP.h>
- 
- #ifdef PRESERVE_NO_SYSV
- # ifdef SYSV
- #  undef SYSV
- # endif
- # undef PRESERVE_NO_SYSV
- #endif
- 
- /* define unique representation types not found in <X11/StringDefs.h> */
- 
- #define XtRWindowResource "WindowResource"
- 
- typedef struct {
-     int empty;
- } WindowClassPart;
- 
- typedef struct _WindowClassRec {
-     CoreClassPart	core_class;
-     WindowClassPart	window_class;
- } WindowClassRec;
- 
- extern WindowClassRec windowClassRec;
- 
- typedef struct {
-     /* resources */
-     Dimension	   rows;
-     Dimension	   columns;
-     Pixel	   foreground;
-     Pixel	   black;
-     Pixel	   red;
-     Pixel	   green;
-     Pixel	   brown;
-     Pixel	   blue;
-     Pixel	   magenta;
-     Pixel	   cyan;
-     Pixel	   gray;
-     Pixel	   orange;
-     Pixel	   bright_green;
-     Pixel	   yellow;
-     Pixel	   bright_blue;
-     Pixel	   bright_magenta;
-     Pixel	   bright_cyan;
-     Pixel	   white;
-     XFontStruct	   *font;
-     XtCallbackList expose_callback;
-     XtCallbackList input_callback;
-     XtCallbackList resize_callback;
-     /* private state */
-     /* (none) */
- } WindowPart;
- 
- typedef struct _WindowRec {
-     CorePart	core;
-     WindowPart	window;
- } WindowRec;
- 
- #endif /* _WindowP_h */
--- 0 ----
diff -Nacr ../slashem-0.0.6E0F2/sys/unix/Makefile.src ./sys/unix/Makefile.src
*** ../slashem-0.0.6E0F2/sys/unix/Makefile.src	Fri Feb  4 18:16:14 2000
--- ./sys/unix/Makefile.src	Fri Mar  3 19:27:52 2000
***************
*** 580,586 ****
  wintty.o: ../win/tty/wintty.c $(HACK_H) ../include/dlb.h \
  		../include/patchlevel.h ../include/tcap.h
  	$(CC) $(CFLAGS) -c ../win/tty/wintty.c
! Window.o: ../win/X11/Window.c ../include/WindowP.h ../include/Window.h \
  		$(CONFIG_H)
  	$(CC) $(CFLAGS) -c ../win/X11/Window.c
  dialogs.o: ../win/X11/dialogs.c $(CONFIG_H)
--- 580,586 ----
  wintty.o: ../win/tty/wintty.c $(HACK_H) ../include/dlb.h \
  		../include/patchlevel.h ../include/tcap.h
  	$(CC) $(CFLAGS) -c ../win/tty/wintty.c
! Window.o: ../win/X11/Window.c ../include/xwindowp.h ../include/xwindow.h \
  		$(CONFIG_H)
  	$(CC) $(CFLAGS) -c ../win/X11/Window.c
  dialogs.o: ../win/X11/dialogs.c $(CONFIG_H)