diff options
| author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2011-08-24 04:23:57 -0500 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2011-08-24 23:34:51 -0500 |
| commit | a4c27e1e353978aeb78cfb9a3f4dda7689119ee9 (patch) | |
| tree | e1ff9c075cd89e9d1fc88d610261ac3f68c82f4c | |
| parent | dc03ee95bc990e22094360c3b0c801ae2fdeed8e (diff) | |
unifdef -DNeedFunctionPrototypes -DNeedVarargsPrototypes
This is the first step to removing old-style function definition warnings.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Acked-by: Gaetan Nadon <memsize@videotron.ca>
42 files changed, 0 insertions, 732 deletions
diff --git a/include/X11/Xaw3d/AsciiSrc.h b/include/X11/Xaw3d/AsciiSrc.h index fc48aeb..edcf874 100644 --- a/include/X11/Xaw3d/AsciiSrc.h +++ b/include/X11/Xaw3d/AsciiSrc.h @@ -111,9 +111,7 @@ _XFUNCPROTOBEGIN */ extern void XawAsciiSourceFreeString( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); /* Function Name: XawAsciiSave @@ -123,9 +121,7 @@ extern void XawAsciiSourceFreeString( */ extern Boolean XawAsciiSave( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); /* Function Name: XawAsciiSaveAsFile @@ -136,10 +132,8 @@ extern Boolean XawAsciiSave( */ extern Boolean XawAsciiSaveAsFile( -#if NeedFunctionPrototypes Widget /* w */, _Xconst char* /* name */ -#endif ); /* Function Name: XawAsciiSourceChanged @@ -149,9 +143,7 @@ extern Boolean XawAsciiSaveAsFile( */ extern Boolean XawAsciiSourceChanged( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); _XFUNCPROTOEND diff --git a/include/X11/Xaw3d/Dialog.h b/include/X11/Xaw3d/Dialog.h index 3fafe6f..0ff19e5 100644 --- a/include/X11/Xaw3d/Dialog.h +++ b/include/X11/Xaw3d/Dialog.h @@ -88,18 +88,14 @@ extern WidgetClass dialogWidgetClass; _XFUNCPROTOBEGIN extern void XawDialogAddButton( -#if NeedFunctionPrototypes Widget /* dialog */, _Xconst char* /* name */, XtCallbackProc /* function */, XtPointer /* client_data */ -#endif ); extern char *XawDialogGetValueString( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); _XFUNCPROTOEND diff --git a/include/X11/Xaw3d/Form.h b/include/X11/Xaw3d/Form.h index 0ea2a9f..f533992 100644 --- a/include/X11/Xaw3d/Form.h +++ b/include/X11/Xaw3d/Form.h @@ -150,14 +150,12 @@ extern WidgetClass formWidgetClass; _XFUNCPROTOBEGIN extern void XawFormDoLayout( -#if NeedFunctionPrototypes Widget /* w */, #if NeedWidePrototypes /* Boolean */ int /* do_layout */ #else Boolean /* do_layout */ #endif -#endif ); _XFUNCPROTOEND diff --git a/include/X11/Xaw3d/List.h b/include/X11/Xaw3d/List.h index fe97197..9481744 100644 --- a/include/X11/Xaw3d/List.h +++ b/include/X11/Xaw3d/List.h @@ -180,7 +180,6 @@ _XFUNCPROTOBEGIN */ extern void XawListChange( -#if NeedFunctionPrototypes Widget /* w */, String* /* list */, int /* nitems */, @@ -190,7 +189,6 @@ extern void XawListChange( #else Boolean /* resize */ #endif -#endif ); /* Function Name: XawListUnhighlight @@ -200,9 +198,7 @@ extern void XawListChange( */ extern void XawListUnhighlight( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); /* Function Name: XawListHighlight @@ -213,10 +209,8 @@ extern void XawListUnhighlight( */ extern void XawListHighlight( -#if NeedFunctionPrototypes Widget /* w */, int /* item */ -#endif ); @@ -227,9 +221,7 @@ extern void XawListHighlight( */ extern XawListReturnStruct * XawListShowCurrent( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); _XFUNCPROTOEND diff --git a/include/X11/Xaw3d/MultiSinkP.h b/include/X11/Xaw3d/MultiSinkP.h index 57b79ec..5f6c14d 100644 --- a/include/X11/Xaw3d/MultiSinkP.h +++ b/include/X11/Xaw3d/MultiSinkP.h @@ -143,12 +143,10 @@ typedef struct _MultiSinkRec { *******************************************/ extern void _XawMultiSinkPosToXY( -#if NeedFunctionPrototypes Widget /* w */, XawTextPosition /* pos */, Position * /* x */, Position * /*y */ -#endif ); #endif /* _XawMultiSinkP_h */ diff --git a/include/X11/Xaw3d/MultiSrc.h b/include/X11/Xaw3d/MultiSrc.h index 400b697..a7c2f77 100644 --- a/include/X11/Xaw3d/MultiSrc.h +++ b/include/X11/Xaw3d/MultiSrc.h @@ -124,22 +124,16 @@ _XFUNCPROTOBEGIN extern void XawMultiSourceFreeString( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); extern Boolean _XawMultiSave( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); extern Boolean _XawMultiSaveAsFile( -#if NeedFunctionPrototypes Widget /* w */, _Xconst char* /* name */ -#endif ); diff --git a/include/X11/Xaw3d/MultiSrcP.h b/include/X11/Xaw3d/MultiSrcP.h index 9d7ee9a..487b5ba 100644 --- a/include/X11/Xaw3d/MultiSrcP.h +++ b/include/X11/Xaw3d/MultiSrcP.h @@ -183,10 +183,6 @@ typedef struct _MultiSrcRec { MultiSrcPart multi_src; } MultiSrcRec; -#if NeedFunctionPrototypes extern void _XawMultiSourceFreeString( Widget ); -#else -extern void _XawMultiSourceFreeString(); -#endif #endif /* _XawMultiSrcP_h --- Don't add anything after this line. */ diff --git a/include/X11/Xaw3d/Paned.h b/include/X11/Xaw3d/Paned.h index d7759cb..f88226d 100644 --- a/include/X11/Xaw3d/Paned.h +++ b/include/X11/Xaw3d/Paned.h @@ -175,11 +175,9 @@ _XFUNCPROTOBEGIN */ extern void XawPanedSetMinMax( -#if NeedFunctionPrototypes Widget /* w */, int /* min */, int /* max */ -#endif ); /* Function Name: XawPanedGetMinMax @@ -190,11 +188,9 @@ extern void XawPanedSetMinMax( */ extern void XawPanedGetMinMax( -#if NeedFunctionPrototypes Widget /* w */, int * /* min_return */, int * /* max_return */ -#endif ); /* Function Name: XawPanedSetRefigureMode @@ -206,14 +202,12 @@ extern void XawPanedGetMinMax( */ extern void XawPanedSetRefigureMode( -#if NeedFunctionPrototypes Widget /* w */, #if NeedWidePrototypes /* Boolean */ int /* mode */ #else Boolean /* mode */ #endif -#endif ); /* Function Name: XawPanedGetNumSub @@ -223,9 +217,7 @@ extern void XawPanedSetRefigureMode( */ extern int XawPanedGetNumSub( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); /* Function Name: XawPanedAllowResize @@ -236,14 +228,12 @@ extern int XawPanedGetNumSub( */ extern void XawPanedAllowResize( -#if NeedFunctionPrototypes Widget /* w */, #if NeedWidePrototypes /* Boolean */ int /* allow_resize */ #else Boolean /* allow_resize */ #endif -#endif ); _XFUNCPROTOEND diff --git a/include/X11/Xaw3d/Scrollbar.h b/include/X11/Xaw3d/Scrollbar.h index 53d3344..2176fe3 100644 --- a/include/X11/Xaw3d/Scrollbar.h +++ b/include/X11/Xaw3d/Scrollbar.h @@ -127,7 +127,6 @@ extern WidgetClass scrollbarWidgetClass; _XFUNCPROTOBEGIN extern void XawScrollbarSetThumb( -#if NeedFunctionPrototypes Widget /* scrollbar */, #if NeedWidePrototypes /* float */ double /* top */, @@ -136,7 +135,6 @@ extern void XawScrollbarSetThumb( float /* top */, float /* shown */ #endif -#endif ); _XFUNCPROTOEND diff --git a/include/X11/Xaw3d/SimpleMenu.h b/include/X11/Xaw3d/SimpleMenu.h index dfc9107..b8ffc18 100644 --- a/include/X11/Xaw3d/SimpleMenu.h +++ b/include/X11/Xaw3d/SimpleMenu.h @@ -123,9 +123,7 @@ _XFUNCPROTOBEGIN */ extern void XawSimpleMenuAddGlobalActions( -#if NeedFunctionPrototypes XtAppContext /* app_con */ -#endif ); /* Function Name: XawSimpleMenuGetActiveEntry @@ -135,9 +133,7 @@ extern void XawSimpleMenuAddGlobalActions( */ extern Widget XawSimpleMenuGetActiveEntry( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); /* Function Name: XawSimpleMenuClearActiveEntry @@ -147,9 +143,7 @@ extern Widget XawSimpleMenuGetActiveEntry( */ extern void XawSimpleMenuClearActiveEntry( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); _XFUNCPROTOEND diff --git a/include/X11/Xaw3d/SmeThreeD.h b/include/X11/Xaw3d/SmeThreeD.h index 645f3d4..54f749c 100644 --- a/include/X11/Xaw3d/SmeThreeD.h +++ b/include/X11/Xaw3d/SmeThreeD.h @@ -74,17 +74,13 @@ extern WidgetClass smeThreeDWidgetClass; _XFUNCPROTOBEGIN extern void XawSme3dComputeTopShadowRGB ( -#if NeedFunctionPrototypes Widget /* new */, XColor* /* xcol_out */ -#endif ); extern void XawSme3dComputeBottomShadowRGB ( -#if NeedFunctionPrototypes Widget /* new */, XColor* /* xcol_out */ -#endif ); _XFUNCPROTOEND diff --git a/include/X11/Xaw3d/SmeThreeDP.h b/include/X11/Xaw3d/SmeThreeDP.h index 3a30ca1..e2211b9 100644 --- a/include/X11/Xaw3d/SmeThreeDP.h +++ b/include/X11/Xaw3d/SmeThreeDP.h @@ -54,9 +54,7 @@ typedef struct _SmeThreeDRec { } SmeThreeDRec; typedef void (*XawSme3dShadowDrawProc)( -#if NeedFunctionPrototypes Widget -#endif ); typedef struct { diff --git a/include/X11/Xaw3d/Text.h b/include/X11/Xaw3d/Text.h index baf3f39..5e546ea 100644 --- a/include/X11/Xaw3d/Text.h +++ b/include/X11/Xaw3d/Text.h @@ -170,110 +170,79 @@ typedef struct _TextRec *TextWidget; _XFUNCPROTOBEGIN extern XrmQuark _XawTextFormat( -#if NeedFunctionPrototypes TextWidget /* tw */ -#endif ); extern void XawTextDisplay( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); extern void XawTextEnableRedisplay( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); extern void XawTextDisableRedisplay( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); extern void XawTextSetSelectionArray( -#if NeedFunctionPrototypes Widget /* w */, XawTextSelectType* /* sarray */ -#endif ); extern void XawTextGetSelectionPos( -#if NeedFunctionPrototypes Widget /* w */, XawTextPosition* /* begin_return */, XawTextPosition* /* end_return */ -#endif ); extern void XawTextSetSource( -#if NeedFunctionPrototypes Widget /* w */, Widget /* source */, XawTextPosition /* position */ -#endif ); extern int XawTextReplace( -#if NeedFunctionPrototypes Widget /* w */, XawTextPosition /* start */, XawTextPosition /* end */, XawTextBlock* /* text */ -#endif ); extern XawTextPosition XawTextTopPosition( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); extern void XawTextSetInsertionPoint( -#if NeedFunctionPrototypes Widget /* w */, XawTextPosition /* position */ -#endif ); extern XawTextPosition XawTextGetInsertionPoint( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); extern void XawTextUnsetSelection( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); extern void XawTextSetSelection( -#if NeedFunctionPrototypes Widget /* w */, XawTextPosition /* left */, XawTextPosition /* right */ -#endif ); extern void XawTextInvalidate( -#if NeedFunctionPrototypes Widget /* w */, XawTextPosition /* from */, XawTextPosition /* to */ -#endif ); extern Widget XawTextGetSource( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); extern XawTextPosition XawTextSearch( -#if NeedFunctionPrototypes Widget /* w */, #if NeedWidePrototypes /* XawTextScanDirection */ int /* dir */, @@ -281,18 +250,15 @@ extern XawTextPosition XawTextSearch( XawTextScanDirection /* dir */, #endif XawTextBlock* /* text */ -#endif ); extern void XawTextDisplayCaret( -#if NeedFunctionPrototypes Widget /* w */, #if NeedWidePrototypes /* Boolean */ int /* visible */ #else Boolean /* visible */ #endif -#endif ); _XFUNCPROTOEND diff --git a/include/X11/Xaw3d/TextP.h b/include/X11/Xaw3d/TextP.h index aa868c1..25515b3 100644 --- a/include/X11/Xaw3d/TextP.h +++ b/include/X11/Xaw3d/TextP.h @@ -248,36 +248,28 @@ typedef struct _TextRec { *******************************************/ extern void _XawTextBuildLineTable ( -#if NeedFunctionPrototypes TextWidget /*ctx*/, XawTextPosition /*top pos*/, _XtBoolean /* force_rebuild */ -#endif ); extern char* _XawTextGetSTRING( -#if NeedFunctionPrototypes TextWidget /*ctx*/, XawTextPosition /*left*/, XawTextPosition /*right*/ -#endif ); extern void _XawTextSaltAwaySelection( -#if NeedFunctionPrototypes TextWidget /*ctx*/, Atom* /*selections*/, int /*num_atoms*/ -#endif ); extern void _XawTextPosToXY( -#if NeedFunctionPrototypes Widget /* w */, XawTextPosition /* pos */, Position * /* x */, Position * /*y */ -#endif ); #endif /* _XawTextP_h */ diff --git a/include/X11/Xaw3d/TextSink.h b/include/X11/Xaw3d/TextSink.h index 96d0d43..be6ceb8 100644 --- a/include/X11/Xaw3d/TextSink.h +++ b/include/X11/Xaw3d/TextSink.h @@ -97,7 +97,6 @@ _XFUNCPROTOBEGIN */ extern void XawTextSinkDisplayText( -#if NeedFunctionPrototypes Widget /* w */, #if NeedWidePrototypes /* Position */ int /* x */, @@ -113,7 +112,6 @@ extern void XawTextSinkDisplayText( #else Boolean /* highlight */ #endif -#endif ); /* Function Name: XawTextSinkInsertCursor @@ -128,7 +126,6 @@ extern void XawTextSinkDisplayText( */ extern void XawTextSinkInsertCursor( -#if NeedFunctionPrototypes Widget /* w */, #if NeedWidePrototypes /* Position */ int /* x */, @@ -139,7 +136,6 @@ extern void XawTextSinkInsertCursor( Position /* y */, XawTextInsertState /* state */ #endif -#endif ); /* Function Name: XawTextSinkClearToBackground @@ -154,7 +150,6 @@ extern void XawTextSinkInsertCursor( */ extern void XawTextSinkClearToBackground( -#if NeedFunctionPrototypes Widget /* w */, #if NeedWidePrototypes /* Position */ int /* x */, @@ -167,7 +162,6 @@ extern void XawTextSinkClearToBackground( Dimension /* width */, Dimension /* height */ #endif -#endif ); /* Function Name: XawTextSinkFindPosition @@ -184,7 +178,6 @@ extern void XawTextSinkClearToBackground( */ extern void XawTextSinkFindPosition( -#if NeedFunctionPrototypes Widget /* w */, XawTextPosition /* fromPos */, int /* fromX */, @@ -197,7 +190,6 @@ extern void XawTextSinkFindPosition( XawTextPosition* /* pos_return */, int* /* width_return */, int* /* height_return */ -#endif ); /* Function Name: XawTextSinkFindDistance @@ -213,7 +205,6 @@ extern void XawTextSinkFindPosition( */ extern void XawTextSinkFindDistance ( -#if NeedFunctionPrototypes Widget /* w */, XawTextPosition /* fromPos */, int /* fromX */, @@ -221,7 +212,6 @@ extern void XawTextSinkFindDistance ( int* /* width_return */, XawTextPosition* /* pos_return */, int* /* height_return */ -#endif ); /* Function Name: XawTextSinkResolve @@ -235,13 +225,11 @@ extern void XawTextSinkFindDistance ( */ extern void XawTextSinkResolve( -#if NeedFunctionPrototypes Widget /* w */, XawTextPosition /* fromPos */, int /* fromX */, int /* width */, XawTextPosition* /* pos_return */ -#endif ); /* Function Name: XawTextSinkMaxLines @@ -253,14 +241,12 @@ extern void XawTextSinkResolve( */ extern int XawTextSinkMaxLines( -#if NeedFunctionPrototypes Widget /* w */, #if NeedWidePrototypes /* Dimension */ int /* height */ #else Dimension /* height */ #endif -#endif ); /* Function Name: XawTextSinkMaxHeight @@ -272,10 +258,8 @@ extern int XawTextSinkMaxLines( */ extern int XawTextSinkMaxHeight( -#if NeedFunctionPrototypes Widget /* w */, int /* lines */ -#endif ); /* Function Name: XawTextSinkSetTabs @@ -287,11 +271,9 @@ extern int XawTextSinkMaxHeight( */ extern void XawTextSinkSetTabs( -#if NeedFunctionPrototypes Widget /* w */, int /* tab_count */, int* /* tabs */ -#endif ); /* Function Name: XawTextSinkGetCursorBounds @@ -302,10 +284,8 @@ extern void XawTextSinkSetTabs( */ extern void XawTextSinkGetCursorBounds( -#if NeedFunctionPrototypes Widget /* w */, XRectangle* /* rect_return */ -#endif ); _XFUNCPROTOEND diff --git a/include/X11/Xaw3d/TextSrc.h b/include/X11/Xaw3d/TextSrc.h index 77c7f21..37f2a31 100644 --- a/include/X11/Xaw3d/TextSrc.h +++ b/include/X11/Xaw3d/TextSrc.h @@ -104,12 +104,10 @@ _XFUNCPROTOBEGIN */ extern XawTextPosition XawTextSourceRead( -#if NeedFunctionPrototypes Widget /* w */, XawTextPosition /* pos */, XawTextBlock* /* text_return */, int /* length */ -#endif ); /* Function Name: XawTextSourceReplace. @@ -121,12 +119,10 @@ extern XawTextPosition XawTextSourceRead( */ extern int XawTextSourceReplace ( -#if NeedFunctionPrototypes Widget /* w */, XawTextPosition /* start */, XawTextPosition /* end */, XawTextBlock* /* text */ -#endif ); /* Function Name: XawTextSourceScan @@ -144,7 +140,6 @@ extern int XawTextSourceReplace ( */ extern XawTextPosition XawTextSourceScan( -#if NeedFunctionPrototypes Widget /* w */, XawTextPosition /* position */, #if NeedWidePrototypes @@ -160,7 +155,6 @@ extern XawTextPosition XawTextSourceScan( #else Boolean /* include */ #endif -#endif ); /* Function Name: XawTextSourceSearch @@ -174,7 +168,6 @@ extern XawTextPosition XawTextSourceScan( */ extern XawTextPosition XawTextSourceSearch( -#if NeedFunctionPrototypes Widget /* w */, XawTextPosition /* position */, #if NeedWidePrototypes @@ -183,7 +176,6 @@ extern XawTextPosition XawTextSourceSearch( XawTextScanDirection /* dir */, #endif XawTextBlock* /* text */ -#endif ); /* Function Name: XawTextSourceConvertSelection @@ -199,7 +191,6 @@ extern XawTextPosition XawTextSourceSearch( */ extern Boolean XawTextSourceConvertSelection( -#if NeedFunctionPrototypes Widget /* w */, Atom* /* selection */, Atom* /* target */, @@ -207,7 +198,6 @@ extern Boolean XawTextSourceConvertSelection( XtPointer* /* value_return */, unsigned long* /* length_return */, int* /* format_return */ -#endif ); /* Function Name: XawTextSourceSetSelection @@ -219,12 +209,10 @@ extern Boolean XawTextSourceConvertSelection( */ extern void XawTextSourceSetSelection( -#if NeedFunctionPrototypes Widget /* w */, XawTextPosition /* start */, XawTextPosition /* end */, Atom /* selection */ -#endif ); _XFUNCPROTOEND diff --git a/include/X11/Xaw3d/TextSrcP.h b/include/X11/Xaw3d/TextSrcP.h index b80741e..d944849 100644 --- a/include/X11/Xaw3d/TextSrcP.h +++ b/include/X11/Xaw3d/TextSrcP.h @@ -120,19 +120,15 @@ typedef struct _TextSrcRec { ******************************************************************/ char* _XawTextWCToMB( -#if NeedFunctionPrototypes Display* /* d */, wchar_t* /* wstr */, int* /* len_in_out */ -#endif ); wchar_t* _XawTextMBToWC( -#if NeedFunctionPrototypes Display* /* d */, char* /* str */, int* /* len_in_out */ -#endif ); /************************************************************ diff --git a/include/X11/Xaw3d/ThreeD.h b/include/X11/Xaw3d/ThreeD.h index d23487a..bae181a 100644 --- a/include/X11/Xaw3d/ThreeD.h +++ b/include/X11/Xaw3d/ThreeD.h @@ -84,21 +84,16 @@ extern WidgetClass threeDWidgetClass; _XFUNCPROTOBEGIN extern void Xaw3dComputeTopShadowRGB ( -#if NeedFunctionPrototypes Widget /* new */, XColor* /* xcol_out */ -#endif ); extern void Xaw3dComputeBottomShadowRGB ( -#if NeedFunctionPrototypes Widget /* new */, XColor* /* xcol_out */ -#endif ); extern void _ShadowSurroundedBox ( -#if NeedFunctionPrototypes Widget, ThreeDWidget, Position, @@ -107,7 +102,6 @@ extern void _ShadowSurroundedBox ( Position, XtRelief, Boolean -#endif ); _XFUNCPROTOEND diff --git a/include/X11/Xaw3d/Tip.h b/include/X11/Xaw3d/Tip.h index b27f58a..4b4798c 100644 --- a/include/X11/Xaw3d/Tip.h +++ b/include/X11/Xaw3d/Tip.h @@ -108,10 +108,8 @@ extern WidgetClass tipWidgetClass; * Enables the tip event handler for this widget. */ void XawTipEnable( -#if NeedFunctionPrototypes Widget, String -#endif ); /* @@ -125,9 +123,7 @@ void XawTipEnable( * Disables the tip event handler for this widget. */ void XawTipDisable( -#if NeedFunctionPrototypes Widget -#endif ); #endif /* _XawTip_h */ diff --git a/include/X11/Xaw3d/Toggle.h b/include/X11/Xaw3d/Toggle.h index 9e1e670..15acf87 100644 --- a/include/X11/Xaw3d/Toggle.h +++ b/include/X11/Xaw3d/Toggle.h @@ -124,10 +124,8 @@ _XFUNCPROTOBEGIN */ extern void XawToggleChangeRadioGroup( -#if NeedFunctionPrototypes Widget /* w */, Widget /* radio_group */ -#endif ); /* Function Name: XawToggleGetCurrent @@ -138,9 +136,7 @@ extern void XawToggleChangeRadioGroup( */ extern XtPointer XawToggleGetCurrent( -#if NeedFunctionPrototypes Widget /* radio_group */ -#endif ); /* Function Name: XawToggleSetCurrent @@ -152,10 +148,8 @@ extern XtPointer XawToggleGetCurrent( */ extern void XawToggleSetCurrent( -#if NeedFunctionPrototypes Widget /* radio_group */, XtPointer /* radio_data */ -#endif ); /* Function Name: XawToggleUnsetCurrent @@ -165,9 +159,7 @@ extern void XawToggleSetCurrent( */ extern void XawToggleUnsetCurrent( -#if NeedFunctionPrototypes Widget /* radio_group */ -#endif ); _XFUNCPROTOEND diff --git a/include/X11/Xaw3d/Tree.h b/include/X11/Xaw3d/Tree.h index 6e40933..5d74e33 100644 --- a/include/X11/Xaw3d/Tree.h +++ b/include/X11/Xaw3d/Tree.h @@ -113,9 +113,7 @@ typedef struct _TreeRec *TreeWidget; _XFUNCPROTOBEGIN extern void XawTreeForceLayout ( -#if NeedFunctionPrototypes Widget /* tree */ -#endif ); _XFUNCPROTOEND diff --git a/include/X11/Xaw3d/Viewport.h b/include/X11/Xaw3d/Viewport.h index 266934e..eae955a 100644 --- a/include/X11/Xaw3d/Viewport.h +++ b/include/X11/Xaw3d/Viewport.h @@ -92,7 +92,6 @@ typedef struct _ViewportRec *ViewportWidget; _XFUNCPROTOBEGIN extern void XawViewportSetLocation ( -#if NeedFunctionPrototypes Widget /* gw */, #if NeedWidePrototypes /* float */ double /* xoff */, @@ -101,11 +100,9 @@ extern void XawViewportSetLocation ( float /* xoff */, float /* yoff */ #endif -#endif ); extern void XawViewportSetCoordinates ( -#if NeedFunctionPrototypes Widget /* gw */, #if NeedWidePrototypes /* Position */ int /* x */, @@ -114,7 +111,6 @@ extern void XawViewportSetCoordinates ( Position /* x */, Position /* y */ #endif -#endif ); _XFUNCPROTOEND diff --git a/include/X11/Xaw3d/Xaw3dP.h b/include/X11/Xaw3d/Xaw3dP.h index 391bde3..8e46515 100644 --- a/include/X11/Xaw3d/Xaw3dP.h +++ b/include/X11/Xaw3d/Xaw3dP.h @@ -57,11 +57,9 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifdef XAW_GRAY_BLKWHT_STIPPLES extern unsigned long grayPixel( -#if NeedFunctionPrototypes unsigned long, Display *, Screen * -#endif ); #else #define grayPixel(p, dpy, scn) (p) @@ -70,13 +68,11 @@ grayPixel( #ifdef XAW_MULTIPLANE_PIXMAPS extern Pixmap stipplePixmap( -#if NeedFunctionPrototypes Widget, Pixmap, Colormap, Pixel, unsigned int -#endif ); #endif diff --git a/include/X11/Xaw3d/XawImP.h b/include/X11/Xaw3d/XawImP.h index 3799bd1..470e1b3 100644 --- a/include/X11/Xaw3d/XawImP.h +++ b/include/X11/Xaw3d/XawImP.h @@ -125,114 +125,82 @@ typedef struct _contextErrDataRec } contextErrDataRec; void _XawImResizeVendorShell( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); Dimension _XawImGetShellHeight( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); void _XawImRealize( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); void _XawImInitialize( -#if NeedFunctionPrototypes Widget, /* w */ Widget /* ext */ -#endif ); void _XawImReconnect( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); void _XawImRegister( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); void _XawImUnregister( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); void _XawImSetValues( -#if NeedFunctionPrototypes Widget, /* w */ ArgList, /* args */ Cardinal /* num_args */ -#endif ); /* DON'T USE THIS FUNCTION -- it's going away in the next release */ void _XawImVASetValues( -#if NeedVarargsPrototypes Widget, /* w */ ... -#endif ); void _XawImSetFocusValues( -#if NeedFunctionPrototypes Widget, /* w */ ArgList, /* args */ Cardinal /* num_args */ -#endif ); /* DON'T USE THIS FUNCTION -- it's going away in the next release */ void _XawImVASetFocusValues( -#if NeedVarargsPrototypes Widget, /* w */ ... -#endif ); void _XawImUnsetFocus( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); int _XawImWcLookupString( -#if NeedFunctionPrototypes Widget, /* w */ XKeyPressedEvent*, /* event */ wchar_t*, /* buffer_return */ int, /* bytes_buffer */ KeySym*, /* keysym_return */ Status* /* status return */ -#endif ); int _XawImGetImAreaHeight( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); void _XawImCallVendorShellExtResize( -#if NeedFunctionPrototypes Widget /* w */ -#endif ); void _XawImDestroy( -#if NeedFunctionPrototypes Widget, /* w */ Widget /* ext */ -#endif ); #endif /* _XawImP_h */ diff --git a/src/AsciiSrc.c b/src/AsciiSrc.c index 668cc8d..4a5373b 100644 --- a/src/AsciiSrc.c +++ b/src/AsciiSrc.c @@ -736,12 +736,7 @@ Widget w; */ void -#if NeedFunctionPrototypes XawAsciiSourceFreeString(Widget w) -#else -XawAsciiSourceFreeString(w) -Widget w; -#endif { AsciiSrcObject src = (AsciiSrcObject) w; @@ -778,12 +773,7 @@ Widget w; */ Boolean -#if NeedFunctionPrototypes XawAsciiSave(Widget w) -#else -XawAsciiSave(w) -Widget w; -#endif { AsciiSrcObject src = (AsciiSrcObject) w; @@ -846,13 +836,7 @@ Widget w; */ Boolean -#if NeedFunctionPrototypes XawAsciiSaveAsFile(Widget w, _Xconst char* name) -#else -XawAsciiSaveAsFile(w, name) -Widget w; -String name; -#endif { AsciiSrcObject src = (AsciiSrcObject) w; String string; @@ -889,12 +873,7 @@ String name; */ Boolean -#if NeedFunctionPrototypes XawAsciiSourceChanged(Widget w) -#else -XawAsciiSourceChanged(w) -Widget w; -#endif { #ifdef XAW_INTERNATIONALIZATION if ( XtIsSubclass( w, multiSrcObjectClass ) ) diff --git a/src/Dialog.c b/src/Dialog.c index 2de2d09..e8a764d 100644 --- a/src/Dialog.c +++ b/src/Dialog.c @@ -405,16 +405,8 @@ Widget w; void -#if NeedFunctionPrototypes XawDialogAddButton(Widget dialog, _Xconst char* name, XtCallbackProc function, XtPointer param) -#else -XawDialogAddButton(dialog, name, function, param) -Widget dialog; -String name; -XtCallbackProc function; -XtPointer param; -#endif { /* * Correct Constraints are all set in ConstraintInitialize(). @@ -430,12 +422,7 @@ XtPointer param; char * -#if NeedFunctionPrototypes XawDialogGetValueString(Widget w) -#else -XawDialogGetValueString(w) -Widget w; -#endif { Arg args[1]; char * value; @@ -801,18 +801,12 @@ static XtGeometryResult PreferredGeometry( widget, request, reply ) */ void -#if NeedFunctionPrototypes XawFormDoLayout(Widget w, #if NeedWidePrototypes int doit) #else Boolean doit) #endif -#else -XawFormDoLayout(w, doit) -Widget w; -Boolean doit; -#endif { Widget *childP; FormWidget fw = (FormWidget)w; @@ -1102,20 +1102,12 @@ static void Destroy(w) */ void -#if NeedFunctionPrototypes XawListChange(Widget w, char ** list, int nitems, int longest, #if NeedWidePrototypes int resize_it) #else Boolean resize_it) #endif -#else -XawListChange(w, list, nitems, longest, resize_it) -Widget w; -char ** list; -int nitems, longest; -Boolean resize_it; -#endif { ListWidget lw = (ListWidget) w; Dimension new_width = w->core.width; @@ -1157,12 +1149,7 @@ Boolean resize_it; */ void -#if NeedFunctionPrototypes XawListUnhighlight(Widget w) -#else -XawListUnhighlight(w) -Widget w; -#endif { ListWidget lw = ( ListWidget ) w; @@ -1179,13 +1166,7 @@ Widget w; */ void -#if NeedFunctionPrototypes XawListHighlight(Widget w, int item) -#else -XawListHighlight(w, item) -Widget w; -int item; -#endif { ListWidget lw = ( ListWidget ) w; @@ -1204,12 +1185,7 @@ int item; */ XawListReturnStruct * -#if NeedFunctionPrototypes XawListShowCurrent(Widget w) -#else -XawListShowCurrent(w) -Widget w; -#endif { ListWidget lw = ( ListWidget ) w; XawListReturnStruct * ret_val; diff --git a/src/MultiSink.c b/src/MultiSink.c index f1c899c..1e60b92 100644 --- a/src/MultiSink.c +++ b/src/MultiSink.c @@ -166,17 +166,10 @@ WidgetClass multiSinkObjectClass = (WidgetClass)&multiSinkClassRec; /* Utilities */ static int -#if NeedFunctionPrototypes CharWidth ( Widget w, int x, wchar_t c) -#else -CharWidth (w, x, c) - Widget w; - int x; - wchar_t c; -#endif { int i, width; MultiSinkObject sink = (MultiSinkObject) w; @@ -666,15 +659,9 @@ MaxLines(w, height) /* ARGSUSED */ static int -#if NeedFunctionPrototypes MaxHeight( Widget w, int lines ) -#else -MaxHeight( w, lines ) - Widget w; - int lines; -#endif { MultiSinkObject sink = (MultiSinkObject) w; XFontSetExtents *ext = XExtentsOfFontSet(sink->multi_sink.fontset); @@ -691,17 +678,10 @@ MaxHeight( w, lines ) */ static void -#if NeedFunctionPrototypes SetTabs( Widget w, int tab_count, short* tabs ) -#else -SetTabs( w, tab_count, tabs ) - Widget w; - int tab_count; - short* tabs; -#endif { MultiSinkObject sink = (MultiSinkObject) w; int i; @@ -758,18 +738,11 @@ SetTabs( w, tab_count, tabs ) } void -#if NeedFunctionPrototypes _XawMultiSinkPosToXY( Widget w, XawTextPosition pos, Position *x, Position *y ) -#else -_XawMultiSinkPosToXY( w, pos, x, y ) - Widget w; - XawTextPosition pos; - Position *x, *y; -#endif { MultiSinkObject sink = (MultiSinkObject) ((TextWidget)w)->text.sink; XFontSetExtents *ext = XExtentsOfFontSet( sink->multi_sink.fontset ); diff --git a/src/MultiSrc.c b/src/MultiSrc.c index 4a655d0..5ca85cb 100644 --- a/src/MultiSrc.c +++ b/src/MultiSrc.c @@ -835,13 +835,8 @@ Destroy (w) */ void -#if NeedFunctionPrototypes _XawMultiSourceFreeString( Widget w) -#else -_XawMultiSourceFreeString(w) - Widget w; -#endif { MultiSrcObject src = (MultiSrcObject) w; @@ -863,13 +858,8 @@ _XawMultiSourceFreeString(w) */ Boolean -#if NeedFunctionPrototypes _XawMultiSave( Widget w) -#else -_XawMultiSave(w) - Widget w; -#endif { MultiSrcObject src = (MultiSrcObject) w; XtAppContext app_con = XtWidgetToApplicationContext(w); @@ -943,15 +933,9 @@ _XawMultiSave(w) */ Boolean -#if NeedFunctionPrototypes _XawMultiSaveAsFile( Widget w, _Xconst char* name) -#else -_XawMultiSaveAsFile(w, name) - Widget w; - String name; -#endif { MultiSrcObject src = (MultiSrcObject) w; String mb_string; diff --git a/src/Paned.c b/src/Paned.c index 107355d..7aa1feb 100644 --- a/src/Paned.c +++ b/src/Paned.c @@ -1840,13 +1840,7 @@ Cardinal *num_args; */ void -#if NeedFunctionPrototypes XawPanedSetMinMax(Widget widget, int min, int max) -#else -XawPanedSetMinMax(widget, min, max) -Widget widget; -int min, max; -#endif { Pane pane = PaneInfo(widget); @@ -1863,13 +1857,7 @@ int min, max; */ void -#if NeedFunctionPrototypes XawPanedGetMinMax(Widget widget, int *min, int *max) -#else -XawPanedGetMinMax(widget, min, max) -Widget widget; -int *min, *max; -#endif { Pane pane = PaneInfo(widget); @@ -1886,18 +1874,12 @@ int *min, *max; */ void -#if NeedFunctionPrototypes XawPanedSetRefigureMode(Widget w, #if NeedWidePrototypes int mode) #else Boolean mode) #endif -#else -XawPanedSetRefigureMode(w, mode) -Widget w; -Boolean mode; -#endif { ((PanedWidget) w)->paned.refiguremode = mode; RefigureLocationsAndCommit( w ); @@ -1910,12 +1892,7 @@ Boolean mode; */ int -#if NeedFunctionPrototypes XawPanedGetNumSub(Widget w) -#else -XawPanedGetNumSub(w) -Widget w; -#endif { return ((PanedWidget)w)->paned.num_panes; } @@ -1928,18 +1905,12 @@ Widget w; */ void -#if NeedFunctionPrototypes XawPanedAllowResize(Widget widget, #if NeedWidePrototypes int allow_resize) #else Boolean allow_resize) #endif -#else -XawPanedAllowResize(widget, allow_resize) -Widget widget; -Boolean allow_resize; -#endif { PaneInfo(widget)->allow_resize = allow_resize; } diff --git a/src/Scrollbar.c b/src/Scrollbar.c index 3351c3e..bdd36de 100644 --- a/src/Scrollbar.c +++ b/src/Scrollbar.c @@ -1131,18 +1131,12 @@ static void NotifyThumb (w, event, params, num_params ) /* Set the scroll bar to the given location. */ -#if NeedFunctionPrototypes void XawScrollbarSetThumb (Widget w, #if NeedWidePrototypes double top, double shown) #else float top, float shown) #endif -#else -void XawScrollbarSetThumb (w, top, shown) - Widget w; - float top, shown; -#endif { ScrollbarWidget sbw = (ScrollbarWidget) w; diff --git a/src/SimpleMenu.c b/src/SimpleMenu.c index e1b9169..7104126 100644 --- a/src/SimpleMenu.c +++ b/src/SimpleMenu.c @@ -930,12 +930,7 @@ Cardinal * num_params; */ void -#if NeedFunctionPrototypes XawSimpleMenuAddGlobalActions(XtAppContext app_con) -#else -XawSimpleMenuAddGlobalActions(app_con) -XtAppContext app_con; -#endif { XtInitializeWidgetClass(simpleMenuWidgetClass); XmuCallInitializers( app_con ); @@ -949,12 +944,7 @@ XtAppContext app_con; */ Widget -#if NeedFunctionPrototypes XawSimpleMenuGetActiveEntry(Widget w) -#else -XawSimpleMenuGetActiveEntry(w) -Widget w; -#endif { SimpleMenuWidget smw = (SimpleMenuWidget) w; @@ -968,12 +958,7 @@ Widget w; */ void -#if NeedFunctionPrototypes XawSimpleMenuClearActiveEntry(Widget w) -#else -XawSimpleMenuClearActiveEntry(w) -Widget w; -#endif { SimpleMenuWidget smw = (SimpleMenuWidget) w; @@ -937,17 +937,10 @@ Position *x, *y; */ void -#if NeedFunctionPrototypes _XawTextBuildLineTable ( TextWidget ctx, XawTextPosition position, _XtBoolean force_rebuild) -#else -_XawTextBuildLineTable (ctx, position, force_rebuild) - TextWidget ctx; - XawTextPosition position; - Boolean force_rebuild; -#endif { Dimension height = 0; int lines = 0; @@ -3211,18 +3204,11 @@ XRectangle * expose; /* Li wrote this so the IM can find a given text position's screen position. */ void -#if NeedFunctionPrototypes _XawTextPosToXY( Widget w, XawTextPosition pos, Position* x, Position* y ) -#else -_XawTextPosToXY( w, pos, x, y ) - Widget w; - XawTextPosition pos; - Position *x, *y; -#endif { int line; LineAndXYForPosition( (TextWidget)w, pos, &line, x, y ); @@ -3239,12 +3225,7 @@ version of Text. ********************************************************************/ void -#if NeedFunctionPrototypes XawTextDisplay (Widget w) -#else -XawTextDisplay (w) -Widget w; -#endif { if (!XtIsRealized(w)) return; @@ -3254,25 +3235,13 @@ Widget w; } void -#if NeedFunctionPrototypes XawTextSetSelectionArray(Widget w, XawTextSelectType *sarray) -#else -XawTextSetSelectionArray(w, sarray) -Widget w; -XawTextSelectType *sarray; -#endif { ((TextWidget)w)->text.sarray = sarray; } void -#if NeedFunctionPrototypes XawTextGetSelectionPos(Widget w, XawTextPosition *left, XawTextPosition *right) -#else -XawTextGetSelectionPos(w, left, right) -Widget w; -XawTextPosition* left,* right; -#endif { *left = ((TextWidget) w)->text.s.left; *right = ((TextWidget) w)->text.s.right; @@ -3280,13 +3249,7 @@ XawTextPosition* left,* right; void -#if NeedFunctionPrototypes XawTextSetSource(Widget w, Widget source, XawTextPosition startPos) -#else -XawTextSetSource(w, source, startPos) -Widget w, source; -XawTextPosition startPos; -#endif { TextWidget ctx = (TextWidget) w; @@ -3308,15 +3271,8 @@ XawTextPosition startPos; */ int -#if NeedFunctionPrototypes XawTextReplace(Widget w, XawTextPosition startPos, XawTextPosition endPos, XawTextBlock *text) -#else -XawTextReplace(w, startPos, endPos, text) -Widget w; -XawTextPosition startPos, endPos; -XawTextBlock *text; -#endif { TextWidget ctx = (TextWidget) w; int result; @@ -3341,24 +3297,13 @@ XawTextBlock *text; } XawTextPosition -#if NeedFunctionPrototypes XawTextTopPosition(Widget w) -#else -XawTextTopPosition(w) -Widget w; -#endif { return( ((TextWidget) w)->text.lt.top ); } void -#if NeedFunctionPrototypes XawTextSetInsertionPoint(Widget w, XawTextPosition position) -#else -XawTextSetInsertionPoint(w, position) -Widget w; -XawTextPosition position; -#endif { TextWidget ctx = (TextWidget) w; @@ -3370,12 +3315,7 @@ XawTextPosition position; } XawTextPosition -#if NeedFunctionPrototypes XawTextGetInsertionPoint(Widget w) -#else -XawTextGetInsertionPoint(w) -Widget w; -#endif { return( ((TextWidget) w)->text.insertPos); } @@ -3385,12 +3325,7 @@ Widget w; */ void -#if NeedFunctionPrototypes XawTextUnsetSelection(Widget w) -#else -XawTextUnsetSelection(w) -Widget w; -#endif { TextWidget ctx = (TextWidget)w; @@ -3409,13 +3344,7 @@ Widget w; } void -#if NeedFunctionPrototypes XawTextSetSelection (Widget w, XawTextPosition left, XawTextPosition right) -#else -XawTextSetSelection (w, left, right) -Widget w; -XawTextPosition left, right; -#endif { TextWidget ctx = (TextWidget) w; @@ -3426,13 +3355,7 @@ XawTextPosition left, right; } void -#if NeedFunctionPrototypes XawTextInvalidate(Widget w, XawTextPosition from, XawTextPosition to) -#else -XawTextInvalidate(w, from, to) -Widget w; -XawTextPosition from,to; -#endif { TextWidget ctx = (TextWidget) w; @@ -3447,24 +3370,14 @@ XawTextPosition from,to; /*ARGSUSED*/ void -#if NeedFunctionPrototypes XawTextDisableRedisplay(Widget w) -#else -XawTextDisableRedisplay(w) -Widget w; -#endif { ((TextWidget) w)->text.update_disabled = True; _XawTextPrepareToUpdate( (TextWidget) w); } void -#if NeedFunctionPrototypes XawTextEnableRedisplay(Widget w) -#else -XawTextEnableRedisplay(w) -Widget w; -#endif { TextWidget ctx = (TextWidget)w; XawTextPosition lastPos; @@ -3485,29 +3398,18 @@ Widget w; } Widget -#if NeedFunctionPrototypes XawTextGetSource(Widget w) -#else -XawTextGetSource(w) -Widget w; -#endif { return ((TextWidget)w)->text.source; } void -#if NeedFunctionPrototypes XawTextDisplayCaret (Widget w, #if NeedWidePrototypes /* Boolean */ int display_caret) #else Boolean display_caret) #endif -#else -XawTextDisplayCaret (w, display_caret) -Widget w; -Boolean display_caret; -#endif { TextWidget ctx = (TextWidget) w; @@ -3533,7 +3435,6 @@ Boolean display_caret; */ XawTextPosition -#if NeedFunctionPrototypes XawTextSearch(Widget w, #if NeedWidePrototypes /* XawTextScanDirection */ int dir, @@ -3541,12 +3442,6 @@ XawTextSearch(Widget w, XawTextScanDirection dir, #endif XawTextBlock *text) -#else -XawTextSearch(w, dir, text) -Widget w; -XawTextScanDirection dir; -XawTextBlock * text; -#endif { TextWidget ctx = (TextWidget) w; diff --git a/src/TextSink.c b/src/TextSink.c index d7211f1..65d81c5 100644 --- a/src/TextSink.c +++ b/src/TextSink.c @@ -481,7 +481,6 @@ XRectangle * rect; /* ARGSUSED */ void -#if NeedFunctionPrototypes XawTextSinkDisplayText(Widget w, #if NeedWidePrototypes /* Position */ int x, /* Position */ int y, @@ -494,13 +493,6 @@ XawTextSinkDisplayText(Widget w, #else Boolean highlight) #endif -#else -XawTextSinkDisplayText(w, x, y, pos1, pos2, highlight) -Widget w; -Position x, y; -Boolean highlight; -XawTextPosition pos1, pos2; -#endif { TextSinkObjectClass class = (TextSinkObjectClass) w->core.widget_class; @@ -520,19 +512,12 @@ XawTextPosition pos1, pos2; /* ARGSUSED */ void -#if NeedFunctionPrototypes XawTextSinkInsertCursor(Widget w, #if NeedWidePrototypes int x, int y, int state) #else Position x, Position y, XawTextInsertState state) #endif -#else -XawTextSinkInsertCursor(w, x, y, state) -Widget w; -Position x, y; -XawTextInsertState state; -#endif { TextSinkObjectClass class = (TextSinkObjectClass) w->core.widget_class; @@ -553,7 +538,6 @@ XawTextInsertState state; /* ARGSUSED */ void -#if NeedFunctionPrototypes XawTextSinkClearToBackground (Widget w, #if NeedWidePrototypes int x, int y, int width, int height) @@ -561,12 +545,6 @@ XawTextSinkClearToBackground (Widget w, Position x, Position y, Dimension width, Dimension height) #endif -#else -XawTextSinkClearToBackground (w, x, y, width, height) -Widget w; -Position x, y; -Dimension width, height; -#endif { TextSinkObjectClass class = (TextSinkObjectClass) w->core.widget_class; @@ -588,7 +566,6 @@ Dimension width, height; /* ARGSUSED */ void -#if NeedFunctionPrototypes XawTextSinkFindPosition(Widget w, XawTextPosition fromPos, int fromx, int width, #if NeedWidePrototypes @@ -597,16 +574,6 @@ XawTextSinkFindPosition(Widget w, XawTextPosition fromPos, int fromx, Boolean stopAtWordBreak, #endif XawTextPosition *resPos, int *resWidth, int *resHeight) -#else -XawTextSinkFindPosition(w, fromPos, fromx, width, stopAtWordBreak, - resPos, resWidth, resHeight) -Widget w; -XawTextPosition fromPos; -int fromx, width; -Boolean stopAtWordBreak; -XawTextPosition *resPos; -int *resWidth, *resHeight; -#endif { TextSinkObjectClass class = (TextSinkObjectClass) w->core.widget_class; @@ -629,16 +596,9 @@ int *resWidth, *resHeight; /* ARGSUSED */ void -#if NeedFunctionPrototypes XawTextSinkFindDistance (Widget w, XawTextPosition fromPos, int fromx, XawTextPosition toPos, int *resWidth, XawTextPosition *resPos, int *resHeight) -#else -XawTextSinkFindDistance (w, fromPos, fromx, toPos, resWidth, resPos, resHeight) -Widget w; -XawTextPosition fromPos, toPos, *resPos; -int fromx, *resWidth, *resHeight; -#endif { TextSinkObjectClass class = (TextSinkObjectClass) w->core.widget_class; @@ -658,16 +618,8 @@ int fromx, *resWidth, *resHeight; /* ARGSUSED */ void -#if NeedFunctionPrototypes XawTextSinkResolve(Widget w, XawTextPosition pos, int fromx, int width, XawTextPosition *resPos) -#else -XawTextSinkResolve(w, pos, fromx, width, resPos) -Widget w; -XawTextPosition pos; -int fromx, width; -XawTextPosition *resPos; -#endif { TextSinkObjectClass class = (TextSinkObjectClass) w->core.widget_class; @@ -684,18 +636,12 @@ XawTextPosition *resPos; /* ARGSUSED */ int -#if NeedFunctionPrototypes XawTextSinkMaxLines(Widget w, #if NeedWidePrototypes /* Dimension */ int height) #else Dimension height) #endif -#else -XawTextSinkMaxLines(w, height) -Widget w; -Dimension height; -#endif { TextSinkObjectClass class = (TextSinkObjectClass) w->core.widget_class; @@ -712,13 +658,7 @@ Dimension height; /* ARGSUSED */ int -#if NeedFunctionPrototypes XawTextSinkMaxHeight(Widget w, int lines) -#else -XawTextSinkMaxHeight(w, lines) -Widget w; -int lines; -#endif { TextSinkObjectClass class = (TextSinkObjectClass) w->core.widget_class; @@ -734,13 +674,7 @@ int lines; */ void -#if NeedFunctionPrototypes XawTextSinkSetTabs(Widget w, int tab_count, int *tabs) -#else -XawTextSinkSetTabs(w, tab_count, tabs) -Widget w; -int tab_count, *tabs; -#endif { if (tab_count > 0) { TextSinkObjectClass class = (TextSinkObjectClass) w->core.widget_class; @@ -764,13 +698,7 @@ int tab_count, *tabs; /* ARGSUSED */ void -#if NeedFunctionPrototypes XawTextSinkGetCursorBounds(Widget w, XRectangle *rect) -#else -XawTextSinkGetCursorBounds(w, rect) -Widget w; -XRectangle * rect; -#endif { TextSinkObjectClass class = (TextSinkObjectClass) w->core.widget_class; diff --git a/src/TextSrc.c b/src/TextSrc.c index 10bb845..3f6898d 100644 --- a/src/TextSrc.c +++ b/src/TextSrc.c @@ -360,16 +360,8 @@ XrmValuePtr toVal; */ XawTextPosition -#if NeedFunctionPrototypes XawTextSourceRead(Widget w, XawTextPosition pos, XawTextBlock *text, int length) -#else -XawTextSourceRead(w, pos, text, length) -Widget w; -XawTextPosition pos; -XawTextBlock *text; -int length; -#endif { TextSrcObjectClass class = (TextSrcObjectClass) w->core.widget_class; @@ -391,15 +383,8 @@ int length; /*ARGSUSED*/ int -#if NeedFunctionPrototypes XawTextSourceReplace (Widget w, XawTextPosition startPos, XawTextPosition endPos, XawTextBlock *text) -#else -XawTextSourceReplace (w, startPos, endPos, text) -Widget w; -XawTextPosition startPos, endPos; -XawTextBlock *text; -#endif { TextSrcObjectClass class = (TextSrcObjectClass) w->core.widget_class; @@ -426,7 +411,6 @@ XawTextBlock *text; */ XawTextPosition -#if NeedFunctionPrototypes XawTextSourceScan(Widget w, XawTextPosition position, #if NeedWidePrototypes int type, int dir, @@ -439,15 +423,6 @@ XawTextSourceScan(Widget w, XawTextPosition position, #else Boolean include) #endif -#else -XawTextSourceScan(w, position, type, dir, count, include) -Widget w; -XawTextPosition position; -XawTextScanType type; -XawTextScanDirection dir; -int count; -Boolean include; -#endif { TextSrcObjectClass class = (TextSrcObjectClass) w->core.widget_class; @@ -470,7 +445,6 @@ Boolean include; */ XawTextPosition -#if NeedFunctionPrototypes XawTextSourceSearch(Widget w, XawTextPosition position, #if NeedWidePrototypes int dir, @@ -478,13 +452,6 @@ XawTextSourceSearch(Widget w, XawTextPosition position, XawTextScanDirection dir, #endif XawTextBlock *text) -#else -XawTextSourceSearch(w, position, dir, text) -Widget w; -XawTextPosition position; -XawTextScanDirection dir; -XawTextBlock * text; -#endif { TextSrcObjectClass class = (TextSrcObjectClass) w->core.widget_class; @@ -509,19 +476,9 @@ XawTextBlock * text; */ Boolean -#if NeedFunctionPrototypes XawTextSourceConvertSelection(Widget w, Atom *selection, Atom *target, Atom *type, XtPointer *value, unsigned long *length, int *format) -#else -XawTextSourceConvertSelection(w, selection, - target, type, value, length, format) -Widget w; -Atom * selection, * target, * type; -XtPointer * value; -unsigned long * length; -int * format; -#endif { TextSrcObjectClass class = (TextSrcObjectClass) w->core.widget_class; @@ -543,15 +500,8 @@ int * format; */ void -#if NeedFunctionPrototypes XawTextSourceSetSelection(Widget w, XawTextPosition left, XawTextPosition right, Atom selection) -#else -XawTextSourceSetSelection(w, left, right, selection) -Widget w; -XawTextPosition left, right; -Atom selection; -#endif { TextSrcObjectClass class = (TextSrcObjectClass) w->core.widget_class; @@ -575,12 +525,7 @@ Atom selection; * */ XrmQuark -#if NeedFunctionPrototypes _XawTextFormat(TextWidget tw) -#else -_XawTextFormat(tw) - TextWidget tw; -#endif { return (((TextSrcObject)(tw->text.source))->textSrc.text_format); } diff --git a/src/Toggle.c b/src/Toggle.c index 5db692a..26c3573 100644 --- a/src/Toggle.c +++ b/src/Toggle.c @@ -477,12 +477,7 @@ Widget w; */ void -#if NeedFunctionPrototypes XawToggleChangeRadioGroup(Widget w, Widget radio_group) -#else -XawToggleChangeRadioGroup(w, radio_group) -Widget w, radio_group; -#endif { ToggleWidget tw = (ToggleWidget) w; RadioGroup * group; @@ -511,12 +506,7 @@ Widget w, radio_group; */ XtPointer -#if NeedFunctionPrototypes XawToggleGetCurrent(Widget w) -#else -XawToggleGetCurrent(w) -Widget w; -#endif { RadioGroup * group; @@ -541,13 +531,7 @@ Widget w; */ void -#if NeedFunctionPrototypes XawToggleSetCurrent(Widget radio_group, XtPointer radio_data) -#else -XawToggleSetCurrent(radio_group, radio_data) -Widget radio_group; -XtPointer radio_data; -#endif { RadioGroup * group; ToggleWidget local_tog; @@ -594,12 +578,7 @@ XtPointer radio_data; */ void -#if NeedFunctionPrototypes XawToggleUnsetCurrent(Widget radio_group) -#else -XawToggleUnsetCurrent(radio_group) -Widget radio_group; -#endif { ToggleWidgetClass class; ToggleWidget local_tog = (ToggleWidget) radio_group; @@ -994,12 +994,7 @@ static void layout_tree (tw, insetvalues) *****************************************************************************/ void -#if NeedFunctionPrototypes XawTreeForceLayout (Widget tree) -#else -XawTreeForceLayout (tree) - Widget tree; -#endif { layout_tree ((TreeWidget) tree, FALSE); } diff --git a/src/Viewport.c b/src/Viewport.c index 0f5c553..0500dc8 100644 --- a/src/Viewport.c +++ b/src/Viewport.c @@ -1132,18 +1132,12 @@ static XtGeometryResult PreferredGeometry(w, constraints, reply) void -#if NeedFunctionPrototypes XawViewportSetLocation (Widget gw, #if NeedWidePrototypes double xoff, double yoff) #else float xoff, float yoff) #endif -#else -XawViewportSetLocation (gw, xoff, yoff) - Widget gw; - float xoff,yoff; -#endif { ViewportWidget w = (ViewportWidget) gw; Widget child = w->viewport.child; @@ -1167,18 +1161,12 @@ XawViewportSetLocation (gw, xoff, yoff) } void -#if NeedFunctionPrototypes XawViewportSetCoordinates (Widget gw, #if NeedWidePrototypes int x, int y) #else Position x, Position y) #endif -#else -XawViewportSetCoordinates (gw, x, y) - Widget gw; - Position x, y; -#endif { ViewportWidget w = (ViewportWidget) gw; Widget child = w->viewport.child; diff --git a/src/XawI18n.c b/src/XawI18n.c index 10a83fd..e628b97 100644 --- a/src/XawI18n.c +++ b/src/XawI18n.c @@ -58,13 +58,8 @@ in this Software without prior written authorization from the X Consortium. #include <X11/IntrinsicP.h> #include "XawI18n.h" -#if NeedFunctionPrototypes wchar_t _Xaw_atowc( unsigned char c) -#else -wchar_t _Xaw_atowc(c) - unsigned char c; -#endif { wchar_t wc; char str[2]; diff --git a/src/XawI18n.h b/src/XawI18n.h index 388fa42..f1a1b06 100644 --- a/src/XawI18n.h +++ b/src/XawI18n.h @@ -65,9 +65,7 @@ extern int _Xaw_iswspace(wchar_t); #endif extern wchar_t _Xaw_atowc ( -#if NeedFunctionPrototypes unsigned char c -#endif ); #ifndef HAVE_ISWSPACE diff --git a/src/XawIm.c b/src/XawIm.c index fb1725f..09b9bb0 100644 --- a/src/XawIm.c +++ b/src/XawIm.c @@ -67,13 +67,8 @@ in this Software without prior written authorization from the X Consortium. #include "XawI18n.h" #include <ctype.h> -#if NeedVarargsPrototypes # include <stdarg.h> # define Va_start(a,b) va_start(a,b) -#else -# include <varargs.h> -# define Va_start(a,b) va_start(a) -#endif #define maxAscentOfFontSet(fontset) \ ( - (XExtentsOfFontSet((fontset)))->max_logical_extent.y) @@ -93,16 +88,12 @@ in this Software without prior written authorization from the X Consortium. *****************************************************/ static XawIcTableList CurrentSharedIcTable( -#if NeedFunctionPrototypes XawVendorShellExtPart* /* ve */ -#endif ); static void DestroyIC( -#if NeedFunctionPrototypes Widget /* w */, XawVendorShellExtPart* /* ve */ -#endif ); static XtResource resources[] = @@ -1387,13 +1378,8 @@ static void Destroy( w, ve ) ********************************************/ void -#if NeedFunctionPrototypes _XawImResizeVendorShell( Widget w ) -#else -_XawImResizeVendorShell( w ) - Widget w; -#endif { XawVendorShellExtPart *ve; @@ -1404,13 +1390,8 @@ _XawImResizeVendorShell( w ) Dimension -#if NeedFunctionPrototypes _XawImGetShellHeight( Widget w ) -#else -_XawImGetShellHeight( w ) - Widget w; -#endif { XawVendorShellExtPart *ve; @@ -1422,13 +1403,8 @@ _XawImGetShellHeight( w ) } void -#if NeedFunctionPrototypes _XawImRealize( Widget w ) -#else -_XawImRealize( w ) - Widget w; -#endif { XawVendorShellExtPart *ve; extern void XawVendorShellExtResize(); @@ -1442,14 +1418,9 @@ _XawImRealize( w ) } void -#if NeedFunctionPrototypes _XawImInitialize( Widget w, Widget ext ) -#else -_XawImInitialize( w, ext ) - Widget w, ext; -#endif { XawVendorShellExtPart *ve; @@ -1462,13 +1433,8 @@ _XawImInitialize( w, ext ) } void -#if NeedFunctionPrototypes _XawImReconnect( Widget inwidg ) -#else -_XawImReconnect( inwidg ) - Widget inwidg; -#endif { XawVendorShellExtPart *ve; VendorShellWidget vw; @@ -1480,13 +1446,8 @@ _XawImReconnect( inwidg ) } void -#if NeedFunctionPrototypes _XawImRegister( Widget inwidg) -#else -_XawImRegister(inwidg) - Widget inwidg; -#endif { XawVendorShellExtPart *ve; VendorShellWidget vw; @@ -1498,13 +1459,8 @@ _XawImRegister(inwidg) } void -#if NeedFunctionPrototypes _XawImUnregister( Widget inwidg) -#else -_XawImUnregister(inwidg) - Widget inwidg; -#endif { XawVendorShellExtPart *ve; VendorShellWidget vw; @@ -1516,29 +1472,16 @@ _XawImUnregister(inwidg) } void -#if NeedFunctionPrototypes _XawImSetValues( Widget inwidg, ArgList args, Cardinal num_args ) -#else -_XawImSetValues( inwidg, args, num_args ) - Widget inwidg; - ArgList args; - Cardinal num_args; -#endif { SetFocusValues( inwidg, args, num_args, FALSE ); } void -#if NeedVarargsPrototypes _XawImVASetValues( Widget inwidg, ... ) -#else -_XawImVASetValues( inwidg, va_alist ) - Widget inwidg; - va_dcl -#endif { va_list var; ArgList args = NULL; @@ -1560,29 +1503,16 @@ _XawImVASetValues( inwidg, va_alist ) } void -#if NeedFunctionPrototypes _XawImSetFocusValues( Widget inwidg, ArgList args, Cardinal num_args) -#else -_XawImSetFocusValues(inwidg, args, num_args) - Widget inwidg; - ArgList args; - Cardinal num_args; -#endif { SetFocusValues(inwidg, args, num_args, TRUE); } void -#if NeedVarargsPrototypes _XawImVASetFocusValues(Widget inwidg, ...) -#else -_XawImVASetFocusValues(inwidg, va_alist) - Widget inwidg; - va_dcl -#endif { va_list var; ArgList args = NULL; @@ -1604,19 +1534,13 @@ _XawImVASetFocusValues(inwidg, va_alist) } void -#if NeedFunctionPrototypes _XawImUnsetFocus( Widget inwidg) -#else -_XawImUnsetFocus(inwidg) - Widget inwidg; -#endif { UnsetFocus(inwidg); } int -#if NeedFunctionPrototypes _XawImWcLookupString( Widget inwidg, XKeyPressedEvent *event, @@ -1624,16 +1548,6 @@ _XawImWcLookupString( int bytes_buffer, KeySym *keysym_return, Status *status_return) -#else -_XawImWcLookupString( inwidg, event, buffer_return, bytes_buffer, - keysym_return, status_return) - Widget inwidg; - XKeyPressedEvent* event; - wchar_t* buffer_return; - int bytes_buffer; - KeySym* keysym_return; - Status* status_return; -#endif { XawVendorShellExtPart* ve; VendorShellWidget vw; @@ -1656,13 +1570,8 @@ _XawImWcLookupString( inwidg, event, buffer_return, bytes_buffer, } int -#if NeedFunctionPrototypes _XawImGetImAreaHeight( Widget w) -#else -_XawImGetImAreaHeight( w ) - Widget w; -#endif { XawVendorShellExtPart *ve; VendorShellWidget vw; @@ -1674,13 +1583,8 @@ _XawImGetImAreaHeight( w ) } void -#if NeedFunctionPrototypes _XawImCallVendorShellExtResize( Widget w) -#else -_XawImCallVendorShellExtResize( w ) - Widget w; -#endif { XawVendorShellExtPart *ve; VendorShellWidget vw; @@ -1698,15 +1602,9 @@ _XawImCallVendorShellExtResize( w ) * core Destroy method. Sheeran, Omron KK 93/08/05 */ void -#if NeedFunctionPrototypes _XawImDestroy( Widget w, Widget ext ) -#else -_XawImDestroy( w, ext ) - Widget w; - Widget ext; -#endif { XawVendorShellExtPart *ve; |