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: Resolved some compiler warnings

Browse source
This commit is contained in:
alx 2016-04-17 12:58:31 +02:00 committed by Jon Trulson
parent 720fd9365a
commit 2e5bd045ed
4 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cde/include/Xm/XmPrivate.h
View file

@ -131,6 +131,11 @@ extern void _XmPrimitiveFocusIn(
XEvent *event, XEvent *event,
String *params, String *params,
Cardinal *num_params) ; Cardinal *num_params) ;
extern void _XmEnterGadget(
Widget wid,
XEvent *event,
String *params,
Cardinal *num_params);
extern void _XmLeaveGadget( extern void _XmLeaveGadget(
Widget wid, Widget wid,
XEvent *event, XEvent *event,
@ -192,6 +197,15 @@ extern XtPointer _XmStringUngenerate (XmString string,
XmStringTag tag, XmStringTag tag,
XmTextType tag_type, XmTextType tag_type,
XmTextType output_type); XmTextType output_type);
/* Extracted from VirtKeysI.h */
extern Boolean _XmVirtKeysLoadFileBindings(
char *fileName,
String *binding) ;
extern int _XmVirtKeysLoadFallbackBindings(
Display *display,
String *binding) ;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

20
cde/programs/dtwm/Button.c
View file

@ -757,7 +757,7 @@ InputDispatch(
event_mask & XmMULTI_ARM_EVENT) event_mask & XmMULTI_ARM_EVENT)
{ {
if (event->button == Button1) if (event->button == Button1)
Arm (w, (XEvent*) event, (String *)NULL, (Cardinal)0); Arm (w, (XEvent*) event, (String *)NULL, (Cardinal*)NULL);
} }
else if (event_mask & XmACTIVATE_EVENT || else if (event_mask & XmACTIVATE_EVENT ||
event_mask & XmMULTI_ACTIVATE_EVENT) event_mask & XmMULTI_ACTIVATE_EVENT)
@ -770,28 +770,28 @@ InputDispatch(
event->y <= (Position)(G_Y (bg) + G_Height (bg))) event->y <= (Position)(G_Y (bg) + G_Height (bg)))
{ {
Activate (w, (XEvent*) event, Activate (w, (XEvent*) event,
(String *)NULL, (Cardinal)0); (String *)NULL, (Cardinal*)NULL);
Disarm (w, (XEvent*) event, Disarm (w, (XEvent*) event,
(String *)NULL, (Cardinal)0); (String *)NULL, (Cardinal*)NULL);
} }
else else
Disarm (w, (XEvent*) event, Disarm (w, (XEvent*) event,
(String *)NULL, (Cardinal)0); (String *)NULL, (Cardinal*)NULL);
} }
} }
else if (event_mask & XmHELP_EVENT) else if (event_mask & XmHELP_EVENT)
_XmSocorro (w, (XEvent *)event, _XmSocorro (w, (XEvent *)event,
(String *)NULL,(Cardinal)0); (String *)NULL,(Cardinal*)NULL);
else if (event_mask & XmENTER_EVENT) else if (event_mask & XmENTER_EVENT)
Enter (w, (XEvent *)event, (String *)NULL,(Cardinal)0); Enter (w, (XEvent *)event, (String *)NULL,(Cardinal*)NULL);
else if (event_mask & XmLEAVE_EVENT) else if (event_mask & XmLEAVE_EVENT)
Leave (w, (XEvent *)event, (String *)NULL,(Cardinal)0); Leave (w, (XEvent *)event, (String *)NULL,(Cardinal*)NULL);
else if (event_mask & XmFOCUS_IN_EVENT) else if (event_mask & XmFOCUS_IN_EVENT)
_XmFocusInGadget (w, (XEvent *)event, _XmFocusInGadget (w, (XEvent *)event,
(String *)NULL,(Cardinal)0); (String *)NULL,(Cardinal*)NULL);
else if (event_mask & XmFOCUS_OUT_EVENT) else if (event_mask & XmFOCUS_OUT_EVENT)
_XmFocusOutGadget (w, (XEvent *)event, _XmFocusOutGadget (w, (XEvent *)event,
(String *)NULL,(Cardinal)0); (String *)NULL,(Cardinal*)NULL);
} }
@ -860,7 +860,7 @@ Enter(
{ {
DtButtonGadget bg = (DtButtonGadget) wid ; DtButtonGadget bg = (DtButtonGadget) wid ;
_XmEnterGadget (wid, (XEvent *)event, (String *)NULL,(Cardinal *)0); _XmEnterGadget (wid, (XEvent *)event, (String *)NULL,(Cardinal *)NULL);
if (B_Armed (bg)) if (B_Armed (bg))
B_Expose (wid, event, NULL); B_Expose (wid, event, NULL);

2
cde/programs/dtwm/Clock.c
View file

@ -933,7 +933,7 @@ Draw(
if (g->clock.numseg != 0) if (g->clock.numseg != 0)
EraseHands (g, (struct tm *) 0); EraseHands (g, (struct tm *) 0);
ClockTick ((XtPointer)g, (XtIntervalId)0); ClockTick ((XtPointer)g, (XtIntervalId*)NULL);
/* Draw shadow. /* Draw shadow.
*/ */

1
cde/programs/dtwm/WmOL.c
View file

@ -35,6 +35,7 @@ static char rcsid[] = "$XConsortium: WmOL.c /main/4 1995/11/01 11:45:08 rswiston
/* /*
* Included Files: * Included Files:
*/ */
#include <stdlib.h>
#include "WmGlobal.h" #include "WmGlobal.h"
#include "WmOL.h" #include "WmOL.h"
#include "WmProperty.h" #include "WmProperty.h"