changeset 4173:03f6627a2e09

[xemacs-hg @ 2007-09-18 02:55:29 by james] Release XftFont resources. See xemacs-patches message <870180fe0709151610s3618b854y1f845489d4723f00@mail.gmail.com>.
author james
date Tue, 18 Sep 2007 02:55:29 +0000
parents a7adbba5c862
children bc500dccda43
files lwlib/ChangeLog lwlib/xlwmenu.c lwlib/xlwtabs.c
diffstat 3 files changed, 14 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lwlib/ChangeLog	Mon Sep 17 21:50:52 2007 +0000
+++ b/lwlib/ChangeLog	Tue Sep 18 02:55:29 2007 +0000
@@ -1,3 +1,8 @@
+2007-09-15  Jerry James  <james@xemacs.org>
+
+	* xlwmenu.c (XlwMenuDestroy): Release XftFont resources
+	* xlwtabs.c (TabsDestroy): Ditto
+
 2007-05-21  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.28 "fuki" is released.
--- a/lwlib/xlwmenu.c	Mon Sep 17 21:50:52 2007 +0000
+++ b/lwlib/xlwmenu.c	Tue Sep 18 02:55:29 2007 +0000
@@ -3351,6 +3351,10 @@
   XFreePixmap (XtDisplay (mw), mw->menu.gray_pixmap);
   mw->menu.gray_pixmap = (Pixmap) -1;
 
+#ifdef USE_XFT_MENUBARS
+  XftFontClose (XtDisplay (mw), mw->menu.renderFont);
+#endif
+
   /* Don't free mw->menu.contents because that comes from our creator.
      The `*_stack' elements are just pointers into `contents' so leave
      that alone too.  But free the stacks themselves. */
--- a/lwlib/xlwtabs.c	Mon Sep 17 21:50:52 2007 +0000
+++ b/lwlib/xlwtabs.c	Tue Sep 18 02:55:29 2007 +0000
@@ -572,7 +572,11 @@
 static	void
 TabsDestroy(Widget w)
 {
-	TabsFreeGCs((TabsWidget)w) ;
+	TabsWidget tw = (TabsWidget) w;
+#ifdef USE_XFT_TABS
+	XftFontClose (XtDisplay (w), tw->tabs.renderFont);
+#endif /* ! USE_XFT_TABS */
+	TabsFreeGCs (tw) ;
 }