aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan D2010-05-08 17:32:51 +0200
committerJan D2010-05-08 17:32:51 +0200
commit3c9a9730eadb50ef62ec74597acc3e008480722f (patch)
treea56c9970a402b682b99a31166c25082ebf8470fb
parentf884842302daef76710893343ebf923b9304273a (diff)
downloademacs-3c9a9730eadb50ef62ec74597acc3e008480722f.tar.gz
emacs-3c9a9730eadb50ef62ec74597acc3e008480722f.zip
xlwmenu.c (XlwMenuDestroy): Remove XtDestroyWidget on subwidgets (Bug #6127).
-rw-r--r--lwlib/ChangeLog5
-rw-r--r--lwlib/xlwmenu.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 5988977df3a..bc2c8b7f7a4 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,8 @@
12010-05-08 Jan Djärv <jan.h.d@swipnet.se>
2
3 * xlwmenu.c (XlwMenuDestroy): Remove XtDestroyWidget on subwidgets
4 (Bug #6127).
5
12010-05-06 Glenn Morris <rgm@gnu.org> 62010-05-06 Glenn Morris <rgm@gnu.org>
2 7
3 * Makefile.in (CPP, LN_S, TOP, LN): Remove unused variables. 8 * Makefile.in (CPP, LN_S, TOP, LN): Remove unused variables.
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index 52a89de2204..1bb0d50b6d7 100644
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -2177,7 +2177,6 @@ XlwMenuDestroy (w)
2177 { 2177 {
2178 if (mw->menu.windows [i].pixmap != None) 2178 if (mw->menu.windows [i].pixmap != None)
2179 XFreePixmap (XtDisplay (mw), mw->menu.windows [i].pixmap); 2179 XFreePixmap (XtDisplay (mw), mw->menu.windows [i].pixmap);
2180 XtDestroyWidget (mw->menu.windows [i].w);
2181#ifdef HAVE_XFT 2180#ifdef HAVE_XFT
2182 if (mw->menu.windows [i].xft_draw) 2181 if (mw->menu.windows [i].xft_draw)
2183 XftDrawDestroy (mw->menu.windows [i].xft_draw); 2182 XftDrawDestroy (mw->menu.windows [i].xft_draw);