From 9372a153dd574a730f5c31d776683cdcabe8fa65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Tue, 26 Mar 2013 11:50:09 +0100 Subject: [PATCH] win32: Prefix color names with CTK_ For consistency with ctk-curses, prefix CTK colors with CTK_. Also introduce COLOR_BG to make it easier to change the widgets background at once. --- platform/win32/contiki-conf.h | 42 ++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/platform/win32/contiki-conf.h b/platform/win32/contiki-conf.h index 1d483945c..82ea56474 100644 --- a/platform/win32/contiki-conf.h +++ b/platform/win32/contiki-conf.h @@ -116,27 +116,29 @@ typedef unsigned short uip_stats_t; #define CTK_CONF_MENUS 0 #endif /* PLATFORM_BUILD */ -#define COLOR_BLACK (0) -#define COLOR_BLUE (1) -#define COLOR_GRAY (1 | 2 | 4) -#define COLOR_CYAN (1 | 2 | 8) -#define COLOR_YELLOW (2 | 4 | 8) -#define COLOR_WHITE (1 | 2 | 4 | 8) +#define CTK_COLOR_BLACK (0) +#define CTK_COLOR_BLUE (1) +#define CTK_COLOR_GRAY (1 | 2 | 4) +#define CTK_COLOR_CYAN (1 | 2 | 8) +#define CTK_COLOR_YELLOW (2 | 4 | 8) +#define CTK_COLOR_WHITE (1 | 2 | 4 | 8) -#define BORDERCOLOR COLOR_BLACK -#define SCREENCOLOR COLOR_BLACK -#define BACKGROUNDCOLOR COLOR_BLACK -#define WINDOWCOLOR_FOCUS COLOR_WHITE | COLOR_BLUE * 0x10 -#define WINDOWCOLOR COLOR_GRAY | COLOR_BLUE * 0x10 -#define DIALOGCOLOR COLOR_WHITE | COLOR_BLUE * 0x10 -#define WIDGETCOLOR_HLINK COLOR_CYAN | COLOR_BLUE * 0x10 -#define WIDGETCOLOR_FWIN COLOR_WHITE | COLOR_BLUE * 0x10 -#define WIDGETCOLOR COLOR_GRAY | COLOR_BLUE * 0x10 -#define WIDGETCOLOR_DIALOG COLOR_WHITE | COLOR_BLUE * 0x10 -#define WIDGETCOLOR_FOCUS COLOR_YELLOW | COLOR_BLUE * 0x10 -#define MENUCOLOR COLOR_WHITE | COLOR_BLUE * 0x10 -#define OPENMENUCOLOR COLOR_WHITE | COLOR_BLUE * 0x10 -#define ACTIVEMENUITEMCOLOR COLOR_YELLOW | COLOR_BLUE * 0x10 +#define COLOR_BG CTK_COLOR_BLUE + +#define BORDERCOLOR CTK_COLOR_BLACK +#define SCREENCOLOR CTK_COLOR_BLACK +#define BACKGROUNDCOLOR CTK_COLOR_BLACK +#define WINDOWCOLOR_FOCUS CTK_COLOR_WHITE | COLOR_BG * 0x10 +#define WINDOWCOLOR CTK_COLOR_GRAY | COLOR_BG * 0x10 +#define DIALOGCOLOR CTK_COLOR_WHITE | COLOR_BG * 0x10 +#define WIDGETCOLOR_HLINK CTK_COLOR_CYAN | COLOR_BG * 0x10 +#define WIDGETCOLOR_FWIN CTK_COLOR_WHITE | COLOR_BG * 0x10 +#define WIDGETCOLOR CTK_COLOR_GRAY | COLOR_BG * 0x10 +#define WIDGETCOLOR_DIALOG CTK_COLOR_WHITE | COLOR_BG * 0x10 +#define WIDGETCOLOR_FOCUS CTK_COLOR_YELLOW | COLOR_BG * 0x10 +#define MENUCOLOR CTK_COLOR_WHITE | COLOR_BG * 0x10 +#define OPENMENUCOLOR CTK_COLOR_WHITE | COLOR_BG * 0x10 +#define ACTIVEMENUITEMCOLOR CTK_COLOR_YELLOW | COLOR_BG * 0x10 #ifdef PLATFORM_BUILD