Passage en Zinc

1 files changed, 14 insertions, 14 deletions

diff --git a/generic/Image.c b/generic/Image.c
index 1b9093b..e568beb 100644
--- a/generic/Image.c
+++ b/generic/Image.c
@@ -62,8 +62,8 @@ static Tcl_HashTable	bitmap_masks;
  **********************************************************************************
  */
 ImageBits *
-GetImageBits(RadarWindow	win,
-	     RadarImage		image)
+GetImageBits(ZnWindow	win,
+	     ZnImage	image)
 {
   static int	inited = 0;
   Tcl_HashEntry	*entry;
@@ -75,7 +75,7 @@ GetImageBits(RadarWindow	win,
   XGCValues	values;
   GC		gc;
   ImageBits	*im_bits;
-  RadarBool	full_mask=True;
+  ZnBool	full_mask=True;
   
   if (!inited) {
     Tcl_InitHashTable(&image_bits, TCL_ONE_WORD_KEYS);
@@ -87,9 +87,9 @@ GetImageBits(RadarWindow	win,
   }
   else {
     Tk_SizeOfImage(image, &width, &height);
-    im_bits = (ImageBits *) RadarMalloc(sizeof(ImageBits));
+    im_bits = (ImageBits *) ZnMalloc(sizeof(ImageBits));
     im_bits->pixmaps = NULL;
-    pmap = XCreatePixmap(dpy, RadarWindowId(win), width, height, depth);
+    pmap = XCreatePixmap(dpy, ZnWindowId(win), width, height, depth);
 
     values.foreground = 0;
     gc = XCreateGC(dpy, pmap, GCForeground, &values);
@@ -110,7 +110,7 @@ GetImageBits(RadarWindow	win,
     /*
      * The image structure can be setup locally (TODO).
      */
-    pmap = XCreatePixmap(dpy, RadarWindowId(win), width, height, 1);
+    pmap = XCreatePixmap(dpy, ZnWindowId(win), width, height, 1);
     values.foreground = 0;
     gc = XCreateGC(dpy, pmap, GCForeground, &values);
     XFillRectangle(dpy, pmap, gc, 0, 0, width, height);
@@ -132,7 +132,7 @@ GetImageBits(RadarWindow	win,
     XDestroyImage(im2);
     if (full_mask) {
       XDestroyImage(mask);
-      im_bits->mask = RadarUnspecifiedPattern;
+      im_bits->mask = ZnUnspecifiedPattern;
     }
     else {
       im_bits->mask = mask;
@@ -146,7 +146,7 @@ GetImageBits(RadarWindow	win,
 }
 
 void
-InvalidateImage(RadarImage	image)
+InvalidateImage(ZnImage	image)
 {
   Tcl_HashEntry	*entry;
   ImageBits	*im_bits;
@@ -167,10 +167,10 @@ InvalidateImage(RadarImage	image)
     while (im_pmap) {
       next_im_pmap = im_pmap->next;
       XFreePixmap(im_pmap->dpy, im_pmap->pixmap);
-      RadarFree(im_pmap);
+      ZnFree(im_pmap);
       im_pmap = next_im_pmap;
     }
-    RadarFree(im_bits);
+    ZnFree(im_bits);
     Tcl_DeleteHashEntry(entry);
   }
 }
@@ -184,8 +184,8 @@ InvalidateImage(RadarImage	image)
  **********************************************************************************
  */
 Pixmap
-GetImagePixmap(RadarWindow	win,
-	       RadarImage	image)
+GetImagePixmap(ZnWindow	win,
+	       ZnImage	image)
 {
   ImageBits	*im_bits;
   Display	*dpy = Tk_Display(win);
@@ -200,10 +200,10 @@ GetImagePixmap(RadarWindow	win,
     next_im_pmap = next_im_pmap->next;
   }
   if (!im_pmap || (im_pmap->dpy != dpy)) {
-    next_im_pmap = (ImagePixmap *) RadarMalloc(sizeof(ImagePixmap));
+    next_im_pmap = (ImagePixmap *) ZnMalloc(sizeof(ImagePixmap));
     next_im_pmap->next = NULL;
     next_im_pmap->dpy = dpy;
-    pixmap = XCreatePixmap(dpy, RadarWindowId(win),
+    pixmap = XCreatePixmap(dpy, ZnWindowId(win),
 			   im_bits->width, im_bits->height, depth);
     Tk_RedrawImage(image, 0, 0, im_bits->width, im_bits->height, pixmap, 0, 0);
     next_im_pmap->pixmap = pixmap;