mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
dtfile: Add missing prototypes
Add missing prototypes and header files to the dtfile code in order to move closer towards 64-bit compatibility. Extract the following functions from Motif internal headers: _XmGetWidgetExtData _XmRecordEvent _XmStringUngenerate _XmTextFieldSetDestination _XmGetActiveTopLevelMenu Extract manually prototypes of the obsolete Motif interface: _XmHighlightBorder _XmUnhighlightBorder Remove XmPrivate.h if extractprototype.awk fails Make the following header files available via -I: codelibs/boolean.h codelibs/pathutils.h codelibs/shellutils.h and remove shellutils.h from dtwm directory.
This commit is contained in:
parent
f55dfc34c0
commit
1079b56422
43 changed files with 240 additions and 99 deletions
|
@ -13,7 +13,7 @@ ALLHEADERS = *.h
|
|||
BuildIncludes($(HEADERS),Xm,..)
|
||||
|
||||
XmPrivate.h: extractprototype.awk
|
||||
awk -f extractprototype.awk $(MLIBSRC)/Xm/$(ALLHEADERS) > $@
|
||||
awk -f extractprototype.awk $(MLIBSRC)/Xm/$(ALLHEADERS) > $@ || rm -f $@
|
||||
|
||||
depend::
|
||||
|
||||
|
|
|
@ -26,6 +26,13 @@ extern void _XmPopWidgetExtData(
|
|||
#else
|
||||
unsigned char extType) ;
|
||||
#endif /* NeedWidePrototypes */
|
||||
extern XmWidgetExtData _XmGetWidgetExtData(
|
||||
Widget widget,
|
||||
#if NeedWidePrototypes
|
||||
unsigned int extType) ;
|
||||
#else
|
||||
unsigned char extType) ;
|
||||
#endif /* NeedWidePrototypes */
|
||||
/* Extracted from MenuStateI.h */
|
||||
extern void _XmSetInDragMode(
|
||||
Widget widget,
|
||||
|
@ -44,6 +51,10 @@ extern int _XmGrabPointer(
|
|||
Window confine_to,
|
||||
Cursor cursor,
|
||||
Time time) ;
|
||||
/* Extracted from RCMenuI.h */
|
||||
extern void _XmGetActiveTopLevelMenu(
|
||||
Widget wid,
|
||||
Widget *rwid);
|
||||
/* Extracted from SyntheticI.h */
|
||||
extern void _XmExtGetValuesHook(
|
||||
Widget w,
|
||||
|
@ -53,6 +64,11 @@ extern void _XmGadgetImportSecondaryArgs(
|
|||
Widget w,
|
||||
ArgList args,
|
||||
Cardinal *num_args) ;
|
||||
/* Extracted from TextFI.h */
|
||||
extern Boolean _XmTextFieldSetDestination(
|
||||
Widget w,
|
||||
XmTextPosition position,
|
||||
Time set_time) ;
|
||||
/* Extracted from TextStrSoI.h */
|
||||
extern char * _XmStringSourceGetString(XmTextWidget tw,
|
||||
XmTextPosition from,
|
||||
|
@ -90,6 +106,7 @@ extern Boolean _XmShellIsExclusive(
|
|||
Widget wid) ;
|
||||
/* Extracted from UniqueEvnI.h */
|
||||
extern Boolean _XmIsEventUnique(XEvent *event) ;
|
||||
extern void _XmRecordEvent(XEvent *event) ;
|
||||
/* Extracted from VendorSI.h */
|
||||
extern void _XmAddGrab(
|
||||
Widget wid,
|
||||
|
@ -121,6 +138,11 @@ extern void _XmClearShadowType(
|
|||
Dimension old_shadow_thickness,
|
||||
Dimension old_highlight_thickness) ;
|
||||
#endif /* NeedWidePrototypes */
|
||||
/* Extracted from XmStringI.h */
|
||||
extern XtPointer _XmStringUngenerate (XmString string,
|
||||
XmStringTag tag,
|
||||
XmTextType tag_type,
|
||||
XmTextType output_type);
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -45,6 +45,7 @@ function proto() {
|
|||
/_XmLeaveGadget/ { proto(); }
|
||||
/_XmPushWidgetExtData/ { proto(); }
|
||||
/_XmPopWidgetExtData/ { proto(); }
|
||||
/_XmGetWidgetExtData/ { proto(); }
|
||||
/_XmGadgetImportSecondaryArgs/ { proto(); }
|
||||
/_XmExtImportArgs/ { proto(); }
|
||||
/_XmExtGetValuesHook/ { proto(); }
|
||||
|
@ -52,6 +53,10 @@ function proto() {
|
|||
/_XmFocusInGadget/ { proto(); }
|
||||
/_XmFocusOutGadget/ { proto(); }
|
||||
/_XmIsEventUnique/ { proto(); }
|
||||
/_XmRecordEvent/ { proto(); }
|
||||
/_XmSetInDragMode/ { proto(); }
|
||||
/_XmStringSourceGetString/ { proto(); }
|
||||
/_XmStringUngenerate/ { proto(); }
|
||||
/_XmShellIsExclusive/ { proto(); }
|
||||
/_XmTextFieldSetDestination/ { proto(); }
|
||||
/_XmGetActiveTopLevelMenu/ { proto(); }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue