commit 3eac04f59cce5193ea65fcfb66dc0b46a6a76f3e
author adamdunkels <adamdunkels> dim. sept. 12 07:22:39 2004 +0000
committer adamdunkels <adamdunkels> dim. sept. 12 07:22:39 2004 +0000
tree 898fd75c1c843d2b3e370ef375ef30d2ef7cac73
parent 4e85294dc9cef2c2b5d2b5705fa6148e98ad336d

Fixed bug with BITMAP widget

contiki/ctk/ctk.h

diff --git a/contiki/ctk/ctk.h b/contiki/ctk/ctk.h
index 0c04455..1f9d9e8 100644
--- a/contiki/ctk/ctk.h
+++ b/contiki/ctk/ctk.h
@@ -43,7 +43,7 @@
  *
  * This file is part of the Contiki desktop OS.
  *
- * $Id: ctk.h,v 1.21 2004/08/09 20:30:50 adamdunkels Exp $
+ * $Id: ctk.h,v 1.22 2004/09/12 07:22:39 adamdunkels Exp $
  *
  */
 
@@ -315,15 +315,20 @@
   char *textmap;
 };
 
-#define CTK_BITMAP(x, y, w, h, bitmap) \
-  NULL, NULL, x, y, CTK_WIDGET_BITMAP, w, h, CTK_WIDGET_FLAG_INITIALIZER(0) bitmap,
+#define CTK_BITMAP(x, y, w, h, bitmap, bitmap_width, bitmap_height) \
+  NULL, NULL, x, y, CTK_WIDGET_BITMAP, w, h, \
+  CTK_WIDGET_FLAG_INITIALIZER(0) bitmap, bitmap_width, bitmap_height
 struct ctk_bitmap {
   struct ctk_widget *next;
   struct ctk_window *window;
   unsigned char x, y;
   unsigned char type;
   unsigned char w, h;
+#if CTK_CONF_WIDGET_FLAGS
+  unsigned char flags;
+#endif /* CTK_CONF_WIDGET_FLAGS */
   unsigned char *bitmap;
+  unsigned short bw, bh;
 };
 
 #define CTK_TEXTMAP_NORMAL 0
@@ -383,6 +388,7 @@
 
 struct ctk_widget_bitmap {
   unsigned char *bitmap;
+  unsigned short bw, bh;  
 };
 /** @} */