Merge from emacs-23

[bpt/emacs.git] / lwlib / lwlib-int.h

diff --git a/lwlib/lwlib-int.h b/lwlib/lwlib-int.h
index e927dba..5282bc0 100644 (file)
--- a/lwlib/lwlib-int.h
+++ b/lwlib/lwlib-int.h
@@ -26,13 +26,19 @@ 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;
 
 typedef struct _widget_instance
 {
   Widget               widget;
   Widget               parent;
   Boolean              pop_up_p;
+#ifdef HAVE_XFT
+  struct widget_xft_data *xft_data;
+  int                   nr_xft_data;
+#endif
   struct _widget_info*         info;
   struct _widget_instance*     next;
 } widget_instance;
@@ -52,8 +58,7 @@ typedef struct _widget_info
   struct _widget_info*         next;
 } widget_info;
 
-typedef Widget
-(*widget_creation_function) ();
+typedef Widget (*widget_creation_function) (widget_instance *instance);
 
 typedef struct _widget_creation_entry
 {
@@ -64,14 +69,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 */