external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

dtwm: remove define MINIMAL_DT which is always on for CDE

Browse source
This commit is contained in:
Peter Howkins 2018-06-19 20:50:50 +01:00
parent 7bece30a57
commit 5dc05eaeb4
6 changed files with 1 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cde/programs/dtwm/Imakefile
View file

@ -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

4
cde/programs/dtwm/README
View file

@ -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.

8
cde/programs/dtwm/WmFeedback.c
View file

@ -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
{

2
cde/programs/dtwm/WmGlobal.h
View file

@ -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 */

8
cde/programs/dtwm/WmResNames.h
View file

@ -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

4
cde/programs/dtwm/WmResource.c
View file

@ -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[] */