From 04106132510d07ffec803a589d2131b3aad32d9e Mon Sep 17 00:00:00 2001 From: lecoanet Date: Mon, 9 Dec 2002 14:40:25 +0000 Subject: * Corretion pour une compilation propre en Tcl --- generic/Image.c | 6 ++++-- generic/Image.h | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/generic/Image.c b/generic/Image.c index 87d1c30..10566a6 100644 --- a/generic/Image.c +++ b/generic/Image.c @@ -114,6 +114,7 @@ typedef struct _ImageBits { } ImageBits; +#ifdef GLX /* * Working only for 16 bits displays with 5r6g5b mask, * and 24/32 bits displays. Byte ordering ok on Intel @@ -259,6 +260,7 @@ To2Power(int a) } return result; } +#endif /* @@ -422,7 +424,7 @@ GetImageInstance(WidgetInfo *wi, ZnImage ZnGetImage(WidgetInfo *wi, - char *image_name) + Tk_Uid image_name) { Tcl_HashEntry *entry; int new; @@ -495,7 +497,7 @@ ZnGetImage(WidgetInfo *wi, */ ZnImage ZnGetBitmap(WidgetInfo *wi, - char *bitmap_name) + Tk_Uid bitmap_name) { Tcl_HashEntry *entry; ImageBits *bits; diff --git a/generic/Image.h b/generic/Image.h index b234b5a..21b625d 100644 --- a/generic/Image.h +++ b/generic/Image.h @@ -45,11 +45,11 @@ typedef void *ZnImage; (((bits)[(y)*(stride)+((x)>>3)]<<((x)&7))&0x80) ZnImage -ZnGetImage(struct _WidgetInfo *wi, char *image_name); +ZnGetImage(struct _WidgetInfo *wi, Tk_Uid image_name); ZnImage ZnGetImageByValue(ZnImage image); ZnImage -ZnGetBitmap(struct _WidgetInfo *wi, char *bitmap_name); +ZnGetBitmap(struct _WidgetInfo *wi, Tk_Uid bitmap_name); void ZnFreeImage(ZnImage image); char * -- cgit v1.1