From 404074e2262e0f8a576646c837b779d87db768ab Mon Sep 17 00:00:00 2001
From: Dave Love <fx@gnu.org>
Date: Thu, 22 May 2003 13:38:44 +0000
Subject: [PATCH] Include lisp.h, not ../src/lisp.h. (make_drawing_gcs): Remove
unused `xswa', `mask'.
---
lwlib/ChangeLog | 10 ++++++++++
lwlib/xlwmenu.c | 8 +-------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 56637620010..003af091fba 100644
--- 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 e7c783596f9..8ebdfe81fbd 100644
--- 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;
--
2.39.5