# HG changeset patch # User Dave Love # Date 960301275 0 # Node ID f9b5fe053f7c36b0a16e2ea8019cfd8d8afe2cfe # Parent 2d728b3d9f5f4a9193e651c3227f64e5e7d2f3f0 (x_alloc_nearest_color_for_widget, x_catch_errors, x_uncatch_errors) (x_had_errors_p, x_clear_errors): Add prototypes -- should be moved into separate header. (make_shadow_gcs) : Cast first arg. (Start) : Cast second arg. diff -r 2d728b3d9f5f -r f9b5fe053f7c lwlib/xlwmenu.c --- a/lwlib/xlwmenu.c Tue Jun 06 14:15:49 2000 +0000 +++ b/lwlib/xlwmenu.c Tue Jun 06 14:21:15 2000 +0000 @@ -34,6 +34,14 @@ #include #include #include "xlwmenuP.h" +#ifdef emacs +/* Defined in xterm.c. */ +extern int x_alloc_nearest_color_for_widget __P ((Widget, Colormap, XColor*)); +extern int x_catch_errors __P ((Display*)); +extern int x_uncatch_errors __P ((Display*, int)); +extern int x_had_errors_p __P ((Display*)); +extern int x_clear_errors __P ((Display*)); +#endif static int pointer_grabbed; static XEvent menu_post_event; @@ -1445,7 +1453,7 @@ topc.green = MINL (65535, topc.green * 1.2); topc.blue = MINL (65535, topc.blue * 1.2); #ifdef emacs - if (x_alloc_nearest_color_for_widget (mw, cmap, &topc)) + if (x_alloc_nearest_color_for_widget ((Widget) mw, cmap, &topc)) #else if (XAllocColor (dpy, cmap, &topc)) #endif @@ -1463,7 +1471,7 @@ botc.green *= 0.6; botc.blue *= 0.6; #ifdef emacs - if (x_alloc_nearest_color_for_widget (mw, cmap, &botc)) + if (x_alloc_nearest_color_for_widget ((Widget) mw, cmap, &botc)) #else if (XAllocColor (dpy, cmap, &botc)) #endif @@ -1817,7 +1825,7 @@ if (!mw->menu.popped_up) { menu_post_event = *ev; - pop_up_menu (mw, ev); + pop_up_menu (mw, (XButtonPressedEvent*) ev); } else {