From b651cee20aeb3142f4f0242cff56a50979194301 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Thu, 11 Mar 2010 04:18:41 +0000 Subject: [PATCH] 2010-03-10 20:15 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/gtwvg/gtwvg.c * contrib/gtwvg/gtwvg.h ! Reverted back the change in colors. Sorry Viktor, I unnecessarily requested you to match it with GTWVT. Infact the whole concept of GUI elements is based on white and gray combination as per these colors. --- harbour/ChangeLog | 9 +++++++++ harbour/contrib/gtwvg/gtwvg.c | 6 +++--- harbour/contrib/gtwvg/gtwvg.h | 32 ++++++++++++++++---------------- 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1dbb4ac016..02a9b0bdf8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,15 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-03-10 20:15 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * contrib/gtwvg/gtwvg.c + * contrib/gtwvg/gtwvg.h + ! Reverted back the change in colors. + Sorry Viktor, I unnecessarily requested you to + match it with GTWVT. Infact the whole concept of + GUI elements is based on white and gray combination + as per these colors. + 2010-03-10 20:04 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * examples/hbdoc2/genhtml.prg * examples/hbdoc2/gentxt.prg diff --git a/harbour/contrib/gtwvg/gtwvg.c b/harbour/contrib/gtwvg/gtwvg.c index dd8c0ecc8c..f3f5c83f74 100644 --- a/harbour/contrib/gtwvg/gtwvg.c +++ b/harbour/contrib/gtwvg/gtwvg.c @@ -343,15 +343,15 @@ static PHB_GTWVT hb_gt_wvt_New( PHB_GT pGT, HINSTANCE hInstance, int iCmdShow ) pWVT->COLORS[ 4] = RED; pWVT->COLORS[ 5] = MAGENTA; pWVT->COLORS[ 6] = BROWN; - pWVT->COLORS[ 7] = LIGHT_GRAY; - pWVT->COLORS[ 8] = GRAY; + pWVT->COLORS[ 7] = WHITE; + pWVT->COLORS[ 8] = LIGHT_GRAY; pWVT->COLORS[ 9] = BRIGHT_BLUE; pWVT->COLORS[10] = BRIGHT_GREEN; pWVT->COLORS[11] = BRIGHT_CYAN; pWVT->COLORS[12] = BRIGHT_RED; pWVT->COLORS[13] = BRIGHT_MAGENTA; pWVT->COLORS[14] = YELLOW; - pWVT->COLORS[15] = WHITE; + pWVT->COLORS[15] = BRIGHT_WHITE; /* THESE are the default font parameters, if not changed by user */ pWVT->PTEXTSIZE.x = WVT_DEFAULT_FONT_WIDTH; diff --git a/harbour/contrib/gtwvg/gtwvg.h b/harbour/contrib/gtwvg/gtwvg.h index ebe48b00b0..cf3b949a52 100644 --- a/harbour/contrib/gtwvg/gtwvg.h +++ b/harbour/contrib/gtwvg/gtwvg.h @@ -126,22 +126,22 @@ HB_EXTERN_BEGIN #endif #define WVT_DEFAULT_FONT_NAME "Courier New" -#define BLACK RGB( 0x00, 0x00, 0x00 ) -#define BLUE RGB( 0x00, 0x00, 0xAA ) -#define GREEN RGB( 0x00, 0xAA, 0x00 ) -#define CYAN RGB( 0x00, 0xAA, 0xAA ) -#define RED RGB( 0xAA, 0x00, 0x00 ) -#define MAGENTA RGB( 0xAA, 0x00, 0xAA ) -#define BROWN RGB( 0xAA, 0x55, 0x00 ) -#define LIGHT_GRAY RGB( 0xAA, 0xAA, 0xAA ) -#define GRAY RGB( 0x55, 0x55, 0x55 ) -#define BRIGHT_BLUE RGB( 0x55, 0x55, 0xFF ) -#define BRIGHT_GREEN RGB( 0x55, 0xFF, 0x55 ) -#define BRIGHT_CYAN RGB( 0x55, 0xFF, 0xFF ) -#define BRIGHT_RED RGB( 0xFF, 0x55, 0x55 ) -#define BRIGHT_MAGENTA RGB( 0xFF, 0x55, 0xFF ) -#define YELLOW RGB( 0xFF, 0xFF, 0x55 ) -#define WHITE RGB( 0xFF, 0xFF, 0xFF ) +#define BLACK RGB( 0x0 ,0x0 ,0x0 ) +#define BLUE RGB( 0x0 ,0x0 ,0x85 ) +#define GREEN RGB( 0x0 ,0x85,0x0 ) +#define CYAN RGB( 0x0 ,0x85,0x85 ) +#define RED RGB( 0x85,0x0 ,0x0 ) +#define MAGENTA RGB( 0x85,0x0 ,0x85 ) +#define BROWN RGB( 0x85,0x85,0x0 ) +#define WHITE RGB( 0xC6,0xC6,0xC6 ) +#define LIGHT_GRAY RGB( 0x60,0x60,0x60 ) +#define BRIGHT_BLUE RGB( 0x00,0x00,0xFF ) +#define BRIGHT_GREEN RGB( 0x60,0xFF,0x60 ) +#define BRIGHT_CYAN RGB( 0x60,0xFF,0xFF ) +#define BRIGHT_RED RGB( 0xF8,0x00,0x26 ) +#define BRIGHT_MAGENTA RGB( 0xFF,0x60,0xFF ) +#define YELLOW RGB( 0xFF,0xFF,0x00 ) +#define BRIGHT_WHITE RGB( 0xFF,0xFF,0xFF ) #define WM_MY_UPDATE_CARET ( WM_USER + 0x0101 )