commit f0d728a7e37af6d0c732b8ebd038a935063c12da
author oliverschmidt <oliverschmidt> dim. juin 27 18:32:39 2004 +0000
committer oliverschmidt <oliverschmidt> dim. juin 27 18:32:39 2004 +0000
tree f56abf5f03379efd7cf378566e24e94b2afe22be
parent 10cb4f5c0df798b1c2325f2100caa00ad874d0c6

Excluded icon drawing code from compilation if no icon support is configured.

contiki-apple2/ctk/ctk-mousetext.c

diff --git a/contiki-apple2/ctk/ctk-mousetext.c b/contiki-apple2/ctk/ctk-mousetext.c
index d8ebc67..547a7a1 100644
--- a/contiki-apple2/ctk/ctk-mousetext.c
+++ b/contiki-apple2/ctk/ctk-mousetext.c
@@ -29,7 +29,7 @@
  *
  * This file is part of the "ctk" console GUI toolkit for cc65
  *
- * $Id: ctk-mousetext.c,v 1.2 2004/06/27 15:05:13 oliverschmidt Exp $
+ * $Id: ctk-mousetext.c,v 1.3 2004/06/27 18:32:39 oliverschmidt Exp $
  *
  */
 
@@ -185,6 +185,7 @@
     }
     revers(0);
     break;
+#if CTK_CONF_ICONS
   case CTK_WIDGET_ICON:
     if(ypos >= clipy1 && ypos < clipy2) {
       if(wfocus != 0) {
@@ -192,7 +193,7 @@
       } else {
 	revers(0);
       }
-      gotoxy(xpos, ypos);
+#if CTK_CONF_ICON_TEXTMAPS
       if(w->widget.icon.textmap != NULL) {
 	for(i = 0; i < 3; ++i) {
 	  gotoxy(xpos, ypos);
@@ -204,20 +205,21 @@
 	  ++ypos;
 	}
       }
-      x = xpos;
+#endif /* CTK_CONF_ICON_TEXTMAPS */
   
       len = strlen(w->widget.icon.title);
-      if(x + len >= sizex) {
-	x = sizex - len;
+      if(xpos + len >= sizex) {
+	xpos = sizex - len;
       }
 
-      gotoxy(x, ypos);
+      gotoxy(xpos, ypos);
       if(ypos >= clipy1 && ypos < clipy2) {
 	cputs(w->widget.icon.title);
       }
       revers(0);
     }
     break;
+#endif /* CTK_CONF_ICONS */
 
   default:
     break;