From 5dc05eaeb4a3942fc300e3de4af9767085294f0a Mon Sep 17 00:00:00 2001
From: Peter Howkins <flibble@users.sf.net>
Date: Tue, 19 Jun 2018 20:50:50 +0100
Subject: [PATCH] dtwm: remove define MINIMAL_DT which is always on for CDE

---
 cde/programs/dtwm/Imakefile    | 2 +-
 cde/programs/dtwm/README       | 4 ----
 cde/programs/dtwm/WmFeedback.c | 8 --------
 cde/programs/dtwm/WmGlobal.h   | 2 --
 cde/programs/dtwm/WmResNames.h | 8 --------
 cde/programs/dtwm/WmResource.c | 4 ----
 6 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/cde/programs/dtwm/Imakefile b/cde/programs/dtwm/Imakefile
index 50332467..1884359b 100644
--- a/cde/programs/dtwm/Imakefile
+++ b/cde/programs/dtwm/Imakefile
@@ -12,7 +12,7 @@ MWMDEFINES = $(VFORK_DEFINE) -DLARGECURSORS -DR2_COMPAT -DOPAQUE -DSHAPE \
 DTWMDEFINES = -DWSM
 
 DEPEND_DEFINES = $(DEPENDDEFINES)
-DEFINES = $(MWMDEFINES) $(DTWMDEFINES) -DMULTIBYTE -DMINIMAL_DT
+DEFINES = $(MWMDEFINES) $(DTWMDEFINES) -DMULTIBYTE
 INCLUDES = $(TIRPCINC)
 
 DEPLIBS = DepDtClientLibs
diff --git a/cde/programs/dtwm/README b/cde/programs/dtwm/README
index c16727c6..108c45da 100644
--- a/cde/programs/dtwm/README
+++ b/cde/programs/dtwm/README
@@ -77,10 +77,6 @@ header file include flags, and macros (e.g. ABS).
     MESSAGE_CAT
 	Enables message catalog code for local language support.
 
-    MINIMAL_DT
-	Enables some code for "light weight" version of dtwm. (This
-	isn't meaningful any more since we've dumped the BMS.)
-
     MOTIF_DEFAULT_ICON
 	Enables the default window icon with four buttons.
 
