deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

win32: Prefix color names with CTK_

Browse source 
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.
This commit is contained in:
François Revol 2013-03-26 11:50:09 +01:00
parent 5350f36d19
commit 9372a153dd
1 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
platform/win32/contiki-conf.h
View file

@ -116,27 +116,29 @@ typedef unsigned short uip_stats_t;
#define CTK_CONF_MENUS 0 #define CTK_CONF_MENUS 0
#endif /* PLATFORM_BUILD */ #endif /* PLATFORM_BUILD */
#define COLOR_BLACK (0) #define CTK_COLOR_BLACK (0)
#define COLOR_BLUE (1) #define CTK_COLOR_BLUE (1)
#define COLOR_GRAY (1 | 2 | 4) #define CTK_COLOR_GRAY (1 | 2 | 4)
#define COLOR_CYAN (1 | 2 | 8) #define CTK_COLOR_CYAN (1 | 2 | 8)
#define COLOR_YELLOW (2 | 4 | 8) #define CTK_COLOR_YELLOW (2 | 4 | 8)
#define COLOR_WHITE (1 | 2 | 4 | 8) #define CTK_COLOR_WHITE (1 | 2 | 4 | 8)
#define BORDERCOLOR COLOR_BLACK #define COLOR_BG CTK_COLOR_BLUE
#define SCREENCOLOR COLOR_BLACK
#define BACKGROUNDCOLOR COLOR_BLACK #define BORDERCOLOR CTK_COLOR_BLACK
#define WINDOWCOLOR_FOCUS COLOR_WHITE | COLOR_BLUE * 0x10 #define SCREENCOLOR CTK_COLOR_BLACK
#define WINDOWCOLOR COLOR_GRAY | COLOR_BLUE * 0x10 #define BACKGROUNDCOLOR CTK_COLOR_BLACK
#define DIALOGCOLOR COLOR_WHITE | COLOR_BLUE * 0x10 #define WINDOWCOLOR_FOCUS CTK_COLOR_WHITE | COLOR_BG * 0x10
#define WIDGETCOLOR_HLINK COLOR_CYAN | COLOR_BLUE * 0x10 #define WINDOWCOLOR CTK_COLOR_GRAY | COLOR_BG * 0x10
#define WIDGETCOLOR_FWIN COLOR_WHITE | COLOR_BLUE * 0x10 #define DIALOGCOLOR CTK_COLOR_WHITE | COLOR_BG * 0x10
#define WIDGETCOLOR COLOR_GRAY | COLOR_BLUE * 0x10 #define WIDGETCOLOR_HLINK CTK_COLOR_CYAN | COLOR_BG * 0x10
#define WIDGETCOLOR_DIALOG COLOR_WHITE | COLOR_BLUE * 0x10 #define WIDGETCOLOR_FWIN CTK_COLOR_WHITE | COLOR_BG * 0x10
#define WIDGETCOLOR_FOCUS COLOR_YELLOW | COLOR_BLUE * 0x10 #define WIDGETCOLOR CTK_COLOR_GRAY | COLOR_BG * 0x10
#define MENUCOLOR COLOR_WHITE | COLOR_BLUE * 0x10 #define WIDGETCOLOR_DIALOG CTK_COLOR_WHITE | COLOR_BG * 0x10
#define OPENMENUCOLOR COLOR_WHITE | COLOR_BLUE * 0x10 #define WIDGETCOLOR_FOCUS CTK_COLOR_YELLOW | COLOR_BG * 0x10
#define ACTIVEMENUITEMCOLOR COLOR_YELLOW | COLOR_BLUE * 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 #ifdef PLATFORM_BUILD