diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 02a9b0bdf8..3529b39876 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,12 +17,29 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-03-11 08:33 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbxpp/dmlb.ch + + Added comment that header is also used by C code. + + * contrib/gtwvg/gtwvg.c + * contrib/gtwvg/gtwvg.h + ! Partial revert of previous revert: + There was no reason to revert macro names, so + I kept these in sync with the rest of Harbour, + only colors are kept as non-MS-DOS compatible. + ; TOFIX: Palette indexing. + + * examples/hbdoc2/gentxt.prg + ! Fixed to previous fix to rather delete unused + parameter in definition, than addig it to + declaration and mark it as unused. + 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 + 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. @@ -59,13 +76,13 @@ How it works: 1. Load prototype tags in "Projects Functions Lookup". 2. Activate some editor tab. - 3. Start typing a function proto. + 3. Start typing a function proto. 4. After 3 characters a popup will appear beneth the cursor. 5. Select from the list, by mouse or use navigation keys. - 6. Prototype will be there in the editor exactly with + 6. Prototype will be there in the editor exactly with same cases your prototype is defined. - Input is welcome. + Input is welcome. 2010-03-10 21:42 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg diff --git a/harbour/contrib/gtwvg/gtwvg.c b/harbour/contrib/gtwvg/gtwvg.c index f3f5c83f74..dd8c0ecc8c 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] = WHITE; - pWVT->COLORS[ 8] = LIGHT_GRAY; + pWVT->COLORS[ 7] = LIGHT_GRAY; + pWVT->COLORS[ 8] = 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] = BRIGHT_WHITE; + pWVT->COLORS[15] = 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 cf3b949a52..171ca67b30 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( 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 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 LIGHT_GRAY RGB( 0xC6,0xC6,0xC6 ) +#define 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 WHITE RGB( 0xFF,0xFF,0xFF ) #define WM_MY_UPDATE_CARET ( WM_USER + 0x0101 ) diff --git a/harbour/contrib/hbxpp/dmlb.ch b/harbour/contrib/hbxpp/dmlb.ch index 25481e33b6..3d5d2c8540 100644 --- a/harbour/contrib/hbxpp/dmlb.ch +++ b/harbour/contrib/hbxpp/dmlb.ch @@ -50,6 +50,8 @@ * */ +/* NOTE: This file is also used by C code. */ + #ifndef _DMLB_CH #define _DMLB_CH diff --git a/harbour/examples/hbdoc2/gentxt.prg b/harbour/examples/hbdoc2/gentxt.prg index c72010c8ae..443cf81168 100644 --- a/harbour/examples/hbdoc2/gentxt.prg +++ b/harbour/examples/hbdoc2/gentxt.prg @@ -87,8 +87,8 @@ PROTECTED: DATA lContinuous AS LOGICAL INIT .F. EXPORTED: - METHOD NewIndex( cFolder, cFilename, cTitle, cDescription ) - METHOD NewDocument( cFolder, cFilename, cTitle, cDescription ) + METHOD NewIndex( cFolder, cFilename, cTitle ) + METHOD NewDocument( cFolder, cFilename, cTitle ) METHOD AddEntry( oEntry ) METHOD AddIndex( oEntry ) HIDDEN METHOD BeginSection( cSection, cFilename ) @@ -98,14 +98,12 @@ EXPORTED: METHOD WriteEntry( cCaption, cEntry, lPreformatted ) HIDDEN ENDCLASS -METHOD NewDocument( cFolder, cFilename, cTitle, cDescription ) CLASS GenerateText - HB_SYMBOL_UNUSED( cDescription ) +METHOD NewDocument( cFolder, cFilename, cTitle ) CLASS GenerateText super:NewDocument( cFolder, cFilename, cTitle, "txt" ) ::WriteEntry( "", cTitle + HB_OSNewLine(), .F. ) RETURN self -METHOD NewIndex( cFolder, cFilename, cTitle, cDescription ) CLASS GenerateText - HB_SYMBOL_UNUSED( cDescription ) +METHOD NewIndex( cFolder, cFilename, cTitle ) CLASS GenerateText super:NewIndex( cFolder, cFilename, cTitle, "txt" ) ::WriteEntry( "", cTitle + HB_OSNewLine(), .F. ) RETURN self