* (ZnGetBitmap): Correction de l'allocation d'une pixmap

	specifique au display lors de la creation d'une bitmap (Corrige
	le bug d'A.Marion).
        * (ZnTexFontTex): Ajout du symbole euro.

1 files changed, 6 insertions, 13 deletions

diff --git a/generic/Image.c b/generic/Image.c
index 9569c53..dc314ee 100644
--- a/generic/Image.c
+++ b/generic/Image.c
@@ -537,6 +537,7 @@ ZnGetBitmap(WidgetInfo	*wi,
       line += bits->rowstride;
     }
     XDestroyImage(mask);
+    Tk_FreeBitmap(wi->dpy, pmap);
     entry = Tcl_CreateHashEntry(&images, bitmap_name, &new);
     Tcl_SetHashValue(entry, (ClientData) bits);
     bits->hash = entry;
@@ -574,18 +575,10 @@ ZnGetBitmap(WidgetInfo	*wi,
   else {
     image->i.x.dpy = wi->dpy;
     image->i.x.mask_pmap = None;
-    if (bits->images == NULL) {
-      /*
-       * For the first one, the Tk_GetBitmap call has already been done.
-       */
-      image->i.x.pixmap = pmap;
-    }
-    else {
-      /*
-       * Need to get a pixmap that match this dpy.
-       */
-      image->i.x.pixmap = Tk_GetBitmap(wi->interp, wi->win, bitmap_name);
-    }
+    /*
+     * Need to get a pixmap that match this dpy.
+     */
+    image->i.x.pixmap = Tk_GetBitmap(wi->interp, wi->win, Tk_GetUid(bitmap_name));
   }
   image->next = bits->images;
   bits->images = image;
@@ -1298,7 +1291,7 @@ ZnTexFontTex(ZnTexFontInfo	tfi)
 {
   TexFontInfo	*this = (TexFontInfo *) tfi;
   TexFont	*txf = this->txf;
-  unsigned char	*glisto = "\t\x14\x15\x16\x17 !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_abcdefghijmklmnopqrstuvwxyz{|}~°ΐΒΗΘΙΚΛΞΟΤΩΫάΰβηθικλξοτωϋό~`";
+  unsigned char	*glisto = "\t\x14\x15\x16\x17 !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_abcdefghijmklmnopqrstuvwxyz{|}~°ΐΒΗΘΙΚΛΞΟΤΩΫάΰβηθικλξοτωϋό~`~";
   unsigned char *glist=NULL, *glist2=NULL;
   TexGlyphInfo	*tgi;
   int		i, j;