From 2b1fc69b1c21ae1ce53f9a640f416e1234359fdf Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Thu, 11 Mar 2010 21:20:08 +0000 Subject: [PATCH] 2010-03-11 13:20 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/gtwvg/gtwvg.c ! Fixed the HB_GTI_PALETTE protocol uniform with other GT's. * contrib/gtwvg/tests/demowvg.prg ! ThreadID() -> Hb_ThreadID() BTW ThreadID() is a Xbase++ compatible function. --- harbour/ChangeLog | 8 ++++++++ harbour/contrib/gtwvg/gtwvg.c | 8 ++++---- harbour/contrib/gtwvg/tests/demowvg.prg | 4 ++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4cb5477b6c..1e4aac1f1b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,14 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-03-11 13:20 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * contrib/gtwvg/gtwvg.c + ! Fixed the HB_GTI_PALETTE protocol uniform with other GT's. + + * contrib/gtwvg/tests/demowvg.prg + ! ThreadID() -> Hb_ThreadID() + BTW ThreadID() is a Xbase++ compatible function. + 2010-03-11 22:16 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbstack.h * added HB_EXPORT to some hb_stack*() functions which can be needed diff --git a/harbour/contrib/gtwvg/gtwvg.c b/harbour/contrib/gtwvg/gtwvg.c index dd8c0ecc8c..319261820b 100644 --- a/harbour/contrib/gtwvg/gtwvg.c +++ b/harbour/contrib/gtwvg/gtwvg.c @@ -3381,13 +3381,13 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) { int iIndex = hb_itemGetNI( pInfo->pNewVal ); - if( iIndex > 0 && iIndex <= 16 ) + if( iIndex >= 0 && iIndex <= 15 ) { - pInfo->pResult = hb_itemPutNL( pInfo->pResult, pWVT->COLORS[ iIndex - 1 ] ); + pInfo->pResult = hb_itemPutNL( pInfo->pResult, pWVT->COLORS[ iIndex ] ); if( hb_itemType( pInfo->pNewVal2 ) & HB_IT_NUMERIC ) { - pWVT->COLORS[ iIndex - 1 ] = hb_itemGetNL( pInfo->pNewVal2 ); + pWVT->COLORS[ iIndex ] = hb_itemGetNL( pInfo->pNewVal2 ); if( pWVT->hWnd ) HB_GTSELF_EXPOSEAREA( pWVT->pGT, 0, 0, pWVT->ROWS, pWVT->COLS ); @@ -3407,7 +3407,7 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) { if( hb_arrayLen( pInfo->pNewVal ) == 16 ) { - for( i = 0; i < 16; i++ ) + for( i = 0; i <= 15; i++ ) pWVT->COLORS[ i ] = hb_arrayGetNL( pInfo->pNewVal, i + 1 ); if( pWVT->hWnd ) diff --git a/harbour/contrib/gtwvg/tests/demowvg.prg b/harbour/contrib/gtwvg/tests/demowvg.prg index f5f5225128..697ba0e1dc 100644 --- a/harbour/contrib/gtwvg/tests/demowvg.prg +++ b/harbour/contrib/gtwvg/tests/demowvg.prg @@ -845,7 +845,7 @@ FUNCTION WvtMyBrowse_X( oCrt ) DispBox( 0, 0, maxrow(), maxcol(), " ", "N/W" ) DispOutAt( oBrowse:nTop-2, oBrowse:nleft, padc( cFileDbf, oBrowse:nRight-oBrowse:nLeft+1 ), "W+/W" ) - DispOutAt( maxrow(), 0, padc( ' ',maxcol()+1), 'B/W' ) + DispOutAt( maxrow(), 0, padc( ' ',maxcol()+1), 'B/W' ) oTBar:buttonClick := {|oBtn| IF( oBtn:caption=='Show',__keyboard( chr( K_DOWN ) ),nil ) } @@ -876,7 +876,7 @@ FUNCTION WvtMyBrowse_X( oCrt ) DispBox( 0, 0, maxrow(), maxcol(), " ", "N/W" ) DispOutAt( oBrowse:nTop-2, oBrowse:nleft, padc( cFileDbf, oBrowse:nRight - oBrowse:nLeft + 1 ), "W+/W" ) - DispOutAt( maxrow(), 0, padc( ' ',maxcol()+1), 'B/W' ) + DispOutAt( maxrow(), 0, padc( ' ',maxcol()+1), 'B/W' ) oBrowse:configure() case nKey == K_F2