commit 4134361980b0f105adc270adb968ed33b2f164f6
author adamdunkels <adamdunkels> jeu. juil. 31 23:23:25 2003 +0000
committer adamdunkels <adamdunkels> jeu. juil. 31 23:23:25 2003 +0000
tree 915fc82f1366d4b26cc2a154031a49666ac58cfa
parent 7e90fbfd5b8387ef7daf233365f693b8f9c023df

Updated to use new widget->h field

contiki-c64/ctk/ctk-hires.c

diff --git a/contiki-c64/ctk/ctk-hires.c b/contiki-c64/ctk/ctk-hires.c
index ad01bc3..bf1078e 100644
--- a/contiki-c64/ctk/ctk-hires.c
+++ b/contiki-c64/ctk/ctk-hires.c
@@ -32,7 +32,7 @@
  *
  * This file is part of the "ctk" console GUI toolkit for cc65
  *
- * $Id: ctk-hires.c,v 1.2 2003/04/24 17:05:41 adamdunkels Exp $
+ * $Id: ctk-hires.c,v 1.3 2003/07/31 23:23:25 adamdunkels Exp $
  *
  */
 
@@ -572,7 +572,7 @@
   case CTK_WIDGET_LABEL:
     hires_color(ctk_hires_theme.labelcolors[focus]);
     text = w->widget.label.text;
-    for(i = 0; i < w->widget.label.h; ++i) {
+    for(i = 0; i < w->h; ++i) {
       if(ypos >= clipy1 && ypos < clipy2) {
 	hires_gotoxy(xpos, ypos);
 	ctk_hires_cputsn(text, w->w);
@@ -685,7 +685,7 @@
   case CTK_WIDGET_BITMAP:
     hires_color(ctk_hires_theme.bitmapcolors[focus]);
     ctk_hires_bitmapptr = w->widget.bitmap.bitmap;
-    for(i = 0; i < w->widget.bitmap.h; ++i) {
+    for(i = 0; i < w->h; ++i) {
       if(ypos >= clipy1 && ypos < clipy2) {
 	hires_gotoxy(xpos, ypos);
 	ctk_hires_draw_bitmapline(w->w);
@@ -746,7 +746,6 @@
 		unsigned char clipy1, unsigned char clipy2)
 {
   register struct ctk_widget *w;
-  
   x = window->x;
   y = window->y + 1;
 
@@ -781,7 +780,7 @@
      ctk_hires_windowparams.clipy2 > 0) {
     ctk_hires_draw_windowborders();
   }
-  
+
   focus = focus & CTK_FOCUS_WINDOW;
   
   /* Draw inactive widgets. */
@@ -914,9 +913,8 @@
 ctk_draw_menus(struct ctk_menus *menus)
 {
   struct ctk_menu *m;
-  
+    
   /* Draw menus */
-
   hires_color(ctk_hires_theme.menucolor); 
   hires_gotoxy(0, 0);
   hires_revers(0);
@@ -925,7 +923,7 @@
     if(m != menus->open) {
       ctk_hires_cputsn(m->title, m->titlelen);
       ctk_hires_cputc(' ');
-    } else {
+    } else {     
       draw_menu(m);
     }
   }