*** empty log message ***

4 files changed, 42 insertions, 45 deletions

diff --git a/lwlib/lwlib-int.h b/lwlib/lwlib-int.h
index 0f2c594e7de..3c8534f7ef2 100644
--- a/lwlib/lwlib-int.h
+++ b/lwlib/lwlib-int.h
@@ -32,7 +32,7 @@ typedef struct _widget_info
 } widget_info;
 
 typedef Widget
-(*widget_creation_function) (widget_instance* instance);
+(*widget_creation_function) ();
 
 typedef struct _widget_creation_entry
 {
@@ -43,12 +43,11 @@ typedef struct _widget_creation_entry
 /* update all other instances of a widget.  Can be used in a callback when
    a wiget has been used by the user */
 void
-lw_internal_update_other_instances (Widget widget, XtPointer closure,
-                                    XtPointer call_data);
+lw_internal_update_other_instances ();
 
 /* get the widget_value for a widget in a given instance */
 widget_value*
-lw_get_widget_value_for_widget (widget_instance* instance, Widget w);
+lw_get_widget_value_for_widget ();
 
 #endif /* LWLIB_INTERNAL_H */
 
diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index f9727b991a5..21ca8987f7b 100644
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -26,9 +26,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <sys/types.h>
 #include <string.h>
 #include <stdio.h>
-#include <X11/StringDefs.h>
 #include "lwlib-int.h"
 #include "lwlib-utils.h"
+#include <X11/StringDefs.h>
 
 #if defined(__GNUC__) && !defined(alloca)
 #define alloca __builtin_alloca
diff --git a/lwlib/lwlib.h b/lwlib/lwlib.h
index 195bbb5df8b..f52e257bd7a 100644
--- a/lwlib/lwlib.h
+++ b/lwlib/lwlib.h
@@ -66,38 +66,31 @@ typedef struct _widget_value
 } widget_value;
 
 
-typedef void (*lw_callback) (Widget w, LWLIB_ID id, void* data);
+typedef void (*lw_callback) ();
 
-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);
-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);
-LWLIB_ID lw_get_widget_id (Widget w);
-void 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);
+void  lw_register_widget ();
+Widget lw_get_widget ();
+Widget lw_make_widget ();
+Widget lw_create_widget ();
+LWLIB_ID lw_get_widget_id ();
+void lw_modify_all_widgets ();
+void lw_destroy_widget ();
+void lw_destroy_all_widgets ();
+void lw_destroy_everything ();
+void lw_destroy_all_pop_ups ();
+Widget lw_raise_all_pop_up_widgets ();
+widget_value* lw_get_all_values ();
+Boolean lw_get_some_values ();
+void lw_pop_up_all_widgets ();
+void lw_pop_down_all_widgets ();
 widget_value *malloc_widget_value ();
-void free_widget_value (widget_value *);
-void lw_popup_menu (Widget);
+void free_widget_value ();
+void lw_popup_menu ();
 
 /* Toolkit independent way of focusing on a Widget at the Xt level. */
-void lw_set_keyboard_focus (Widget parent, Widget w);
+void lw_set_keyboard_focus ();
 
 /* Silly Energize hack to invert the "sheet" button */
-void lw_show_busy (Widget w, Boolean busy);
+void lw_show_busy ();
 
 #endif /* LWLIB_H */
diff --git a/src/widget.c b/src/widget.c
index e5092b1eb73..e93fbaf5c6b 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -58,14 +58,14 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define DEFAULT_FACE_FONT "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*"
 
 
-static void EmacsFrameInitialize (Widget, Widget, ArgList, Cardinal *);
-static void EmacsFrameDestroy (Widget);
-static void EmacsFrameRealize (Widget, XtValueMask*, XSetWindowAttributes*);
-void EmacsFrameResize (Widget widget);
-static Boolean EmacsFrameSetValues (Widget, Widget, Widget,
-                                     ArgList, Cardinal *);
-static XtGeometryResult EmacsFrameQueryGeometry (Widget, XtWidgetGeometry*,
-                                                  XtWidgetGeometry*);
+static void EmacsFrameInitialize (/*Widget, Widget, ArgList, Cardinal * */);
+static void EmacsFrameDestroy (/* Widget */);
+static void EmacsFrameRealize (/* Widget, XtValueMask*, XSetWindowAttributes* */);
+void EmacsFrameResize (/* Widget widget */);
+static Boolean EmacsFrameSetValues (/* Widget, Widget, Widget,
+                                     ArgList, Cardinal * */);
+static XtGeometryResult EmacsFrameQueryGeometry (/* Widget, XtWidgetGeometry*,
+                                                  XtWidgetGeometry* */);
 
 
 #undef XtOffset
@@ -162,8 +162,10 @@ EmacsFrameClassRec emacsFrameClassRec = {
 WidgetClass emacsFrameClass = (WidgetClass) &emacsFrameClassRec;
 
 static void
-get_default_char_pixel_size (EmacsFrame ew, int* pixel_width,
-                             int* pixel_height)
+get_default_char_pixel_size (ew, pixel_width, pixel_height)
+     EmacsFrame ew;
+     int* pixel_width;
+     int* pixel_height;
 {
 /*
   *pixel_width = XTextWidth (ew->emacs_frame.font, "n", 1);
@@ -176,9 +178,12 @@ get_default_char_pixel_size (EmacsFrame ew, int* pixel_width,
 }
 
 static void
-pixel_to_char_size (EmacsFrame ew,
-                    Dimension pixel_width, Dimension pixel_height,
-                    int* char_width, int* char_height)
+pixel_to_char_size (ew, pixel_width, pixel_height, char_width, char_height)
+     EmacsFrame ew;
+     Dimension pixel_width;
+     Dimension pixel_height;
+     int* char_width;
+     int* char_height;
 {
   struct frame* f = ew->emacs_frame.frame;
   *char_width = PIXEL_TO_CHAR_WIDTH (f, pixel_width);