Omit the ctk_icon if CTK_CONF_ICONS is 0.
diff --git a/contiki-c64/apps/blueround-dsc.c b/contiki-c64/apps/blueround-dsc.c
index cfcebee..221f293 100644
--- a/contiki-c64/apps/blueround-dsc.c
+++ b/contiki-c64/apps/blueround-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: blueround-dsc.c,v 1.3 2004/06/27 12:43:33 oliverschmidt Exp $
+ * $Id: blueround-dsc.c,v 1.4 2005/03/18 00:51:17 oliverschmidt Exp $
*
*/
@@ -67,6 +67,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
+#if CTK_CONF_ICONS
static struct ctk_icon blueround_icon =
{CTK_ICON("Blueround", blueroundicon_bitmap, blueroundicon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki-c64/apps/cgterm-dsc.c b/contiki-c64/apps/cgterm-dsc.c
index a8fc709..3cd086e 100644
--- a/contiki-c64/apps/cgterm-dsc.c
+++ b/contiki-c64/apps/cgterm-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: cgterm-dsc.c,v 1.1 2004/09/19 19:52:58 adamdunkels Exp $
+ * $Id: cgterm-dsc.c,v 1.2 2005/03/18 00:51:17 oliverschmidt Exp $
*
*/
@@ -67,6 +67,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
+#if CTK_CONF_ICONS
static struct ctk_icon icon =
{CTK_ICON("C/G terminal", cgtermicon_bitmap, cgtermicon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki-c64/apps/configedit-dsc.c b/contiki-c64/apps/configedit-dsc.c
index 4e6406a..ddeb5a9 100644
--- a/contiki-c64/apps/configedit-dsc.c
+++ b/contiki-c64/apps/configedit-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: configedit-dsc.c,v 1.4 2004/06/27 12:43:33 oliverschmidt Exp $
+ * $Id: configedit-dsc.c,v 1.5 2005/03/18 00:51:17 oliverschmidt Exp $
*
*/
@@ -67,6 +67,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
+#if CTK_CONF_ICONS
static struct ctk_icon configedit_icon =
{CTK_ICON("Configuration", tcpipconficon_bitmap, tcpipconficon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki-c64/apps/default-dsc.c b/contiki-c64/apps/default-dsc.c
index 954eb86..60eb33b 100644
--- a/contiki-c64/apps/default-dsc.c
+++ b/contiki-c64/apps/default-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: default-dsc.c,v 1.3 2004/06/27 12:43:33 oliverschmidt Exp $
+ * $Id: default-dsc.c,v 1.4 2005/03/18 00:51:17 oliverschmidt Exp $
*
*/
@@ -65,6 +65,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
+#if CTK_CONF_ICONS
static struct ctk_icon default_icon =
{CTK_ICON("Default", defaulticon_bitmap, defaulticon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki-c64/apps/enabler-dsc.c b/contiki-c64/apps/enabler-dsc.c
index bbfe932..d9b5522 100644
--- a/contiki-c64/apps/enabler-dsc.c
+++ b/contiki-c64/apps/enabler-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: enabler-dsc.c,v 1.2 2004/06/27 12:43:33 oliverschmidt Exp $
+ * $Id: enabler-dsc.c,v 1.3 2005/03/18 00:51:17 oliverschmidt Exp $
*
*/
@@ -67,6 +67,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
+#if CTK_CONF_ICONS
static struct ctk_icon enabler_icon =
{CTK_ICON("Enabler", enablericon_bitmap, enablericon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki-c64/apps/memstat-dsc.c b/contiki-c64/apps/memstat-dsc.c
index 17dc291..d049912 100644
--- a/contiki-c64/apps/memstat-dsc.c
+++ b/contiki-c64/apps/memstat-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: memstat-dsc.c,v 1.3 2004/06/27 12:43:33 oliverschmidt Exp $
+ * $Id: memstat-dsc.c,v 1.4 2005/03/18 00:51:17 oliverschmidt Exp $
*
*/
@@ -67,6 +67,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
+#if CTK_CONF_ICONS
static struct ctk_icon memstat_icon =
{CTK_ICON("Memory stats", memstaticon_bitmap, memstaticon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki-c64/apps/plasma-dsc.c b/contiki-c64/apps/plasma-dsc.c
index a826c5e..14ff02e 100644
--- a/contiki-c64/apps/plasma-dsc.c
+++ b/contiki-c64/apps/plasma-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: plasma-dsc.c,v 1.2 2004/06/27 12:43:33 oliverschmidt Exp $
+ * $Id: plasma-dsc.c,v 1.3 2005/03/18 00:51:17 oliverschmidt Exp $
*
*/
@@ -67,6 +67,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
+#if CTK_CONF_ICONS
static struct ctk_icon plasma_icon =
{CTK_ICON("Plasma", plasmaicon_bitmap, plasmaicon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki-c64/apps/ravenpine-dsc.c b/contiki-c64/apps/ravenpine-dsc.c
index 97aa639..5e27df6 100644
--- a/contiki-c64/apps/ravenpine-dsc.c
+++ b/contiki-c64/apps/ravenpine-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: ravenpine-dsc.c,v 1.2 2004/06/27 12:43:33 oliverschmidt Exp $
+ * $Id: ravenpine-dsc.c,v 1.3 2005/03/18 00:51:17 oliverschmidt Exp $
*
*/
@@ -67,6 +67,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
+#if CTK_CONF_ICONS
static struct ctk_icon ravenpine_icon =
{CTK_ICON("Ravenpine", ravenpineicon_bitmap, ravenpineicon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki-c64/apps/springlight-dsc.c b/contiki-c64/apps/springlight-dsc.c
index 9580a51..011067e 100644
--- a/contiki-c64/apps/springlight-dsc.c
+++ b/contiki-c64/apps/springlight-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: springlight-dsc.c,v 1.2 2004/06/27 12:43:33 oliverschmidt Exp $
+ * $Id: springlight-dsc.c,v 1.3 2005/03/18 00:51:17 oliverschmidt Exp $
*
*/
@@ -67,6 +67,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
+#if CTK_CONF_ICONS
static struct ctk_icon springlight_icon =
{CTK_ICON("Springlight", springlighticon_bitmap, springlighticon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki-c64/apps/ssfire-dsc.c b/contiki-c64/apps/ssfire-dsc.c
index 23d862e..7dc5683 100644
--- a/contiki-c64/apps/ssfire-dsc.c
+++ b/contiki-c64/apps/ssfire-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: ssfire-dsc.c,v 1.3 2004/06/27 12:43:33 oliverschmidt Exp $
+ * $Id: ssfire-dsc.c,v 1.4 2005/03/18 00:51:17 oliverschmidt Exp $
*
*/
@@ -67,6 +67,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
+#if CTK_CONF_ICONS
static struct ctk_icon ssfire_icon =
{CTK_ICON("Fire", ssfireicon_bitmap, ssfireicon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki-c64/apps/wget-dsc.c b/contiki-c64/apps/wget-dsc.c
index c43b406..891af8b 100644
--- a/contiki-c64/apps/wget-dsc.c
+++ b/contiki-c64/apps/wget-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: wget-dsc.c,v 1.2 2004/06/27 12:43:33 oliverschmidt Exp $
+ * $Id: wget-dsc.c,v 1.3 2005/03/18 00:51:17 oliverschmidt Exp $
*
*/
@@ -67,6 +67,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
+#if CTK_CONF_ICONS
static struct ctk_icon icon =
{CTK_ICON("Web downloader", wgeticon_bitmap, wgeticon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/