Remove Unixware and openserver support

cde/lib/DtWidget/Editor.c

@@ -53,7 +53,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 
-#if defined(__hpux) || defined(__osf__) || defined(USL)
+#if defined(__hpux) || defined(__osf__)
 # include <wchar.h>
 #elif defined(sun)
 # if (_XOPEN_VERSION==3)
@@ -776,8 +776,6 @@ static XtActionsRec EditorActionTable[] = {
 /* digital compiler flagged warning */
 /* IBM defines wctype to get_wctype above - don't use const. */
          static char *blankString = "space";
-#elif defined(USL)
-#   define wctype_t	int
 #else  /* __osf__ || _AIX */
    static const char *blankString = "space";
 #endif /* __osf__ || _AIX */
@@ -1375,7 +1373,7 @@ WidgetClass dtEditorWidgetClass = (WidgetClass) &dtEditorClassRec;
 static void
 ClassInitialize(void)
 {
-#if !(defined(sun) && (_XOPEN_VERSION==3)) && !defined(USL)
+#if !(defined(sun) && (_XOPEN_VERSION==3))
   _DtEditor_blankClass = wctype(blankString);
 
   /*
@@ -5245,7 +5243,7 @@ lineBlank(
 	byteNum += mblen(&pLine[byteNum], mbCurMax), charNum++)
     {
 	(void) mbtowc(&wc, &pLine[byteNum], mbCurMax);
-#if !(defined(sun) && (_XOPEN_VERSION==3)) && !defined(USL)
+#if !(defined(sun) && (_XOPEN_VERSION==3))
 	if( !iswctype(wc, _DtEditor_blankClass) )
 	    return False;
 #else
@@ -5269,7 +5267,7 @@ findNonBlank(
 	byteNum += mblen(&pLine[byteNum], mbCurMax), charNum++)
     {
 	(void) mbtowc(&wc, &pLine[byteNum], mbCurMax);
-#if !(defined(sun) && (_XOPEN_VERSION==3)) && !defined(USL)
+#if !(defined(sun) && (_XOPEN_VERSION==3))
 	if( !iswctype(wc, _DtEditor_blankClass) )
             return &pLine[byteNum];
 #else
@@ -5326,7 +5324,7 @@ countBlanks(
 	        count++; /* multibyte control chars??? */
 	    continue;
 	}
-#if !(defined(sun) && (_XOPEN_VERSION==3)) && !defined(USL)
+#if !(defined(sun) && (_XOPEN_VERSION==3))
 	if(!iswctype(wc, _DtEditor_blankClass))
             return count;
 #else

cde/lib/DtWidget/Imakefile

@@ -55,11 +55,6 @@ OBJS = \
 
 #include <Library.tmpl>
 
-/* MS Compiler bug, remove when we go to USL compiler */
-#ifdef SCOArchitecture
-SpecialFlagsObjectRule(Clock, -Olegtc)
-#endif
-
 DependTarget()
 
 LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP)

cde/lib/DtWidget/SpinBox.c

@@ -88,6 +88,11 @@ express or implied warranty.
  *
  */
 
+/*Support for a legacy operating system has resulted in some leftover cruft
+ * code which wasn't ifdefed out, this needs to be cleaned, such code is
+ * marked Legacy: - 05/19/18 - C
+ */
+
 #include <Dt/DtMsgsP.h>
 #include <Xm/DrawP.h>
 #include <Xm/XmP.h>
@@ -263,12 +268,13 @@ static XmString InitLabel = NULL;
 #define SPIN_MARGIN_W(w)    MarginWidth(w)
 #define SPIN_MARGIN_H(w)    MarginHeight(w)
 #define MAXINT 2147483647  /* Taken from TextF.c */
-#define DEFAULT_COL 20 
+#define DEFAULT_COL 20
 
-/* USL: Label get Focus */
+/* Legacy: Label get Focus */
 static XtTranslations child_trans_label;
-/* USL: Keyboard only for Text */
+/* Legacy: Keyboard only for Text */
 static XtTranslations child_trans_text;
+
 static XtTranslations child_trans_arrow;
 
 static XtTranslations child_trans;
@@ -309,7 +315,7 @@ static char const SpinBoxLabelTranslationTable[] = "\
 	~s ~m ~a <Key>space:  SpinBoxGetFocus() \n\
 ";
 
-/* USL: Keyboard Only Traversing During Editable-Mode */
+/* Legacy: Keyboard Only Traversing During Editable-Mode */
 static char const SpinBoxTextTranslationTable[] = "\
         <Key>osfUp:             SpinBoxUp(child) SpinBoxRight(child)\n\
         <Key>osfDown:           SpinBoxDown(child) SpinBoxLeft(child)\n\
@@ -617,9 +623,7 @@ Initialize(	DtSpinBoxWidget request,
 		      text_activate_cb, (XtPointer)new);
 	XtAddCallback(Text(new), XmNfocusCallback, 
 		      text_focus_cb, (XtPointer)new);
-	/* USL */
-	XtOverrideTranslations((Widget)Text(new), child_trans_text);
-	n = 0;
+
 	if (TextColumns(request) == DEFAULT_COL && Width(request)) {
 		Dimension width;
 		CalculateSizes(new, &width, NULL, NULL);
@@ -649,9 +653,7 @@ Initialize(	DtSpinBoxWidget request,
         }
 	Label(new) = XtCreateManagedWidget(widget_name, xmLabelWidgetClass,
 					      (Widget)new, args, n);
-	/* USL */
-	XtOverrideTranslations((Widget)Label(new), child_trans_label);
-	n = 0;
+
         if (unit_type != XmPIXELS) {
                 XtSetArg(args[n], XmNunitType, unit_type); n++;
         }                
@@ -1003,9 +1005,8 @@ _SpinBoxEndLine(	DtSpinBoxWidget spin,
 			   Current(spin), FALSE);
     }
 }
-
 /*
- * USL: Get Focus for SpinBox when hit its label part
+ * Legacy: Get Focus for SpinBox when hit its label part
  */
 static void
 _SpinBoxGetFocus(     DtSpinBoxWidget spin,
@@ -1018,7 +1019,7 @@ _SpinBoxGetFocus(     DtSpinBoxWidget spin,
 }
 
 /*
- * USL: Process Focus Traversal for SpinBox when cursor is in its arrow part
+ * Legacy: Process Focus Traversal for SpinBox when cursor is in its arrow part
  */
 static void
 _SpinBoxPrevTabGroup(DtSpinBoxWidget spin,