From: Dave Love <fx@gnu.org>
Date: Tue, 6 Jun 2000 14:21:15 +0000 (+0000)
Subject: (x_alloc_nearest_color_for_widget, x_catch_errors, x_uncatch_errors)
X-Git-Tag: emacs-pretest-21.0.90~3480
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a57a1605523357cfea72fc15a36c51e69321e83a;p=emacs.git

(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) <x_alloc_nearest_color_for_widget>: Cast first arg.
(Start) <pop_up_menu>: Cast second arg.
---

diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index 15f25371619..847997c24fa 100644
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -34,6 +34,14 @@ Boston, MA 02111-1307, USA.  */
 #include <X11/cursorfont.h>
 #include <X11/bitmaps/gray>
 #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 @@ make_shadow_gcs (mw)
       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 @@ make_shadow_gcs (mw)
       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 @@ Start (w, ev, params, num_params)
   if (!mw->menu.popped_up)
     {
       menu_post_event = *ev;
-      pop_up_menu (mw, ev);
+      pop_up_menu (mw, (XButtonPressedEvent*) ev);
     }
   else
     {