dtwm: Remove define MOTIF_ONE_DOT_ONE, backwards compatibility for motif 1.1, CDE as a whole requires 2.1

cde/programs/dtwm/WmImage.c

@@ -39,18 +39,12 @@
 #define MWM_NEED_IIMAGE
 #include "WmIBitmap.h"
 
-#ifdef MOTIF_ONE_DOT_ONE
-#include <stdio.h>
-#include <pwd.h>
-#define MATCH_CHAR 'P'		/* Default match character - defined in Xmos.p */
-#else
 #include <Xm/XmosP.h> 
 /* Copied from XmosI.h */
 extern String _XmOSInitPath( 
                         String file_name,
                         String env_pathname,
                         Boolean *user_path) ;
-#endif
 #include <Xm/IconFile.h>
 #include <Dt/GetDispRes.h>
 
@@ -68,11 +62,6 @@ extern String _XmOSInitPath(
 #include "WmMenu.h"
 #include "WmError.h"
 
-#ifdef MOTIF_ONE_DOT_ONE
-extern char    *getenv ();
-#endif
-
-
 /******************************<->*************************************
  *
  *  MakeClientIconPixmap (pCD, iconBitmap, iconMask)
@@ -982,9 +971,7 @@ char *BitmapPathName (string)
     static char  fileName[MAXWMPATH+1];
     char *retname;
     SubstitutionRec subs[1];
-#ifndef MOTIF_ONE_DOT_ONE
     char *homeDir = XmeGetHomeDirName();
-#endif
 
     if (!string || !*string)
     {
@@ -1004,11 +991,7 @@ char *BitmapPathName (string)
      * Handle "~/.." 
      */
     {
-#ifdef MOTIF_ONE_DOT_ONE
-	GetHomeDirName(fileName);
-#else
 	strcpy (fileName, homeDir);
-#endif
         strncat (fileName, &(string[1]), MAXWMPATH - strlen (fileName));
 	return (fileName);
     }
@@ -1026,11 +1009,7 @@ char *BitmapPathName (string)
 	if ((wmGD.bitmapDirectory[0] == '~') &&
 	    (wmGD.bitmapDirectory[1] == '/'))
 	{
-#ifdef MOTIF_ONE_DOT_ONE
-	    GetHomeDirName(fileName);
-#else
 	    strcpy (fileName, homeDir);
-#endif
             strncat (fileName, &wmGD.bitmapDirectory[1],
 		     MAXWMPATH - strlen (fileName));
 	} else {
@@ -1051,9 +1030,6 @@ char *BitmapPathName (string)
 
     /* Fall back on a path search */
 
-#ifdef MOTIF_ONE_DOT_ONE
-    return (NULL);
-#else
     {
 	char *search_path;
 	Boolean user_path;
@@ -1073,7 +1049,6 @@ char *BitmapPathName (string)
 	XtFree(retname);
 	return (fileName);
     }
-#endif
 
 } /* END OF FUNCTION BitmapPathName */