Mercurial > hg > xemacs-beta
diff lwlib/xlwmenu.c @ 1201:c2569faae8ed
[xemacs-hg @ 2003-01-12 10:45:53 by michaels]
2002-12-16 Ben Wing <ben@xemacs.org>
* lwlib-Xlw.c (xlw_update_one_widget):
* lwlib-Xm.c (xm_update_one_widget):
* lwlib-Xm.c (xm_update_one_value):
* lwlib.c:
* lwlib.c (merge_scrollbar_values):
* xlwmenu.c:
* xlwmenu.c (display_menu):
* xlwmenu.c (XlwMenuInitialize):
* xlwmenu.c (XlwMenuSetValues):
* xlwradio.c:
* xlwradio.c (RadioClassPartInit):
* xlwradio.c (RadioSet):
* xlwradio.c (RadioUnset):
class -> class_, new -> new_.
| author | michaels |
|---|---|
| date | Sun, 12 Jan 2003 10:45:53 +0000 |
| parents | b39c14581166 |
| children | 8c5cf108f035 |
line wrap: on
line diff
--- a/lwlib/xlwmenu.c Sat Jan 11 22:52:31 2003 +0000 +++ b/lwlib/xlwmenu.c Sun Jan 12 10:45:53 2003 +0000 @@ -151,13 +151,13 @@ }; #undef offset -static Boolean XlwMenuSetValues (Widget current, Widget request, Widget new, +static Boolean XlwMenuSetValues (Widget current, Widget request, Widget new_, ArgList args, Cardinal *num_args); static void XlwMenuRealize (Widget w, Mask *valueMask, XSetWindowAttributes *attributes); static void XlwMenuRedisplay (Widget w, XEvent *ev, Region region); static void XlwMenuResize (Widget w); -static void XlwMenuInitialize (Widget request, Widget new, ArgList args, +static void XlwMenuInitialize (Widget request, Widget new_, ArgList args, Cardinal *num_args); static void XlwMenuDestroy (Widget w); static void XlwMenuClassInitialize (void); @@ -2200,7 +2200,7 @@ static void display_menu (XlwMenuWidget mw, int level, Boolean just_compute_p, XPoint *highlighted_pos, XPoint *hit, widget_value **hit_return, - widget_value *this, widget_value *that) + widget_value *this_, widget_value *that) { widget_value *val; widget_value *following_item; @@ -2272,7 +2272,7 @@ } just_compute_this_one_p = - just_compute_p || ((this || that) && val != this && val != that); + just_compute_p || ((this_ || that) && val != this_ && val != that); start.x = where.x; start.y = where.y; @@ -3000,11 +3000,11 @@ #endif /* NEED_MOTIF */ static void -XlwMenuInitialize (Widget request, Widget new, ArgList args, +XlwMenuInitialize (Widget request, Widget new_, ArgList args, Cardinal *num_args) { /* Get the GCs and the widget size */ - XlwMenuWidget mw = (XlwMenuWidget)new; + XlwMenuWidget mw = (XlwMenuWidget)new_; Window window = RootWindowOfScreen (DefaultScreenOfDisplay (XtDisplay (mw))); Display *display = XtDisplay (mw); @@ -3163,11 +3163,11 @@ } static Boolean -XlwMenuSetValues (Widget current, Widget request, Widget new, ArgList args, +XlwMenuSetValues (Widget current, Widget request, Widget new_, ArgList args, Cardinal *num_args) { XlwMenuWidget oldmw = (XlwMenuWidget)current; - XlwMenuWidget newmw = (XlwMenuWidget)new; + XlwMenuWidget newmw = (XlwMenuWidget)new_; Boolean redisplay = False; int i;