*** ../aXe-3.1.orig/AxeCommand.c	Thu Feb  4 14:29:01 1993
--- AxeCommand.c	Thu Feb  4 16:14:04 1993
***************
*** 94,99 ****
--- 94,102 ----
      /* change_sensitive       */     XtInheritChangeSensitive            
    },  /* SimpleClass fields initialization */
    {
+     /* shadowdraw             */	XtInheritXaw3dShadowDraw
+   },  /* ThreeD Class fields */
+   {
      /* foo                    */     0,
    },  /* LabelClass fields initialization */
    {
*** ../aXe-3.1.orig/AxeCommand.h	Thu Feb  4 14:29:01 1993
--- AxeCommand.h	Thu Feb  4 14:31:33 1993
***************
*** 30,36 ****
  #ifndef _AxeCommand_h
  #define _AxeCommand_h
  
! #include <X11/Xaw/MenuButton.h>
  
  extern WidgetClass     axeCommandWidgetClass;
  
--- 30,36 ----
  #ifndef _AxeCommand_h
  #define _AxeCommand_h
  
! #include <X11/Xaw3d/MenuButton.h>
  
  extern WidgetClass     axeCommandWidgetClass;
  
*** ../aXe-3.1.orig/AxeCommandP.h	Thu Feb  4 14:29:01 1993
--- AxeCommandP.h	Thu Feb  4 14:34:42 1993
***************
*** 30,36 ****
  #ifndef _AxeCommandP_h
  #define _AxeCommandP_h
  
! #include <X11/Xaw/CommandP.h>
  #include <AxeCommand.h>
  
  typedef struct _AxeCommandClass 
--- 30,36 ----
  #ifndef _AxeCommandP_h
  #define _AxeCommandP_h
  
! #include <X11/Xaw3d/CommandP.h>
  #include <AxeCommand.h>
  
  typedef struct _AxeCommandClass 
***************
*** 42,47 ****
--- 42,48 ----
  typedef struct _AxeCommandClassRec {
      CoreClassPart	    core_class;
      SimpleClassPart	    simple_class;
+     ThreeDClassPart	    threeD_class;
      LabelClassPart	    label_class;
      CommandClassPart	    command_class;
      AxeCommandClassPart     axe_command_class;
***************
*** 56,61 ****
--- 57,63 ----
  typedef struct _AxeCommandRec {
      CorePart            core;
      SimplePart	        simple;
+     ThreeDPart		threeD;
      LabelPart	        label;
      CommandPart	        command;
      AxeCommandPart      axeCommand;
*** ../aXe-3.1.orig/AxeEditor.h	Thu Feb  4 14:29:02 1993
--- AxeEditor.h	Thu Feb  4 14:31:41 1993
***************
*** 30,36 ****
  #ifndef AxeEditor_h
  #define AxeEditor_h
  
! #include <X11/Xaw/Paned.h>
  
  typedef struct _AxeEditorClassRec *AxeEditorWidgetClass;
  typedef struct _AxeEditorRec      *AxeEditorWidget;
--- 30,36 ----
  #ifndef AxeEditor_h
  #define AxeEditor_h
  
! #include <X11/Xaw3d/Paned.h>
  
  typedef struct _AxeEditorClassRec *AxeEditorWidgetClass;
  typedef struct _AxeEditorRec      *AxeEditorWidget;
*** ../aXe-3.1.orig/AxeMenuBtn.c	Thu Feb  4 14:29:02 1993
--- AxeMenuBtn.c	Thu Feb  4 16:25:13 1993
***************
*** 128,133 ****
--- 128,136 ----
      /* change_sensitive       */     XtInheritChangeSensitive            
    },  /* SimpleClass fields initialization */
    {
+     /* shadowdraw             */     XtInheritXaw3dShadowDraw
+   },  /* ThreeDClass fields initialization */
+   {
      /* foo                    */     0,
    },  /* LabelClass fields initialization */
    {
*** ../aXe-3.1.orig/AxeMenuBtn.h	Thu Feb  4 14:29:02 1993
--- AxeMenuBtn.h	Thu Feb  4 14:31:49 1993
***************
*** 30,36 ****
  #ifndef _AxeMenuButton_h
  #define _AxeMenuButton_h
  
! #include <X11/Xaw/MenuButton.h>
  
  extern WidgetClass     axeMenuButtonWidgetClass;
  
--- 30,36 ----
  #ifndef _AxeMenuButton_h
  #define _AxeMenuButton_h
  
! #include <X11/Xaw3d/MenuButton.h>
  
  extern WidgetClass     axeMenuButtonWidgetClass;
  
*** ../aXe-3.1.orig/AxeMenuBtnP.h	Thu Feb  4 14:29:02 1993
--- AxeMenuBtnP.h	Thu Feb  4 14:35:34 1993
***************
*** 30,36 ****
  #ifndef _AxeMenuButtonP_h
  #define _AxeMenuButtonP_h
  
! #include <X11/Xaw/MenuButtoP.h>
  #include <AxeMenuBtn.h>
  
  typedef struct _AxeMenuButtonClass 
--- 30,36 ----
  #ifndef _AxeMenuButtonP_h
  #define _AxeMenuButtonP_h
  
! #include <X11/Xaw3d/MenuButtoP.h>
  #include <AxeMenuBtn.h>
  
  typedef struct _AxeMenuButtonClass 
***************
*** 41,46 ****
--- 41,47 ----
  typedef struct _AxeMenuButtonClassRec {
      CoreClassPart	    core_class;
      SimpleClassPart	    simple_class;
+     ThreeDClassPart	    threeD_class;
      LabelClassPart	    label_class;
      CommandClassPart	    command_class;
      MenuButtonClassPart     menuButton_class;
***************
*** 56,61 ****
--- 57,63 ----
  typedef struct _AxeMenuButtonRec {
      CorePart            core;
      SimplePart	        simple;
+     ThreeDPart		threeD;
      LabelPart	        label;
      CommandPart	        command;
      MenuButtonPart      menuButton;
*** ../aXe-3.1.orig/AxeSimMenu.h	Thu Feb  4 14:29:02 1993
--- AxeSimMenu.h	Thu Feb  4 14:31:55 1993
***************
*** 31,37 ****
  #define _AxeSimMenu_h
  
  #include <X11/Intrinsic.h>
! #include <X11/Xaw/SimpleMenu.h>
  
  typedef struct _AxeSimpleMenuClassRec*	AxeSimpleMenuWidgetClass;
  typedef struct _AxeSimpleMenuRec*	AxeSimpleMenuWidget;
--- 31,37 ----
  #define _AxeSimMenu_h
  
  #include <X11/Intrinsic.h>
! #include <X11/Xaw3d/SimpleMenu.h>
  
  typedef struct _AxeSimpleMenuClassRec*	AxeSimpleMenuWidgetClass;
  typedef struct _AxeSimpleMenuRec*	AxeSimpleMenuWidget;
*** ../aXe-3.1.orig/AxeSimMenuP.h	Thu Feb  4 14:29:02 1993
--- AxeSimMenuP.h	Thu Feb  4 14:30:43 1993
***************
*** 31,37 ****
  #define _AxeSimMenP_h
  
  #include <X11/IntrinsicP.h>
! #include <X11/Xaw/SimpleMenP.h>
  #include <AxeSimMenu.h>
  
  typedef struct {
--- 31,37 ----
  #define _AxeSimMenP_h
  
  #include <X11/IntrinsicP.h>
! #include <X11/Xaw3d/SimpleMenP.h>
  #include <AxeSimMenu.h>
  
  typedef struct {
*** ../aXe-3.1.orig/AxeSmeBSB.c	Thu Feb  4 14:29:03 1993
--- AxeSmeBSB.c	Thu Feb  4 16:17:17 1993
***************
*** 83,88 ****
--- 83,91 ----
      /* notify */                XtInheritNotify,
      /* extension          */    NULL
    }, {
+     /* ThreeD */
+     /* shadowdraw         */    XtInheritXawSme3dShadowDraw
+   }, {
      /* BSB Menu entry Fields */  
  
      /* extension          */    NULL
*** ../aXe-3.1.orig/AxeSmeBSB.h	Thu Feb  4 14:29:03 1993
--- AxeSmeBSB.h	Thu Feb  4 14:32:01 1993
***************
*** 30,36 ****
  #ifndef _AxeSmeBSB_h
  #define _AxeSmeBSB_h
  
! #include <X11/Xaw/SmeBSB.h>
  
  typedef struct _AxeSmeBSBClassRec    *AxeSmeBSBObjectClass;
  typedef struct _AxeSmeBSBRec         *AxeSmeBSBObject;
--- 30,36 ----
  #ifndef _AxeSmeBSB_h
  #define _AxeSmeBSB_h
  
! #include <X11/Xaw3d/SmeBSB.h>
  
  typedef struct _AxeSmeBSBClassRec    *AxeSmeBSBObjectClass;
  typedef struct _AxeSmeBSBRec         *AxeSmeBSBObject;
*** ../aXe-3.1.orig/AxeSmeBSBP.h	Thu Feb  4 14:29:03 1993
--- AxeSmeBSBP.h	Thu Feb  4 16:05:45 1993
***************
*** 30,36 ****
  #ifndef _AxeSmeBSBP_h
  #define _AxeSmeBSBP_h
  
! #include <X11/Xaw/SmeBSBP.h>
  #include <AxeSmeBSB.h>
  
  typedef struct _AxeSmeBSBClassPart {
--- 30,36 ----
  #ifndef _AxeSmeBSBP_h
  #define _AxeSmeBSBP_h
  
! #include <X11/Xaw3d/SmeBSBP.h>
  #include <AxeSmeBSB.h>
  
  typedef struct _AxeSmeBSBClassPart {
***************
*** 40,45 ****
--- 40,46 ----
  typedef struct _AxeSmeBSBClassRec {
      RectObjClassPart       rect_class;
      SmeClassPart           sme_class;
+     SmeThreeDClassPart     smeThreeD_class;
      SmeBSBClassPart        smeBsb_class;
      AxeSmeBSBClassPart     axeSmeBsb_class;
  } AxeSmeBSBClassRec;
***************
*** 55,60 ****
--- 56,62 ----
      ObjectPart         object;
      RectObjPart        rectangle;
      SmePart	       sme;
+     SmeThreeDPart      smeThreeD;
      SmeBSBPart         smeBsb;
      AxeSmeBSBPart      axeSmeBsb;
  } AxeSmeBSBRec;
*** ../aXe-3.1.orig/AxeiiText.h	Thu Feb  4 14:29:04 1993
--- AxeiiText.h	Thu Feb  4 14:32:17 1993
***************
*** 30,36 ****
  #ifndef _AxeiiText_h
  #define _AxeiiText_h
  
! #include <X11/Xaw/AsciiText.h>
  
  typedef struct _AxeiiTextClassRec	*AxeiiTextWidgetClass;
  typedef struct _AxeiiTextRec	        *AxeiiTextWidget;
--- 30,36 ----
  #ifndef _AxeiiText_h
  #define _AxeiiText_h
  
! #include <X11/Xaw3d/AsciiText.h>
  
  typedef struct _AxeiiTextClassRec	*AxeiiTextWidgetClass;
  typedef struct _AxeiiTextRec	        *AxeiiTextWidget;
*** ../aXe-3.1.orig/AxeiiTextP.h	Thu Feb  4 14:29:04 1993
--- AxeiiTextP.h	Thu Feb  4 14:30:58 1993
***************
*** 30,36 ****
  #ifndef _AxeiiTextP_h
  #define _AxeiiTextP_h
  
! #include <X11/Xaw/AsciiTextP.h>
  #include <AxeiiText.h>
  
  typedef struct {
--- 30,36 ----
  #ifndef _AxeiiTextP_h
  #define _AxeiiTextP_h
  
! #include <X11/Xaw3d/AsciiTextP.h>
  #include <AxeiiText.h>
  
  typedef struct {
*** ../aXe-3.1.orig/Preference.h	Thu Feb  4 14:29:07 1993
--- Preference.h	Thu Feb  4 14:32:37 1993
***************
*** 31,37 ****
  #define _Preference_h
  
  #include <X11/Xp/Table.h>
! #include <X11/Xaw/AsciiText.h>
  
  extern WidgetClass preferenceWidgetClass;
  
--- 31,37 ----
  #define _Preference_h
  
  #include <X11/Xp/Table.h>
! #include <X11/Xaw3d/AsciiText.h>
  
  extern WidgetClass preferenceWidgetClass;
  
*** ../aXe-3.1.orig/ScrollText.h	Thu Feb  4 14:29:08 1993
--- ScrollText.h	Thu Feb  4 14:32:44 1993
***************
*** 30,36 ****
  #ifndef _XawScrollingText_h
  #define _XawScrollingText_h
  
! #include <X11/Xaw/Porthole.h>
  
  extern WidgetClass scrollingTextWidgetClass;
  
--- 30,36 ----
  #ifndef _XawScrollingText_h
  #define _XawScrollingText_h
  
! #include <X11/Xaw3d/Porthole.h>
  
  extern WidgetClass scrollingTextWidgetClass;
  
*** ../aXe-3.1.orig/ScrollTextP.h	Thu Feb  4 14:29:08 1993
--- ScrollTextP.h	Thu Feb  4 14:31:11 1993
***************
*** 30,36 ****
  #ifndef _ScrollingTextP_h
  #define _ScrollingTextP_h
  
! #include <X11/Xaw/PortholeP.h>
  #include <ScrollText.h>
  
  typedef struct {
--- 30,36 ----
  #ifndef _ScrollingTextP_h
  #define _ScrollingTextP_h
  
! #include <X11/Xaw3d/PortholeP.h>
  #include <ScrollText.h>
  
  typedef struct {
*** ../aXe-3.1.orig/ViewlistP.h	Thu Feb  4 14:29:09 1993
--- ViewlistP.h	Thu Feb  4 14:31:19 1993
***************
*** 34,40 ****
  #include <X11/IntrinsicP.h>
  #include <X11/CoreP.h>
  
! #include <X11/Xaw/ViewportP.h>
  #include <Viewlist.h>
  
  typedef struct {
--- 34,40 ----
  #include <X11/IntrinsicP.h>
  #include <X11/CoreP.h>
  
! #include <X11/Xaw3d/ViewportP.h>
  #include <Viewlist.h>
  
  typedef struct {