dtwm: remove define MINIMAL_DT which is always on for CDE
This commit is contained in:
@@ -12,7 +12,7 @@ MWMDEFINES = $(VFORK_DEFINE) -DLARGECURSORS -DR2_COMPAT -DOPAQUE -DSHAPE \
|
|||||||
DTWMDEFINES = -DWSM
|
DTWMDEFINES = -DWSM
|
||||||
|
|
||||||
DEPEND_DEFINES = $(DEPENDDEFINES)
|
DEPEND_DEFINES = $(DEPENDDEFINES)
|
||||||
DEFINES = $(MWMDEFINES) $(DTWMDEFINES) -DMULTIBYTE -DMINIMAL_DT
|
DEFINES = $(MWMDEFINES) $(DTWMDEFINES) -DMULTIBYTE
|
||||||
INCLUDES = $(TIRPCINC)
|
INCLUDES = $(TIRPCINC)
|
||||||
|
|
||||||
DEPLIBS = DepDtClientLibs
|
DEPLIBS = DepDtClientLibs
|
||||||
|
|||||||
@@ -77,10 +77,6 @@ header file include flags, and macros (e.g. ABS).
|
|||||||
MESSAGE_CAT
|
MESSAGE_CAT
|
||||||
Enables message catalog code for local language support.
|
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
|
MOTIF_DEFAULT_ICON
|
||||||
Enables the default window icon with four buttons.
|
Enables the default window icon with four buttons.
|
||||||
|
|
||||||
|
|||||||
@@ -148,7 +148,6 @@ initMesg()
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
#ifdef MINIMAL_DT
|
|
||||||
if (wmGD.dtLite)
|
if (wmGD.dtLite)
|
||||||
{
|
{
|
||||||
tmpString = ((char *)GETMESSAGE(22, 9, "Log out?"));
|
tmpString = ((char *)GETMESSAGE(22, 9, "Log out?"));
|
||||||
@@ -157,9 +156,6 @@ initMesg()
|
|||||||
{
|
{
|
||||||
tmpString = ((char *)GETMESSAGE(22, 11, "QUIT Workspace Manager?"));
|
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] =
|
if ((confirm_mesg[3] =
|
||||||
@@ -171,7 +167,6 @@ initMesg()
|
|||||||
confirm_mesg[3] = "QUIT Mwm?";
|
confirm_mesg[3] = "QUIT Mwm?";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#ifdef MINIMAL_DT
|
|
||||||
if (wmGD.dtLite)
|
if (wmGD.dtLite)
|
||||||
{
|
{
|
||||||
confirm_mesg[3] = "Log out?";
|
confirm_mesg[3] = "Log out?";
|
||||||
@@ -180,9 +175,6 @@ initMesg()
|
|||||||
{
|
{
|
||||||
confirm_mesg[3] = "QUIT Workspace Manager?";
|
confirm_mesg[3] = "QUIT Workspace Manager?";
|
||||||
}
|
}
|
||||||
#else /* MINIMAL_DT */
|
|
||||||
tmpString = ((char *)GETMESSAGE(22, 11, "QUIT Workspace Manager?"));
|
|
||||||
#endif /* MINIMAL_DT */
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2282,10 +2282,8 @@ typedef struct _WmGlobalData
|
|||||||
String helpDirectory; /* resource */
|
String helpDirectory; /* resource */
|
||||||
Window requestContextWin; /* for WmRequest f.fcns */
|
Window requestContextWin; /* for WmRequest f.fcns */
|
||||||
#endif /* WSM */
|
#endif /* WSM */
|
||||||
#ifdef MINIMAL_DT
|
|
||||||
Boolean dtLite; /* resource */
|
Boolean dtLite; /* resource */
|
||||||
Boolean blinkOnExec; /* resource */
|
Boolean blinkOnExec; /* resource */
|
||||||
#endif /* MINIMAL_DT */
|
|
||||||
WmScreenData *dtSD; /* screen for front panel */
|
WmScreenData *dtSD; /* screen for front panel */
|
||||||
int iSlideUpsInProgress;
|
int iSlideUpsInProgress;
|
||||||
Boolean waitForClicks; /* resource */
|
Boolean waitForClicks; /* resource */
|
||||||
|
|||||||
@@ -61,9 +61,7 @@
|
|||||||
#define WmNbackdropDirectories "backdropDirectories"
|
#define WmNbackdropDirectories "backdropDirectories"
|
||||||
#endif /* WSM */
|
#endif /* WSM */
|
||||||
#define WmNbitmapDirectory "bitmapDirectory"
|
#define WmNbitmapDirectory "bitmapDirectory"
|
||||||
#ifdef MINIMAL_DT
|
|
||||||
#define WmNblinkOnExec "blinkOnExec"
|
#define WmNblinkOnExec "blinkOnExec"
|
||||||
#endif /* MINIMAL_DT */
|
|
||||||
#define WmNbuttonBindings "buttonBindings"
|
#define WmNbuttonBindings "buttonBindings"
|
||||||
#define WmNcleanText "cleanText"
|
#define WmNcleanText "cleanText"
|
||||||
#define WmNclientAutoPlace "clientAutoPlace"
|
#define WmNclientAutoPlace "clientAutoPlace"
|
||||||
@@ -156,9 +154,7 @@
|
|||||||
#ifdef WSM
|
#ifdef WSM
|
||||||
#define WmNuseWindowOutline "useWindowOutline"
|
#define WmNuseWindowOutline "useWindowOutline"
|
||||||
#endif /* WSM */
|
#endif /* WSM */
|
||||||
#ifdef MINIMAL_DT
|
|
||||||
#define WmNdtLite "useDtLite"
|
#define WmNdtLite "useDtLite"
|
||||||
#endif /* MINIMAL_DT */
|
|
||||||
#define WmNmoveOpaque "moveOpaque"
|
#define WmNmoveOpaque "moveOpaque"
|
||||||
#define WmNframeStyle "frameStyle"
|
#define WmNframeStyle "frameStyle"
|
||||||
|
|
||||||
@@ -266,9 +262,7 @@
|
|||||||
#define WmCBackdropDirectories "BackdropDirectories"
|
#define WmCBackdropDirectories "BackdropDirectories"
|
||||||
#endif /* WSM */
|
#endif /* WSM */
|
||||||
#define WmCBitmapDirectory "BitmapDirectory"
|
#define WmCBitmapDirectory "BitmapDirectory"
|
||||||
#ifdef MINIMAL_DT
|
|
||||||
#define WmCBlinkOnExec "BlinkOnExec"
|
#define WmCBlinkOnExec "BlinkOnExec"
|
||||||
#endif /* MINIMAL_DT */
|
|
||||||
#define WmCButtonBindings "ButtonBindings"
|
#define WmCButtonBindings "ButtonBindings"
|
||||||
#define WmCCleanText "CleanText"
|
#define WmCCleanText "CleanText"
|
||||||
#define WmCClientAutoPlace "ClientAutoPlace"
|
#define WmCClientAutoPlace "ClientAutoPlace"
|
||||||
@@ -363,9 +357,7 @@
|
|||||||
#ifdef WSM
|
#ifdef WSM
|
||||||
#define WmCUseWindowOutline "UseWindowOutline"
|
#define WmCUseWindowOutline "UseWindowOutline"
|
||||||
#endif /* WSM */
|
#endif /* WSM */
|
||||||
#ifdef MINIMAL_DT
|
|
||||||
#define WmCDtLite "UseDtLite"
|
#define WmCDtLite "UseDtLite"
|
||||||
#endif /* MINIMAL_DT */
|
|
||||||
#define WmCMoveOpaque "MoveOpaque"
|
#define WmCMoveOpaque "MoveOpaque"
|
||||||
#define WmCFrameStyle "FrameStyle"
|
#define WmCFrameStyle "FrameStyle"
|
||||||
#ifdef WSM
|
#ifdef WSM
|
||||||
|
|||||||
@@ -648,7 +648,6 @@ XtResource wmGlobalResources[] =
|
|||||||
XtRString,
|
XtRString,
|
||||||
(XtPointer)BITMAPDIR
|
(XtPointer)BITMAPDIR
|
||||||
},
|
},
|
||||||
#ifdef MINIMAL_DT
|
|
||||||
{
|
{
|
||||||
WmNblinkOnExec,
|
WmNblinkOnExec,
|
||||||
WmCBlinkOnExec,
|
WmCBlinkOnExec,
|
||||||
@@ -658,7 +657,6 @@ XtResource wmGlobalResources[] =
|
|||||||
XtRImmediate,
|
XtRImmediate,
|
||||||
(XtPointer)False
|
(XtPointer)False
|
||||||
},
|
},
|
||||||
#endif /* MINIMAL_DT */
|
|
||||||
{
|
{
|
||||||
WmNframeStyle,
|
WmNframeStyle,
|
||||||
WmCFrameStyle,
|
WmCFrameStyle,
|
||||||
@@ -1025,7 +1023,6 @@ XtResource wmGlobalResources[] =
|
|||||||
},
|
},
|
||||||
|
|
||||||
#endif /* WSM */
|
#endif /* WSM */
|
||||||
#ifdef MINIMAL_DT
|
|
||||||
{
|
{
|
||||||
WmNdtLite,
|
WmNdtLite,
|
||||||
WmCDtLite,
|
WmCDtLite,
|
||||||
@@ -1035,7 +1032,6 @@ XtResource wmGlobalResources[] =
|
|||||||
XtRImmediate,
|
XtRImmediate,
|
||||||
(XtPointer)False
|
(XtPointer)False
|
||||||
}
|
}
|
||||||
#endif /* MINIMAL_DT */
|
|
||||||
}; /* END OF wmGlobalResources[] */
|
}; /* END OF wmGlobalResources[] */
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user