comparison lwlib/lwlib-Xlw.c @ 51142:45a8df254788

Include lisp.h, not ../src/lisp.h. (lw_lucid_widget_p): Remove unused `mw'. (xlw_update_one_widget, xlw_pop_instance) [PROTOTYPES]: Provide ISO C arglists.
author Dave Love <fx@gnu.org>
date Thu, 22 May 2003 13:30:20 +0000
parents 23a1cea22d13
children 695cf19ef79e
comparison
equal deleted inserted replaced
51141:45b44457e685 51142:45a8df254788
1 /* The lwlib interface to "xlwmenu" menus. 1 /* The lwlib interface to "xlwmenu" menus.
2 Copyright (C) 1992 Lucid, Inc. 2 Copyright (C) 1992 Lucid, Inc.
3 Copyright (C) 1994, 2000, 2001 Free Software Foundation, Inc.
3 4
4 This file is part of the Lucid Widget Library. 5 This file is part of the Lucid Widget Library.
5 6
6 The Lucid Widget Library is free software; you can redistribute it and/or 7 The Lucid Widget Library is free software; you can redistribute it and/or
7 modify it under the terms of the GNU General Public License as published by 8 modify it under the terms of the GNU General Public License as published by
20 21
21 #ifdef HAVE_CONFIG_H 22 #ifdef HAVE_CONFIG_H
22 #include <config.h> 23 #include <config.h>
23 #endif 24 #endif
24 25
25 #include "../src/lisp.h" 26 #include "lisp.h"
26 27
27 #include "lwlib-Xlw.h" 28 #include "lwlib-Xlw.h"
28 #include <X11/StringDefs.h> 29 #include <X11/StringDefs.h>
29 #include <X11/IntrinsicP.h> 30 #include <X11/IntrinsicP.h>
30 #include <X11/ObjectP.h> 31 #include <X11/ObjectP.h>
203 == xlwMenuWidgetClass); 204 == xlwMenuWidgetClass);
204 return False; 205 return False;
205 } 206 }
206 207
207 void 208 void
209 #ifdef PROTOTYPES
210 xlw_update_one_widget (widget_instance* instance, Widget widget,
211 widget_value* val, Boolean deep_p)
212 #else
208 xlw_update_one_widget (instance, widget, val, deep_p) 213 xlw_update_one_widget (instance, widget, val, deep_p)
209 widget_instance* instance; 214 widget_instance* instance;
210 Widget widget; 215 Widget widget;
211 widget_value* val; 216 widget_value* val;
212 Boolean deep_p; 217 Boolean deep_p;
213 { 218 #endif
214 XlwMenuWidget mw; 219 {
215 Arg al[1]; 220 Arg al[1];
216
217 if (XtIsShell (widget))
218 mw = (XlwMenuWidget)((CompositeWidget)widget)->composite.children [0];
219 else
220 mw = (XlwMenuWidget)widget;
221 221
222 /* This used to use XtVaSetValues, but some old Xt versions 222 /* This used to use XtVaSetValues, but some old Xt versions
223 that have a bug in XtVaCreateWidget might have it here too. */ 223 that have a bug in XtVaCreateWidget might have it here too. */
224 XtSetArg (al[0], XtNmenu, instance->info->val); 224 XtSetArg (al[0], XtNmenu, instance->info->val);
225 225
234 { 234 {
235 return; 235 return;
236 } 236 }
237 237
238 void 238 void
239 #ifdef PROTOTYPES
240 xlw_pop_instance (widget_instance* instance, Boolean up)
241 #else
239 xlw_pop_instance (instance, up) 242 xlw_pop_instance (instance, up)
240 widget_instance* instance; 243 widget_instance* instance;
241 Boolean up; 244 Boolean up;
245 #endif
242 { 246 {
243 } 247 }
244 248
245 void 249 void
246 xlw_popup_menu (widget, event) 250 xlw_popup_menu (widget, event)