diff --git a/cde/programs/dtwm/WmFeedback.c b/cde/programs/dtwm/WmFeedback.c
index 24c6017d..e3b46935 100644
--- a/cde/programs/dtwm/WmFeedback.c
+++ b/cde/programs/dtwm/WmFeedback.c
@@ -148,7 +148,6 @@ initMesg()
     }
     else
     {
-#ifdef MINIMAL_DT
 	if (wmGD.dtLite)
 	{
 	    tmpString = ((char *)GETMESSAGE(22, 9, "Log out?"));
@@ -157,9 +156,6 @@ initMesg()
 	{
 	    tmpString = ((char *)GETMESSAGE(22, 11, "QUIT Workspace Manager?"));
 	}
-#else /* MINIMAL_DT */
-	tmpString = ((char *)GETMESSAGE(22, 11, "QUIT Workspace Manager?"));
-#endif /* MINIMAL_DT */
     }
     
     if ((confirm_mesg[3] =
@@ -171,7 +167,6 @@ initMesg()
 	    confirm_mesg[3] = "QUIT Mwm?";
 	}
 	else
-#ifdef MINIMAL_DT
 	if (wmGD.dtLite)
 	{
 	    confirm_mesg[3] = "Log out?";
@@ -180,9 +175,6 @@ initMesg()
 	{
 	    confirm_mesg[3] = "QUIT Workspace Manager?";
 	}
-#else /* MINIMAL_DT */
-	tmpString = ((char *)GETMESSAGE(22, 11, "QUIT Workspace Manager?"));
-#endif /* MINIMAL_DT */
     }
     else
     {
diff --git a/cde/programs/dtwm/WmGlobal.h b/cde/programs/dtwm/WmGlobal.h
index be035394..b9872603 100644
--- a/cde/programs/dtwm/WmGlobal.h
+++ b/cde/programs/dtwm/WmGlobal.h
@@ -2282,10 +2282,8 @@ typedef struct _WmGlobalData
     String      helpDirectory;		        /* resource */
     Window	requestContextWin;		/* for WmRequest f.fcns */
 #endif /* WSM */
-#ifdef MINIMAL_DT
     Boolean     dtLite;                        /* resource */
     Boolean     blinkOnExec;                    /* resource */
-#endif /* MINIMAL_DT */
     WmScreenData *dtSD; /* screen for front panel */
     int         iSlideUpsInProgress;
     Boolean	waitForClicks;			/* resource */
diff --git a/cde/programs/dtwm/WmResNames.h b/cde/programs/dtwm/WmResNames.h
index 2d1de094..9c4d4fa0 100644
--- a/cde/programs/dtwm/WmResNames.h
+++ b/cde/programs/dtwm/WmResNames.h
@@ -61,9 +61,7 @@
 #define WmNbackdropDirectories		"backdropDirectories"
 #endif /* WSM */
 #define WmNbitmapDirectory		"bitmapDirectory"
-#ifdef MINIMAL_DT
 #define WmNblinkOnExec			"blinkOnExec"
-#endif /* MINIMAL_DT */
 #define WmNbuttonBindings		"buttonBindings"
 #define WmNcleanText			"cleanText"
 #define WmNclientAutoPlace		"clientAutoPlace"
@@ -156,9 +154,7 @@
 #ifdef WSM
 #define WmNuseWindowOutline		"useWindowOutline"
 #endif /* WSM */
-#ifdef MINIMAL_DT
 #define WmNdtLite			"useDtLite"
-#endif /* MINIMAL_DT */
 #define WmNmoveOpaque                   "moveOpaque"
 #define WmNframeStyle			"frameStyle"
 
@@ -266,9 +262,7 @@
 #define WmCBackdropDirectories		"BackdropDirectories"
 #endif /* WSM */
 #define WmCBitmapDirectory		"BitmapDirectory"
-#ifdef MINIMAL_DT
 #define WmCBlinkOnExec			"BlinkOnExec"
-#endif /* MINIMAL_DT */
 #define WmCButtonBindings		"ButtonBindings"
 #define WmCCleanText			"CleanText"
 #define WmCClientAutoPlace		"ClientAutoPlace"
@@ -363,9 +357,7 @@
 #ifdef WSM
 #define WmCUseWindowOutline		"UseWindowOutline"
 #endif /* WSM */
-#ifdef MINIMAL_DT
 #define WmCDtLite			"UseDtLite"
-#endif /* MINIMAL_DT */
 #define WmCMoveOpaque                   "MoveOpaque"
 #define WmCFrameStyle			"FrameStyle"
 #ifdef WSM
diff --git a/cde/programs/dtwm/WmResource.c b/cde/programs/dtwm/WmResource.c
index 891c4016..cc724634 100644
--- a/cde/programs/dtwm/WmResource.c
+++ b/cde/programs/dtwm/WmResource.c
@@ -648,7 +648,6 @@ XtResource wmGlobalResources[] =
 	XtRString,
 	(XtPointer)BITMAPDIR
     },
-#ifdef MINIMAL_DT
     {
 	WmNblinkOnExec,
 	WmCBlinkOnExec,
@@ -658,7 +657,6 @@ XtResource wmGlobalResources[] =
 	XtRImmediate,
 	(XtPointer)False
     },
-#endif /* MINIMAL_DT */
     {
 	WmNframeStyle,
 	WmCFrameStyle,
@@ -1025,7 +1023,6 @@ XtResource wmGlobalResources[] =
     },
 
 #endif /* WSM */
-#ifdef MINIMAL_DT
     {
 	WmNdtLite,
 	WmCDtLite,
@@ -1035,7 +1032,6 @@ XtResource wmGlobalResources[] =
 	XtRImmediate,
 	(XtPointer)False
     }
-#endif /* MINIMAL_DT */
 }; /* END OF wmGlobalResources[] */
 
 
-- 
2.25.1