diff options
Diffstat (limited to 'lwlib')
| -rw-r--r-- | lwlib/ChangeLog | 10 | ||||
| -rw-r--r-- | lwlib/lwlib-Xaw.h | 14 | ||||
| -rw-r--r-- | lwlib/lwlib-Xlw.h | 16 | ||||
| -rw-r--r-- | lwlib/lwlib-Xm.h | 24 | ||||
| -rw-r--r-- | lwlib/lwlib-int.h | 10 | ||||
| -rw-r--r-- | lwlib/lwlib-utils.h | 16 | ||||
| -rw-r--r-- | lwlib/lwlib.h | 78 |
7 files changed, 89 insertions, 79 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index 207b94f190a..e3dd3f7e610 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,13 @@ +2010-07-02 Jan Djärv <jan.h.d@swipnet.se> + + Remove P_ and __P macros. + * lwlib-Xaw.h: Remove P_ and __P macros. + * lwlib-Xlw.h: + * lwlib-Xm.h: + * lwlib-int.h: + * lwlib-utils.h: + * lwlib.h: Likewise. + 2010-05-15 Glenn Morris <rgm@gnu.org> * Makefile.in (mostlyclean): Remove references to non-existent files. diff --git a/lwlib/lwlib-Xaw.h b/lwlib/lwlib-Xaw.h index 41b8013ee64..e359b95359c 100644 --- a/lwlib/lwlib-Xaw.h +++ b/lwlib/lwlib-Xaw.h @@ -6,25 +6,25 @@ extern widget_creation_entry xaw_creation_table []; Widget -xaw_create_dialog __P ((widget_instance*)); +xaw_create_dialog (widget_instance*); Boolean -lw_xaw_widget_p __P ((Widget)); +lw_xaw_widget_p (Widget); void -xaw_update_one_widget __P ((widget_instance *, Widget, widget_value *, Boolean)); +xaw_update_one_widget (widget_instance *, Widget, widget_value *, Boolean); void -xaw_update_one_value __P ((widget_instance *, Widget, widget_value *)); +xaw_update_one_value (widget_instance *, Widget, widget_value *); void -xaw_destroy_instance __P ((widget_instance *)); +xaw_destroy_instance (widget_instance *); void -xaw_popup_menu __P ((Widget, XEvent *)); +xaw_popup_menu (Widget, XEvent *); void -xaw_pop_instance __P ((widget_instance *, Boolean)); +xaw_pop_instance (widget_instance *, Boolean); #endif /* LWLIB_XAW_H */ diff --git a/lwlib/lwlib-Xlw.h b/lwlib/lwlib-Xlw.h index 36f8244101b..cb2125ee17f 100644 --- a/lwlib/lwlib-Xlw.h +++ b/lwlib/lwlib-Xlw.h @@ -7,24 +7,24 @@ extern widget_creation_entry xlw_creation_table []; extern widget_creation_function xlw_create_dialog; Boolean -lw_lucid_widget_p __P ((Widget widget)); +lw_lucid_widget_p (Widget widget); void -xlw_update_one_widget __P ((widget_instance* instance, Widget widget, - widget_value* val, Boolean deep_p)); +xlw_update_one_widget (widget_instance* instance, Widget widget, + widget_value* val, Boolean deep_p); void -xlw_update_one_value __P ((widget_instance* instance, Widget widget, - widget_value* val)); +xlw_update_one_value (widget_instance* instance, Widget widget, + widget_value* val); void -xlw_destroy_instance __P ((widget_instance* instance)); +xlw_destroy_instance (widget_instance* instance); void -xlw_pop_instance __P ((widget_instance* instance, Boolean up)); +xlw_pop_instance (widget_instance* instance, Boolean up); void -xlw_popup_menu __P ((Widget widget, XEvent * event)); +xlw_popup_menu (Widget widget, XEvent * event); #endif /* LWLIB_XLW_H */ diff --git a/lwlib/lwlib-Xm.h b/lwlib/lwlib-Xm.h index 3a827036f36..a68fd4ee458 100644 --- a/lwlib/lwlib-Xm.h +++ b/lwlib/lwlib-Xm.h @@ -26,36 +26,36 @@ Boston, MA 02110-1301, USA. */ extern widget_creation_entry xm_creation_table []; Widget -xm_create_dialog __P ((widget_instance* instance)); +xm_create_dialog (widget_instance* instance); Boolean -lw_motif_widget_p __P ((Widget widget)); +lw_motif_widget_p (Widget widget); void -xm_update_one_widget __P ((widget_instance* instance, Widget widget, - widget_value* val, Boolean deep_p)); +xm_update_one_widget (widget_instance* instance, Widget widget, + widget_value* val, Boolean deep_p); void -xm_update_one_value __P ((widget_instance* instance, Widget widget, - widget_value* val)); +xm_update_one_value (widget_instance* instance, Widget widget, + widget_value* val); void -xm_destroy_instance __P ((widget_instance* instance)); +xm_destroy_instance (widget_instance* instance); void -xm_set_keyboard_focus __P ((Widget parent, Widget w)); +xm_set_keyboard_focus (Widget parent, Widget w); void -xm_popup_menu __P ((Widget widget, XEvent *event)); +xm_popup_menu (Widget widget, XEvent *event); void -xm_pop_instance __P ((widget_instance* instance, Boolean up)); +xm_pop_instance (widget_instance* instance, Boolean up); void -xm_set_main_areas __P ((Widget parent, Widget menubar, Widget work_area)); +xm_set_main_areas (Widget parent, Widget menubar, Widget work_area); void -xm_manage_resizing __P ((Widget w, Boolean flag)); +xm_manage_resizing (Widget w, Boolean flag); #endif /* LWLIB_XM_H */ diff --git a/lwlib/lwlib-int.h b/lwlib/lwlib-int.h index ba48d191752..b786bbb7a08 100644 --- a/lwlib/lwlib-int.h +++ b/lwlib/lwlib-int.h @@ -26,7 +26,7 @@ Boston, MA 02110-1301, USA. */ #include "lwlib.h" -extern char *safe_strdup __P ((const char *)); +extern char *safe_strdup (const char *); struct widget_xft_data; @@ -70,14 +70,14 @@ typedef struct _widget_creation_entry /* update all other instances of a widget. Can be used in a callback when a widget has been used by the user */ void -lw_internal_update_other_instances __P ((Widget, XtPointer, XtPointer)); +lw_internal_update_other_instances (Widget, XtPointer, XtPointer); /* get the widget_value for a widget in a given instance */ widget_value* -lw_get_widget_value_for_widget __P ((widget_instance *, Widget)); +lw_get_widget_value_for_widget (widget_instance *, Widget); -widget_info *lw_get_widget_info __P ((LWLIB_ID)); -widget_instance * lw_get_widget_instance __P ((Widget)); +widget_info *lw_get_widget_info (LWLIB_ID); +widget_instance * lw_get_widget_instance (Widget); #endif /* LWLIB_INTERNAL_H */ diff --git a/lwlib/lwlib-utils.h b/lwlib/lwlib-utils.h index 934b0b48f4a..d4dbda8467d 100644 --- a/lwlib/lwlib-utils.h +++ b/lwlib/lwlib-utils.h @@ -1,21 +1,21 @@ #ifndef _LWLIB_UTILS_H_ #define _LWLIB_UTILS_H_ -void XtNoClearRefreshWidget __P ((Widget)); +void XtNoClearRefreshWidget (Widget); -typedef void (*XtApplyToWidgetsProc) __P ((Widget, XtPointer)); -typedef void* (*XtApplyUntilToWidgetsProc) __P ((Widget, XtPointer)); +typedef void (*XtApplyToWidgetsProc) (Widget, XtPointer); +typedef void* (*XtApplyUntilToWidgetsProc) (Widget, XtPointer); -void XtApplyToWidgets __P ((Widget, XtApplyToWidgetsProc, XtPointer)); -void *XtApplyUntilToWidgets __P ((Widget, XtApplyUntilToWidgetsProc, XtPointer)); +void XtApplyToWidgets (Widget, XtApplyToWidgetsProc, XtPointer); +void *XtApplyUntilToWidgets (Widget, XtApplyUntilToWidgetsProc, XtPointer); -Widget *XtCompositeChildren __P ((Widget, unsigned int *)); +Widget *XtCompositeChildren (Widget, unsigned int *); /* returns True is the widget is being destroyed, False otherwise */ Boolean -XtWidgetBeingDestroyedP __P ((Widget widget)); +XtWidgetBeingDestroyedP (Widget widget); -void XtSafelyDestroyWidget __P ((Widget)); +void XtSafelyDestroyWidget (Widget); #endif /* _LWLIB_UTILS_H_ */ diff --git a/lwlib/lwlib.h b/lwlib/lwlib.h index 8b724fc56a5..89ecf6088ca 100644 --- a/lwlib/lwlib.h +++ b/lwlib/lwlib.h @@ -130,66 +130,66 @@ typedef struct _widget_value } widget_value; -typedef void (*lw_callback) __P ((Widget w, LWLIB_ID id, void* data)); - -void lw_register_widget __P ((char* type, char* name, LWLIB_ID id, - widget_value* val, lw_callback pre_activate_cb, - lw_callback selection_cb, - lw_callback post_activate_cb, - lw_callback highlight_cb)); -Widget lw_get_widget __P ((LWLIB_ID id, Widget parent, Boolean pop_up_p)); -Widget lw_make_widget __P ((LWLIB_ID id, Widget parent, Boolean pop_up_p)); -Widget lw_create_widget __P ((char* type, char* name, LWLIB_ID id, - widget_value* val, Widget parent, Boolean pop_up_p, - lw_callback pre_activate_cb, - lw_callback selection_cb, - lw_callback post_activate_cb, - lw_callback highlight_cb)); -LWLIB_ID lw_get_widget_id __P ((Widget w)); -int lw_modify_all_widgets __P ((LWLIB_ID id, widget_value* val, Boolean deep_p)); -void lw_destroy_widget __P ((Widget w)); -void lw_destroy_all_widgets __P ((LWLIB_ID id)); -void lw_destroy_everything __P ((void)); -void lw_destroy_all_pop_ups __P ((void)); -Widget lw_raise_all_pop_up_widgets __P ((void)); -widget_value* lw_get_all_values __P ((LWLIB_ID id)); -Boolean lw_get_some_values __P ((LWLIB_ID id, widget_value* val)); -void lw_pop_up_all_widgets __P ((LWLIB_ID id)); -void lw_pop_down_all_widgets __P ((LWLIB_ID id)); +typedef void (*lw_callback) (Widget w, LWLIB_ID id, void* data); + +void lw_register_widget (char* type, char* name, LWLIB_ID id, + widget_value* val, lw_callback pre_activate_cb, + lw_callback selection_cb, + lw_callback post_activate_cb, + lw_callback highlight_cb); +Widget lw_get_widget (LWLIB_ID id, Widget parent, Boolean pop_up_p); +Widget lw_make_widget (LWLIB_ID id, Widget parent, Boolean pop_up_p); +Widget lw_create_widget (char* type, char* name, LWLIB_ID id, + widget_value* val, Widget parent, Boolean pop_up_p, + lw_callback pre_activate_cb, + lw_callback selection_cb, + lw_callback post_activate_cb, + lw_callback highlight_cb); +LWLIB_ID lw_get_widget_id (Widget w); +int lw_modify_all_widgets (LWLIB_ID id, widget_value* val, Boolean deep_p); +void lw_destroy_widget (Widget w); +void lw_destroy_all_widgets (LWLIB_ID id); +void lw_destroy_everything (void); +void lw_destroy_all_pop_ups (void); +Widget lw_raise_all_pop_up_widgets (void); +widget_value* lw_get_all_values (LWLIB_ID id); +Boolean lw_get_some_values (LWLIB_ID id, widget_value* val); +void lw_pop_up_all_widgets (LWLIB_ID id); +void lw_pop_down_all_widgets (LWLIB_ID id); widget_value *malloc_widget_value (); -void free_widget_value __P ((widget_value *)); -void lw_popup_menu __P ((Widget, XEvent *)); +void free_widget_value (widget_value *); +void lw_popup_menu (Widget, XEvent *); /* Toolkit independent way of focusing on a Widget at the Xt level. */ -void lw_set_keyboard_focus __P ((Widget parent, Widget w)); +void lw_set_keyboard_focus (Widget parent, Widget w); /* Silly Energize hack to invert the "sheet" button */ -void lw_show_busy __P ((Widget w, Boolean busy)); +void lw_show_busy (Widget w, Boolean busy); /* Silly hack to assist with Lucid/Athena geometry management. */ -void lw_refigure_widget __P ((Widget w, Boolean doit)); +void lw_refigure_widget (Widget w, Boolean doit); /* Toolkit independent way of determining if an event occurred on a menubar. */ -Boolean lw_window_is_in_menubar __P ((Window win, Widget menubar_widget)); +Boolean lw_window_is_in_menubar (Window win, Widget menubar_widget); /* Manage resizing: TRUE permits resizing widget w; FALSE disallows it. */ -void lw_allow_resizing __P ((Widget w, Boolean flag)); +void lw_allow_resizing (Widget w, Boolean flag); /* Set up the main window. */ -void lw_set_main_areas __P ((Widget parent, - Widget menubar, - Widget work_area)); +void lw_set_main_areas (Widget parent, + Widget menubar, + Widget work_area); /* Value is non-zero if LABEL is a menu separator. If it is, *TYPE is set to an appropriate enumerator of type enum menu_separator. MOTIF_P non-zero means map separator types not supported by Motif to similar ones that are supported. */ -int lw_separator_p __P ((char *label, enum menu_separator *type, - int motif_p)); +int lw_separator_p (char *label, enum menu_separator *type, + int motif_p); -void lwlib_bcopy __P ((char*, char*, int)); +void lwlib_bcopy (char*, char*, int); #endif /* LWLIB_H */ |