From 7c6cb8b4c690a61f2f70a68725fbfcecd617fb10 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 29 Mar 2013 14:39:09 +0100 Subject: [PATCH] fixed to use HB_BOOL instead of BOOL, formatting (.t. -> .T.) --- ChangeLog.txt | 7 +++++++ contrib/gtwvg/gtwvg.h | 4 ++-- contrib/gtwvg/tests/demowvg.prg | 2 +- contrib/gtwvg/wvgcore.c | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index f8e150f79d..9d5282a8ee 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,13 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-03-29 14:38 UTC+0100 Viktor Szakats (harbour syenar.net) + * contrib/gtwvg/gtwvg.h + * contrib/gtwvg/tests/demowvg.prg + * contrib/gtwvg/wvgcore.c + ! fixed to use HB_BOOL instead of BOOL + ! formatting (.t. -> .T.) + 2013-03-29 14:20 UTC+0100 Viktor Szakats (harbour syenar.net) * utils/hbmk2/hbmk2.hbp * utils/hbmk2/hbmk2.el_GR.po -> utils/hbmk2/po/hbmk2.el_GR.po diff --git a/contrib/gtwvg/gtwvg.h b/contrib/gtwvg/gtwvg.h index ff60cd5a52..e58c7c655f 100644 --- a/contrib/gtwvg/gtwvg.h +++ b/contrib/gtwvg/gtwvg.h @@ -575,10 +575,10 @@ extern HB_EXPORT POINT hb_wvt_gtGetXYFromColRow( int col, int row ); #if ! defined( HB_OS_WIN_CE ) extern HB_EXPORT IPicture * hb_wvt_gtLoadPicture( LPCTSTR image ); extern HB_EXPORT IPicture * hb_wvt_gtLoadPictureFromResource( LPCTSTR resource, LPCTSTR section ); -extern HB_EXPORT HB_BOOL hb_wvt_gtRenderPicture( int x1, int y1, int wd, int ht, IPicture * iPicture, BOOL bDoNotScale ); +extern HB_EXPORT HB_BOOL hb_wvt_gtRenderPicture( int x1, int y1, int wd, int ht, IPicture * iPicture, HB_BOOL bDoNotScale ); extern HB_EXPORT HB_BOOL hb_wvt_gtDestroyPicture( IPicture * iPicture ); #endif -extern HB_EXPORT HB_BOOL hb_wvt_DrawImage( HDC hdc, int x1, int y1, int wd, int ht, LPCTSTR image, BOOL bDoNotScale ); +extern HB_EXPORT HB_BOOL hb_wvt_DrawImage( HDC hdc, int x1, int y1, int wd, int ht, LPCTSTR image, HB_BOOL bDoNotScale ); extern HB_EXPORT void hb_wvt_GetStringAttrib( int top, int left, int bottom, int right, HB_BYTE * sBuffer, HB_BYTE * sAttrib ); extern HB_EXPORT void hb_wvt_PutStringAttrib( int top, int left, int bottom, int right, HB_BYTE * sBuffer, HB_BYTE * sAttrib ); diff --git a/contrib/gtwvg/tests/demowvg.prg b/contrib/gtwvg/tests/demowvg.prg index e4e1ab34ea..a4eb70cabf 100644 --- a/contrib/gtwvg/tests/demowvg.prg +++ b/contrib/gtwvg/tests/demowvg.prg @@ -129,7 +129,7 @@ PROCEDURE Main() AAdd( aBlocks, {|| Wvt_DrawBoxRecessed( 7, 61, 13, 70 ) } ) AAdd( aBlocks, {|| Wvt_DrawBoxGroup( 15, 59, 18, 72 ) } ) AAdd( aBlocks, {|| Wvt_DrawBoxGroup( 5, 6, 19, 44 ) } ) - AAdd( aBlocks, {|| Wvt_DrawImage( 8, 62, 12, 69, IMAGE_VOUCH, , .t. ) } ) + AAdd( aBlocks, {|| Wvt_DrawImage( 8, 62, 12, 69, IMAGE_VOUCH, , .T. ) } ) AAdd( aBlocks, {|| Wvt_DrawBoxRecessed( 7, 48, 13, 55 ) } ) AAdd( aBlocks, {|| Wvt_DrawLine( MaxRow() - 2, 0, MaxRow() - 2, MaxCol(), WVT_LINE_HORZ, WVT_LINE_RECESSED, WVT_LINE_BOTTOM ) } ) AAdd( aBlocks, {|| Wvt_DrawLine( MaxRow() - 1, 41, MaxRow(), 41, WVT_LINE_VERT, WVT_LINE_RECESSED, WVT_LINE_CENTER ) } ) diff --git a/contrib/gtwvg/wvgcore.c b/contrib/gtwvg/wvgcore.c index dcfde86ac5..1ad1225c5b 100644 --- a/contrib/gtwvg/wvgcore.c +++ b/contrib/gtwvg/wvgcore.c @@ -198,7 +198,7 @@ IPicture * hb_wvt_gtLoadPicture( LPCTSTR image ) return ( IPicture * ) iPicture; } -HB_BOOL hb_wvt_gtRenderPicture( int x, int y, int wd, int ht, IPicture * iPicture, BOOL bDoNotScale ) +HB_BOOL hb_wvt_gtRenderPicture( int x, int y, int wd, int ht, IPicture * iPicture, HB_BOOL bDoNotScale ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -497,7 +497,7 @@ BOOL CALLBACK hb_wvt_gtDlgProcModal( HWND hDlg, UINT message, WPARAM wParam, LPA return lReturn; } -HB_BOOL hb_wvt_DrawImage( HDC hdc, int x, int y, int wd, int ht, LPCTSTR lpImage, BOOL bDoNotScale ) +HB_BOOL hb_wvt_DrawImage( HDC hdc, int x, int y, int wd, int ht, LPCTSTR lpImage, HB_BOOL bDoNotScale ) { #if ! defined( HB_OS_WIN_CE ) HGLOBAL hGlobal;