CVS update by james xemacs/lwlib ...

[xemacs-cvs at xemacs.org]

  User: james   
  Date: 07/09/18 04:55:31

  Modified:    xemacs/lwlib ChangeLog xlwmenu.c xlwtabs.c
Log:
Release XftFont resources.  See xemacs-patches message
<870180fe0709151610s3618b854y1f845489d4723f00 at mail.gmail.com>.

Revision  Changes    Path
1.94      +5 -0      XEmacs/xemacs/lwlib/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/ChangeLog,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- ChangeLog	2007/05/21 05:01:34	1.93
+++ ChangeLog	2007/09/18 02:55:29	1.94
@@ -1,3 +1,8 @@
+2007-09-15  Jerry James  <james at xemacs.org>
+
+	* xlwmenu.c (XlwMenuDestroy): Release XftFont resources
+	* xlwtabs.c (TabsDestroy): Ditto
+
 2007-05-21  Stephen J. Turnbull  <stephen at xemacs.org>
 
 	* XEmacs 21.5.28 "fuki" is released.



1.44      +4 -0      XEmacs/xemacs/lwlib/xlwmenu.c

Index: xlwmenu.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwmenu.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- xlwmenu.c	2006/11/17 02:50:22	1.43
+++ xlwmenu.c	2007/09/18 02:55:29	1.44
@@ -3351,6 +3351,10 @@ XlwMenuDestroy (Widget w)
   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. */



1.10      +5 -1      XEmacs/xemacs/lwlib/xlwtabs.c

Index: xlwtabs.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwtabs.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- xlwtabs.c	2006/11/17 02:50:22	1.9
+++ xlwtabs.c	2007/09/18 02:55:29	1.10
@@ -572,7 +572,11 @@ TabsRealize(Widget w, Mask *valueMask, X
 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) ;
 }