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

This commit is contained in:
Peter Howkins
2018-06-20 01:11:17 +01:00
parent 9a551dd8a6
commit d5273f121b
12 changed files with 1 additions and 213 deletions

View File

@@ -91,9 +91,7 @@ int smAckState = SM_UNITIALIZED;
extern FunctionTableEntry functionTable[];
extern int F_NOP_INDEX;
#ifndef MOTIF_ONE_DOT_ONE
#include <Xm/MenuShellP.h>
#endif
@@ -702,14 +700,9 @@ Boolean WmDispatchMenuEvent (XButtonEvent *event)
{
PopGadgetOut (pCD, FRAME_SYSTEM);
}
#ifdef MOTIF_ONE_DOT_ONE
TraversalOn (pCD->systemMenuSpec);
doXtDispatchEvent = False;
#else
_XmGetMenuState(XtParent(pCD->systemMenuSpec->menuWidget))
->MS_LastManagedMenuTime = ((XButtonEvent *)event)->time;
doXtDispatchEvent = True;
#endif
}
else if ((!wmGD.clickData.pCD) &&
(((XButtonEvent *)event)->button == wmGD.clickData.button) &&
@@ -741,15 +734,10 @@ Boolean WmDispatchMenuEvent (XButtonEvent *event)
if (timeDiff < wmGD.doubleClickTime)
{
#ifdef MOTIF_ONE_DOT_ONE
TraversalOn (wmGD.menuActive);
doXtDispatchEvent = False;
#else
_XmGetMenuState (XtParent(wmGD.menuActive->menuWidget))
->MS_LastManagedMenuTime =
((XButtonEvent *)event)->time;
doXtDispatchEvent = True;
#endif
}
wmGD.clickData.clickPending = False;
}