Include lisp.h, not ../src/lisp.h.

(make_drawing_gcs): Remove unused `xswa', `mask'.

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 566376200104080f9de7f29b2207cccd8168ae81..003af091fba52c28a9e45f7d12e7b1cb638a90c9 100644 (file)
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,13 @@
+2003-05-22  Dave Love  <fx@gnu.org>
+
+       * xlwmenu.c: Include lisp.h, not ../src/lisp.h.
+       (make_drawing_gcs): Remove unused `xswa', `mask'.
+
+       * lwlib-Xlw.c: 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.
+
 2003-04-30  Lute Kamstra  <Lute.Kamstra@cwi.nl>
 
        * Makefile.in: Make things function properly in case both LessTif

diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index e7c783596f97064e66d1b2d992819086dd864b26..8ebdfe81fbd9c242d3ab0884b4c073489da374c3 100644 (file)
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -25,7 +25,7 @@ Boston, MA 02111-1307, USA.  */
 #include <config.h>
 #endif
 
-#include "../src/lisp.h"
+#include "lisp.h"
 
 #include <stdio.h>
 
@@ -1707,8 +1707,6 @@ XlwMenuInitialize (request, mw, args, num_args)
      Cardinal *num_args;
 {
   /* Get the GCs and the widget size */
-  XSetWindowAttributes xswa;
-  int mask;
 
   Window window = RootWindowOfScreen (DefaultScreenOfDisplay (XtDisplay (mw)));
   Display* display = XtDisplay (mw);
@@ -1739,10 +1737,6 @@ XlwMenuInitialize (request, mw, args, num_args)
   make_drawing_gcs (mw);
   make_shadow_gcs (mw);
 
-  xswa.background_pixel = mw->core.background_pixel;
-  xswa.border_pixel = mw->core.border_pixel;
-  mask = CWBackPixel | CWBorderPixel;
-
   mw->menu.popped_up = False;
 
   mw->menu.old_depth = 1;