wdvi

commit b4ea3db242146da371f2d29212ca2072c5723c85
parent 60c0376d40f93ad7d69e2b2eb5a2a91095e5aa71
Author: Kyle Milz <milz@macbook.0x30.net>
Date:   Tue, 18 Aug 2020 12:36:03 -0700

unifdef -DXAW3D=0

Do not use Xaw3d toolkit.

Diffstat:
M
dvi-draw.c
 | 
4
----
M
events.c
 | 
8
--------
M
popups.c
 | 
9
---------
M
xdvi.c
 | 
8
--------

4 files changed, 0 insertions(+), 29 deletions(-)
diff --git a/dvi-draw.c b/dvi-draw.c
@@ -36,11 +36,7 @@ NOTE:
 #endif
 
 # include <X11/StringDefs.h>
-# if XAW3d
-#  include <X11/Xaw3d/Label.h>
-# else
 #  include <X11/Xaw/Label.h>
-# endif
 
 #if HAVE_XKB_BELL_EXT
 # include <X11/XKBlib.h>
diff --git a/events.c b/events.c
@@ -44,19 +44,11 @@ NOTE:
 
 #if	XtSpecificationRelease >= 4
 
-# if XAW3D
-#  include <X11/Xaw3d/Viewport.h>
-# else
 #  include <X11/Xaw/Viewport.h>
-# endif
 # include <X11/cursorfont.h>
 
 #ifdef	BUTTONS
-# if XAW3D
-#  include <X11/Xaw3d/Command.h>
-# else
 #  include <X11/Xaw/Command.h>
-# endif
 #define	PANEL_WIDGET_CLASS	compositeWidgetClass
 #define	BUTTON_WIDGET_CLASS	commandWidgetClass
 #endif /* BUTTONS */
diff --git a/popups.c b/popups.c
@@ -39,21 +39,12 @@ IN THE SOFTWARE.
 #include <X11/StringDefs.h>
 
 # include <X11/Shell.h>
-# if XAW3D
-#  include <X11/Xaw3d/Form.h>
-#  include <X11/Xaw3d/Label.h>
-#  include <X11/Xaw3d/Command.h>
-#  include <X11/Xaw3d/Toggle.h>
-#  include <X11/Xaw3d/AsciiText.h>
-#  include <X11/Xaw3d/Viewport.h>
-# else
 #  include <X11/Xaw/Form.h>
 #  include <X11/Xaw/Label.h>
 #  include <X11/Xaw/Command.h>
 #  include <X11/Xaw/Toggle.h>
 #  include <X11/Xaw/AsciiText.h>
 #  include <X11/Xaw/Viewport.h>
-# endif
 # if XtSpecificationRelease < 5
 #  define XawChainLeft	XtChainLeft
 #  define XawChainRight	XtChainRight
diff --git a/xdvi.c b/xdvi.c
@@ -143,11 +143,7 @@ extern	double	atof ARGS((_Xconst char *));
 #if	XtSpecificationRelease >= 4
 
 #ifndef MOTIF
-# if XAW3D
-#  include <X11/Xaw3d/Viewport.h>
-# else
 #  include <X11/Xaw/Viewport.h>
-# endif
 #define	VPORT_WIDGET_CLASS	viewportWidgetClass
 #define	DRAW_WIDGET_CLASS	drawWidgetClass
 #else /* MOTIF */
@@ -163,11 +159,7 @@ extern	double	atof ARGS((_Xconst char *));
 
 #ifdef	BUTTONS
 #ifndef MOTIF
-# if XAW3D
-#  include <X11/Xaw3d/Command.h>
-# else
 #  include <X11/Xaw/Command.h>
-# endif
 #define	FORM_WIDGET_CLASS	formWidgetClass
 #else /* MOTIF */
 #include <Xm/Form.h>