diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7ee4b7d7c5..4215e9e296 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,17 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-01-15 12:11 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * contrib/gtwvg/gtwvg.h + * contrib/gtwvg/wvggui.c + * contrib/gtwvg/wvgcuig.c + * contrib/gtwvg/wvgwin.c + * contrib/gtwvg/wvgutils.c + * contrib/gtwvg/wvgcore.c + * contrib/gtwvg/wvgwing.c + * TRUE -> HB_TRUE + * FALSE -> HB_FALSE + 2010-01-15 12:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * src/macro/macro.yyc * src/macro/macro.y diff --git a/harbour/contrib/gtwvg/gtwvg.h b/harbour/contrib/gtwvg/gtwvg.h index e34956f4c1..62da7f908d 100644 --- a/harbour/contrib/gtwvg/gtwvg.h +++ b/harbour/contrib/gtwvg/gtwvg.h @@ -346,8 +346,8 @@ typedef struct COLORREF COLORS[ 16 ]; /* colors */ - HB_BOOL CaretExist; /* TRUE if a caret has been created */ - HB_BOOL CaretHidden; /* TRUE if a caret has been hiden */ + HB_BOOL CaretExist; /* HB_TRUE if a caret has been created */ + HB_BOOL CaretHidden; /* HB_TRUE if a caret has been hiden */ int CaretSize; /* Height of solid caret */ int CaretWidth; /* Width of solid caret */ @@ -360,7 +360,7 @@ typedef struct int keyLast; /* last inkey code value in buffer */ POINT PTEXTSIZE; /* size of the fixed width font */ - HB_BOOL FixedFont; /* TRUE if current font is a fixed font */ + HB_BOOL FixedFont; /* HB_TRUE if current font is a fixed font */ int FixedSize[ WVT_MAX_COLS ]; /* buffer for ExtTextOut() to emulate fixed pitch when Proportional font selected */ int fontHeight; /* requested font height */ int fontWidth; /* requested font width */ diff --git a/harbour/contrib/gtwvg/wvgcore.c b/harbour/contrib/gtwvg/wvgcore.c index 4973e2f6db..d89502c63a 100644 --- a/harbour/contrib/gtwvg/wvgcore.c +++ b/harbour/contrib/gtwvg/wvgcore.c @@ -243,7 +243,7 @@ HB_BOOL hb_wvt_gtRenderPicture( int x1, int y1, int wd, int ht, IPicture * iPict int toc = 0; HRGN hrgn1; POINT lpp; - HB_BOOL bResult = FALSE; + HB_BOOL bResult = HB_FALSE; if( iPicture ) { @@ -317,7 +317,7 @@ HB_BOOL hb_wvt_gtRenderPicture( int x1, int y1, int wd, int ht, IPicture * iPict DeleteObject( hrgn1 ); } - bResult = TRUE; + bResult = HB_TRUE; } return bResult; @@ -327,12 +327,12 @@ HB_BOOL hb_wvt_gtRenderPicture( int x1, int y1, int wd, int ht, IPicture * iPict HB_BOOL hb_wvt_gtDestroyPicture( IPicture * iPicture ) { - HB_BOOL bResult = FALSE; + HB_BOOL bResult = HB_FALSE; if( iPicture ) { iPicture->lpVtbl->Release( iPicture ); - bResult = TRUE; + bResult = HB_TRUE; } return bResult; @@ -602,7 +602,7 @@ HB_BOOL hb_wvt_DrawImage( HDC hdc, int x1, int y1, int wd, int ht, const char * int toc = 0 ; HRGN hrgn1; POINT lpp = { 0,0 }; - HB_BOOL bResult = FALSE; + HB_BOOL bResult = HB_FALSE; LPTSTR lpImage = HB_TCHAR_CONVTO( image ); hFile = CreateFile( lpImage, GENERIC_READ, 0, NULL, OPEN_EXISTING, @@ -675,7 +675,7 @@ HB_BOOL hb_wvt_DrawImage( HDC hdc, int x1, int y1, int wd, int ht, const char * DeleteObject( hrgn1 ); iPicture->lpVtbl->Release( iPicture ); - bResult = TRUE ; + bResult = HB_TRUE ; } } GlobalFree( hGlobal ); @@ -691,7 +691,7 @@ HB_BOOL hb_wvt_DrawImage( HDC hdc, int x1, int y1, int wd, int ht, const char * HB_SYMBOL_UNUSED( wd ); HB_SYMBOL_UNUSED( ht ); HB_SYMBOL_UNUSED( image ); - return FALSE; + return HB_FALSE; #endif } @@ -987,7 +987,7 @@ HB_FUNC( WVT_SETPEN ) if ( !HB_ISNUM( 1 ) ) { - hb_retl( FALSE ); + hb_retl( HB_FALSE ); } iPenStyle = hb_parni( 1 ) ; @@ -1004,11 +1004,11 @@ HB_FUNC( WVT_SETPEN ) } _s->currentPen = hPen; - hb_retl( TRUE ); + hb_retl( HB_TRUE ); } else { - hb_retl( FALSE ); + hb_retl( HB_FALSE ); } } @@ -1025,7 +1025,7 @@ HB_FUNC( WVT_SETBRUSH ) if ( !HB_ISNUM( 1 ) ) { - hb_retl( FALSE ); + hb_retl( HB_FALSE ); } lb.lbStyle = hb_parnl( 1 ); @@ -1044,11 +1044,11 @@ HB_FUNC( WVT_SETBRUSH ) } _s->currentBrush = hBrush; - hb_retl( TRUE ); + hb_retl( HB_TRUE ); } else { - hb_retl( FALSE ); + hb_retl( HB_FALSE ); } } @@ -1198,9 +1198,9 @@ HB_FUNC( WVT_DRAWIMAGE ) #endif } - hb_retl( TRUE ); + hb_retl( HB_TRUE ); #else - hb_retl( FALSE ); + hb_retl( HB_FALSE ); #endif } @@ -1268,10 +1268,10 @@ HB_FUNC( WVT_DRAWLABEL ) #endif HB_TCHAR_FREE( text ); DeleteObject( hFont ); - hb_retl( TRUE ); + hb_retl( HB_TRUE ); } - hb_retl( FALSE ); + hb_retl( HB_FALSE ); } /*----------------------------------------------------------------------*/ @@ -1545,7 +1545,7 @@ HB_FUNC( WVT_DRAWLINE ) SelectObject( _s->hGuiDC, hOldPenGUI ); } DeleteObject( hPen ); - hb_retl( TRUE ); + hb_retl( HB_TRUE ); } /*----------------------------------------------------------------------*/ @@ -1739,7 +1739,7 @@ HB_FUNC( WVT_DRAWGRIDHORZ ) } } #endif - hb_retl( TRUE ); + hb_retl( HB_TRUE ); } /*----------------------------------------------------------------------*/ @@ -1756,7 +1756,7 @@ HB_FUNC( WVT_DRAWGRIDVERT ) if ( ! iTabs ) { - hb_retl( FALSE ); + hb_retl( HB_FALSE ); } iCharWidth = _s->PTEXTSIZE.x; @@ -1789,7 +1789,7 @@ HB_FUNC( WVT_DRAWGRIDVERT ) } } #endif - hb_retl( TRUE ); + hb_retl( HB_TRUE ); } /*----------------------------------------------------------------------*/ @@ -1955,7 +1955,7 @@ HB_FUNC( WVT_DRAWBUTTON ) #endif } - hb_retl( TRUE ); + hb_retl( HB_TRUE ); } /*----------------------------------------------------------------------*/ @@ -2098,10 +2098,10 @@ HB_FUNC( WVT_DRAWLABELEX ) } #endif HB_TCHAR_FREE( text ); - hb_retl( TRUE ); + hb_retl( HB_TRUE ); } - hb_retl( FALSE ); + hb_retl( HB_FALSE ); } /*----------------------------------------------------------------------*/ @@ -2313,7 +2313,7 @@ HB_FUNC( WVT_DRAWLINEEX ) break; } - hb_retl( TRUE ); + hb_retl( HB_TRUE ); } /*----------------------------------------------------------------------*/ @@ -2445,7 +2445,7 @@ HB_FUNC( WVT_DRAWLABELOBJ ) } #endif HB_TCHAR_FREE( text ); - hb_retl( TRUE ); + hb_retl( HB_TRUE ); } /*----------------------------------------------------------------------*/ @@ -2500,7 +2500,7 @@ HB_FUNC( WVT_DRAWTOOLBUTTONSTATE ) } break; } - hb_retl( TRUE ); + hb_retl( HB_TRUE ); } /*----------------------------------------------------------------------*/ @@ -2733,7 +2733,7 @@ HB_FUNC( WVT_DRAWSHADEDRECT ) { PHB_GTWVT _s = hb_wvt_gtGetWVT(); - HB_BOOL bGF = FALSE; + HB_BOOL bGF = HB_FALSE; if ( _s->pGUI->hMSImg32 ) { @@ -2977,7 +2977,7 @@ HB_FUNC( WVT_CREATEFONT ) */ HB_FUNC( WVT_LOADPICTURE ) { - HB_BOOL bResult = FALSE; + HB_BOOL bResult = HB_FALSE; #if ! defined( HB_OS_WIN_CE ) PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -2992,7 +2992,7 @@ HB_FUNC( WVT_LOADPICTURE ) } _s->pGUI->iPicture[ iSlot ] = iPicture; - bResult = TRUE; + bResult = HB_TRUE; } #endif hb_retl( bResult ); @@ -3002,7 +3002,7 @@ HB_FUNC( WVT_LOADPICTURE ) HB_FUNC( WVT_LOADPICTUREFROMRESOURCE ) { - HB_BOOL bResult = FALSE; + HB_BOOL bResult = HB_FALSE; #if ! defined( HB_OS_WIN_CE ) PHB_GTWVT _s = hb_wvt_gtGetWVT(); @@ -3017,7 +3017,7 @@ HB_FUNC( WVT_LOADPICTUREFROMRESOURCE ) } _s->pGUI->iPicture[ iSlot ] = iPicture; - bResult = TRUE; + bResult = HB_TRUE; } #endif hb_retl( bResult ); @@ -3090,11 +3090,11 @@ HB_FUNC( WVT_LOADPEN ) } _s->pGUI->hUserPens[ iSlot ] = hPen; - hb_retl( TRUE ); + hb_retl( HB_TRUE ); } else { - hb_retl( FALSE ); + hb_retl( HB_FALSE ); } } @@ -3151,7 +3151,7 @@ HB_FUNC( WVT_RESTSCREEN ) HBITMAP hBmp; HDC hCompDC; - HB_BOOL bResult = FALSE; + HB_BOOL bResult = HB_FALSE; HB_BOOL bDoNotDestroyBMP = hb_parl( 6 ); xy = hb_wvt_gtGetXYFromColRow( hb_parni( 2 ), hb_parni( 1 ) );; @@ -3177,7 +3177,7 @@ HB_FUNC( WVT_RESTSCREEN ) 0, 0, SRCCOPY ) ) { - bResult = TRUE; + bResult = HB_TRUE; } } else @@ -3190,7 +3190,7 @@ HB_FUNC( WVT_RESTSCREEN ) hb_parvni( 5,2 ), SRCCOPY ) ) { - bResult = TRUE; + bResult = HB_TRUE; } } } diff --git a/harbour/contrib/gtwvg/wvgcuig.c b/harbour/contrib/gtwvg/wvgcuig.c index 8ea0e53391..1ad3e60b94 100644 --- a/harbour/contrib/gtwvg/wvgcuig.c +++ b/harbour/contrib/gtwvg/wvgcuig.c @@ -207,7 +207,7 @@ HB_FUNC( WVG_SETGOBJDATA ) { PHB_GTWVT pWVT = hb_wvt_gtGetWVT(); int iHandle = hb_parni( 1 ); - HB_BOOL bSuccess = FALSE; + HB_BOOL bSuccess = HB_FALSE; if( iHandle ) { @@ -219,7 +219,7 @@ HB_FUNC( WVG_SETGOBJDATA ) { int iDataType = hb_parni( 2 ); - bSuccess = TRUE; + bSuccess = HB_TRUE; switch( iDataType ) { @@ -254,7 +254,7 @@ HB_FUNC( WVG_SETGOBJDATA ) if( gObj->bDestroyPicture && gObj->iPicture ) gObj->iPicture->lpVtbl->Release( gObj->iPicture ); gObj->iPicture = iPicture; - gObj->bDestroyPicture = TRUE; + gObj->bDestroyPicture = HB_TRUE; } break; } @@ -263,25 +263,25 @@ HB_FUNC( WVG_SETGOBJDATA ) if( gObj->hFont && gObj->bDestroyFont ) DeleteObject( gObj->hFont ); gObj->hFont = ( HFONT ) ( HB_PTRDIFF ) hb_parnint( 3 ); - gObj->bDestroyFont = FALSE; + gObj->bDestroyFont = HB_FALSE; break; case GOBJ_OBJDATA_HPEN: if( gObj->hPen && gObj->bDestroyPen ) DeleteObject( gObj->hPen ); gObj->hPen = ( HPEN ) ( HB_PTRDIFF ) hb_parnint( 3 ); - gObj->bDestroyPen = FALSE; + gObj->bDestroyPen = HB_FALSE; break; case GOBJ_OBJDATA_HBRUSH: if( gObj->hBrush && gObj->bDestroyBrush ) DeleteObject( gObj->hBrush ); gObj->hBrush = ( HBRUSH ) ( HB_PTRDIFF ) hb_parnint( 3 ); - gObj->bDestroyBrush = TRUE; + gObj->bDestroyBrush = HB_TRUE; break; case GOBJ_OBJDATA_COLORTEXT: if( HB_ISNUM( 3 ) ) gObj->crRGBText = ( COLORREF ) ( HB_PTRDIFF ) hb_parnint( 3 ); else - bSuccess = FALSE; + bSuccess = HB_FALSE; break; case GOBJ_OBJDATA_COLORBK: gObj->crRGBBk = HB_ISNUM( 3 ) ? ( COLORREF ) ( HB_PTRDIFF ) hb_parnint( 3 ) : ( COLORREF ) 0; @@ -292,7 +292,7 @@ HB_FUNC( WVG_SETGOBJDATA ) gObj->bBlock = hb_itemNew( hb_param( 3, HB_IT_BLOCK ) ); break; default: - bSuccess = FALSE; + bSuccess = HB_FALSE; break; } if( bSuccess ) @@ -630,7 +630,7 @@ HB_FUNC( WVG_LABEL ) gObj->crRGBText = ( COLORREF ) hb_parnint( 7 ); gObj->crRGBBk = HB_ISNUM( 8 ) ? ( COLORREF ) hb_parnint( 8 ) : ( COLORREF ) 0; gObj->hFont = hFont; - gObj->bDestroyFont = TRUE; + gObj->bDestroyFont = HB_TRUE; gObj->gObjNext = pWVT->gObjs; pWVT->gObjs = gObj; @@ -669,7 +669,7 @@ HB_FUNC( WVG_LABELEX ) gObj->crRGBBk = HB_ISNUM( 7 ) ? ( COLORREF ) hb_parnint( 7 ) : ( COLORREF ) 0; gObj->hFont = pWVT->pGUI->hUserFonts[ hb_parni( 8 ) - 1 ]; - gObj->bDestroyFont = FALSE; + gObj->bDestroyFont = HB_FALSE; gObj->gObjNext = pWVT->gObjs; pWVT->gObjs = gObj; @@ -725,12 +725,12 @@ HB_FUNC( WVG_OUTLINE ) if ( gObj->iWidth > 0 ) { gObj->hPen = CreatePen( gObj->iWidth, gObj->iStyle, gObj->crRGB ); - gObj->bDestroyPen = TRUE; + gObj->bDestroyPen = HB_TRUE; } else { gObj->hPen = pWVT->pGUI->penBlack; - gObj->bDestroyPen = FALSE; + gObj->bDestroyPen = HB_FALSE; } gObj->gObjNext = pWVT->gObjs; @@ -760,12 +760,12 @@ HB_FUNC( WVG_OUTLINEEX ) if ( pWVT->pGUI->hUserPens[ hb_parni( 6 )-1 ] ) { gObj->hPen = pWVT->pGUI->hUserPens[ hb_parni( 6 )-1 ]; - gObj->bDestroyPen = FALSE; + gObj->bDestroyPen = HB_FALSE; } else { gObj->hPen = pWVT->pGUI->penBlack; - gObj->bDestroyPen = FALSE; + gObj->bDestroyPen = HB_FALSE; } gObj->gObjNext = pWVT->gObjs; @@ -820,7 +820,7 @@ HB_FUNC( WVG_LINE ) gObj->crRGB = ( COLORREF ) hb_parnl( 11 ); gObj->hPen = CreatePen( gObj->iStyle, gObj->iWidth, gObj->crRGB ); - gObj->bDestroyPen = TRUE; + gObj->bDestroyPen = HB_TRUE; gObj->gObjNext = pWVT->gObjs; pWVT->gObjs = gObj; @@ -851,7 +851,7 @@ HB_FUNC( WVG_LINEEX ) gObj->iAlign = hb_parni( 8 ); gObj->hPen = pWVT->pGUI->hUserPens[ hb_parni( 9 ) - 1 ]; - gObj->bDestroyPen = FALSE; + gObj->bDestroyPen = HB_FALSE; gObj->gObjNext = pWVT->gObjs; pWVT->gObjs = gObj; @@ -995,9 +995,9 @@ HB_FUNC( WVG_ELLIPSE ) gObj->aOffset.iRight = hb_parvni( 5,4 ); gObj->hPen = pWVT->currentPen; - gObj->bDestroyPen = FALSE; + gObj->bDestroyPen = HB_FALSE; gObj->hBrush = pWVT->currentBrush; - gObj->bDestroyBrush = FALSE; + gObj->bDestroyBrush = HB_FALSE; gObj->gObjNext = pWVT->gObjs; pWVT->gObjs = gObj; @@ -1035,9 +1035,9 @@ HB_FUNC( WVG_RECTANGLE ) gObj->aOffset.iRight = hb_parvni( 5,4 ); gObj->hPen = pWVT->currentPen; - gObj->bDestroyPen = FALSE; + gObj->bDestroyPen = HB_FALSE; gObj->hBrush = pWVT->currentBrush; - gObj->bDestroyBrush = FALSE; + gObj->bDestroyBrush = HB_FALSE; gObj->gObjNext = pWVT->gObjs; pWVT->gObjs = gObj; @@ -1078,9 +1078,9 @@ HB_FUNC( WVG_ROUNDRECT ) gObj->iWidth = hb_parni( 7 ); gObj->hPen = pWVT->currentPen; - gObj->bDestroyPen = FALSE; + gObj->bDestroyPen = HB_FALSE; gObj->hBrush = pWVT->currentBrush; - gObj->bDestroyBrush = FALSE; + gObj->bDestroyBrush = HB_FALSE; gObj->gObjNext = pWVT->gObjs; pWVT->gObjs = gObj; @@ -1122,7 +1122,7 @@ HB_FUNC( WVG_COLORRECT ) gObj->aOffset.iRight = hb_parvni( 5,4 ); gObj->hBrush = hBrush; - gObj->bDestroyBrush = TRUE; + gObj->bDestroyBrush = HB_TRUE; gObj->gObjNext = pWVT->gObjs; pWVT->gObjs = gObj; @@ -1241,7 +1241,7 @@ HB_FUNC( WVG_TEXTBOX ) gObj->crRGBBk = HB_ISNUM( 10 ) ? ( COLORREF ) hb_parnint( 10 ) : ( COLORREF ) 0; gObj->hFont = ( HFONT ) ( HB_PTRDIFF ) hb_parnint( 11 ); - gObj->bDestroyFont = FALSE; + gObj->bDestroyFont = HB_FALSE; gObj->gObjNext = pWVT->gObjs; pWVT->gObjs = gObj; @@ -1293,7 +1293,7 @@ HB_FUNC( WVG_PICTURE ) gObj->aOffset.iRight = hb_parvni( 5,4 ); gObj->iPicture = pWVT->pGUI->iPicture[ hb_parni( 6 )-1 ]; - gObj->bDestroyPicture = FALSE; + gObj->bDestroyPicture = HB_FALSE; gObj->gObjNext = pWVT->gObjs; pWVT->gObjs = gObj; @@ -1359,11 +1359,11 @@ HB_FUNC( WVG_IMAGE ) if( iSource == GOBJ_IMAGESOURCE_SLOT ) { - gObj->bDestroyPicture = FALSE; + gObj->bDestroyPicture = HB_FALSE; } else { - gObj->bDestroyPicture = TRUE; + gObj->bDestroyPicture = HB_TRUE; } gObj->gObjNext = pWVT->gObjs; diff --git a/harbour/contrib/gtwvg/wvggui.c b/harbour/contrib/gtwvg/wvggui.c index 9813a5b0eb..bb7ea4a5c9 100644 --- a/harbour/contrib/gtwvg/wvggui.c +++ b/harbour/contrib/gtwvg/wvggui.c @@ -181,7 +181,7 @@ static PHB_GTWVT hb_gt_wvt_Find( HWND hWnd ) static HB_BOOL hb_gt_wvt_Alloc( PHB_GTWVT pWVT ) { - HB_BOOL fOK = FALSE; + HB_BOOL fOK = HB_FALSE; WVGDEBUG( ( "wvggui:hb_gt_wvt_Alloc()" ) ); @@ -198,7 +198,7 @@ static HB_BOOL hb_gt_wvt_Alloc( PHB_GTWVT pWVT ) pWVT->iHandle = iPos; if( ++s_wvtCount == 1 ) hb_gt_wvt_RegisterClass( pWVT->hInstance ); - fOK = TRUE; + fOK = HB_TRUE; break; } ++iPos; @@ -278,21 +278,21 @@ static PHB_GTWVT hb_gt_wvt_New( PHB_GT pGT, HINSTANCE hInstance, int iCmdShow ) pWVT->MousePos.x = 0; pWVT->MousePos.y = 0; - pWVT->MouseMove = TRUE; + pWVT->MouseMove = HB_TRUE; pWVT->hWnd = NULL; pWVT->keyPointerIn = 0; pWVT->keyPointerOut = 0; pWVT->keyLast = 0; - pWVT->CentreWindow = TRUE; /* Default is to always display window in centre of screen */ + pWVT->CentreWindow = HB_TRUE; /* Default is to always display window in centre of screen */ pWVT->CodePage = OEM_CHARSET; /* GetACP(); - set code page to default system */ pWVT->Win9X = ( osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS ); - pWVT->IgnoreWM_SYSCHAR = FALSE; + pWVT->IgnoreWM_SYSCHAR = HB_FALSE; - pWVT->bResizable = TRUE; - pWVT->bClosable = TRUE; + pWVT->bResizable = HB_TRUE; + pWVT->bClosable = HB_TRUE; pWVT->pPP = ( HB_GT_PARAMS * ) hb_xgrab( sizeof( HB_GT_PARAMS ) ); pWVT->pPP->style = WS_THICKFRAME|WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX|WS_MAXIMIZEBOX; @@ -302,9 +302,9 @@ static PHB_GTWVT hb_gt_wvt_New( PHB_GT pGT, HINSTANCE hInstance, int iCmdShow ) pWVT->pPP->width = 600; pWVT->pPP->height = 400; pWVT->pPP->pParentGT = NULL; - pWVT->pPP->bVisible = FALSE; - pWVT->pPP->bConfigured = FALSE; - pWVT->pPP->bRowCols = FALSE; + pWVT->pPP->bVisible = HB_FALSE; + pWVT->pPP->bConfigured = HB_FALSE; + pWVT->pPP->bRowCols = HB_FALSE; pWVT->pPP->iWndType = 0; pWVT->hostCDP = hb_vmCDP(); @@ -317,7 +317,7 @@ static PHB_GTWVT hb_gt_wvt_New( PHB_GT pGT, HINSTANCE hInstance, int iCmdShow ) pWVT->chrTransTbl[ i ] = pWVT->keyTransTbl[ i ] = ( BYTE ) i; } #endif - pWVT->bResizing = FALSE; + pWVT->bResizing = HB_FALSE; pWVT->width = 600; pWVT->height = 400; @@ -410,11 +410,11 @@ static HB_BOOL hb_gt_wvt_GetCharFromInputQueue( PHB_GTWVT pWVT, int * iKey ) { pWVT->keyPointerOut = 0; } - return TRUE; + return HB_TRUE; } *iKey = 0; - return FALSE; + return HB_FALSE; } static void hb_gt_wvt_TranslateKey( PHB_GTWVT pWVT, int key, int shiftkey, int altkey, int controlkey ) @@ -507,11 +507,11 @@ static HB_BOOL hb_gt_wvt_GetWindowTitle( HWND hWnd, char ** title ) *title = ( char * ) hb_xgrab( iResult + 1 ); HB_TCHAR_GETFROM( *title, buffer, iResult ); ( *title )[ iResult ] = '\0'; - return TRUE; + return HB_TRUE; } *title = NULL; - return FALSE; + return HB_FALSE; } static void hb_gt_wvt_MouseEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, LPARAM lParam ) @@ -643,7 +643,7 @@ static HB_BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, { HB_BOOL bAlt = GetKeyState( VK_MENU ) & 0x8000; - pWVT->IgnoreWM_SYSCHAR = FALSE; + pWVT->IgnoreWM_SYSCHAR = HB_FALSE; switch( wParam ) { @@ -737,7 +737,7 @@ static HB_BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, if( bCtrl ) /* Not scroll lock */ { hb_gt_wvt_AddCharToInputQueue( pWVT, HB_BREAK_FLAG ); /* Pretend Alt+C pressed */ - pWVT->IgnoreWM_SYSCHAR = TRUE; + pWVT->IgnoreWM_SYSCHAR = HB_TRUE; } else { @@ -753,7 +753,7 @@ static HB_BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, wParam == VK_SUBTRACT || wParam == VK_DIVIDE ) ) { if( bAlt ) - pWVT->IgnoreWM_SYSCHAR = TRUE; + pWVT->IgnoreWM_SYSCHAR = HB_TRUE; switch( wParam ) { @@ -817,7 +817,7 @@ static HB_BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, if( pWVT->inCDP ) { #if defined( UNICODE ) - c = hb_cdpGetChar( pWVT->inCDP, FALSE, ( USHORT ) c ); + c = hb_cdpGetChar( pWVT->inCDP, HB_FALSE, ( USHORT ) c ); #else if( c > 0 && c <= 255 && pWVT->keyTransTbl[ c ] ) c = pWVT->keyTransTbl[ c ]; @@ -830,7 +830,7 @@ static HB_BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, } } } - pWVT->IgnoreWM_SYSCHAR = FALSE; /* As Suggested by Peter */ + pWVT->IgnoreWM_SYSCHAR = HB_FALSE; /* As Suggested by Peter */ break; } @@ -961,7 +961,7 @@ static HB_BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, } hb_gt_wvt_AddCharToInputQueue( pWVT, c ); } - pWVT->IgnoreWM_SYSCHAR = FALSE; + pWVT->IgnoreWM_SYSCHAR = HB_FALSE; } } @@ -1122,7 +1122,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara hb_gt_wvt_FireEvent( pWVT, HB_GTE_MOUSE, pEvParams ); - pWVT->bTracking = FALSE; + pWVT->bTracking = HB_FALSE; break; } #endif @@ -1281,7 +1281,7 @@ static HWND hb_gt_wvt_CreateWindow( PHB_GTWVT pWVT ) } } if( pWVT->pPP->y < 0 ) - pWVT->CentreWindow = TRUE; + pWVT->CentreWindow = HB_TRUE; } hWnd = CreateWindowEx( @@ -1338,7 +1338,7 @@ static HB_BOOL hb_gt_wvt_CreateConsoleWindow( PHB_GTWVT pWVT ) } } - return TRUE; + return HB_TRUE; } /* ********************************************************************** */ @@ -1449,15 +1449,15 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) case HB_GTI_KBDSUPPORT: case HB_GTI_ISGRAPHIC: { - pInfo->pResult = hb_itemPutL( pInfo->pResult, TRUE ); + pInfo->pResult = hb_itemPutL( pInfo->pResult, HB_TRUE ); break; } case HB_GTI_ISUNICODE: { #if defined( UNICODE ) - pInfo->pResult = hb_itemPutL( pInfo->pResult, TRUE ); + pInfo->pResult = hb_itemPutL( pInfo->pResult, HB_TRUE ); #else - pInfo->pResult = hb_itemPutL( pInfo->pResult, FALSE ); + pInfo->pResult = hb_itemPutL( pInfo->pResult, HB_FALSE ); #endif break; } @@ -1481,7 +1481,7 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) } case HB_GTI_SETFONT: { - pInfo->pResult = hb_itemPutL( pInfo->pResult, FALSE ); + pInfo->pResult = hb_itemPutL( pInfo->pResult, HB_FALSE ); if( hb_itemType( pInfo->pNewVal ) & HB_IT_ARRAY ) { PHB_ITEM pSome; @@ -1654,7 +1654,7 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) LPTSTR lpImage; lpImage = HB_TCHAR_CONVTO( hb_itemGetCPtr( pInfo->pNewVal ) ); - pWVT->bIconToFree = TRUE; + pWVT->bIconToFree = HB_TRUE; pWVT->hIcon = ( HICON ) LoadImage( ( HINSTANCE ) NULL, lpImage, IMAGE_ICON, 0, 0, LR_LOADFROMFILE ); HB_TCHAR_FREE( lpImage ); @@ -1678,7 +1678,7 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) LPTSTR lpIcon; lpIcon = HB_TCHAR_CONVTO( hb_itemGetCPtr( pInfo->pNewVal ) ); - pWVT->bIconToFree = FALSE; + pWVT->bIconToFree = HB_FALSE; pWVT->hIcon = LoadIcon( pWVT->hInstance, lpIcon ); HB_TCHAR_FREE( lpIcon ); @@ -1695,7 +1695,7 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) { HICON hIconToFree = ( pWVT->hIcon && pWVT->bIconToFree ) ? pWVT->hIcon : NULL; - pWVT->bIconToFree = FALSE; + pWVT->bIconToFree = HB_FALSE; pWVT->hIcon = LoadIcon( pWVT->hInstance, MAKEINTRESOURCE( ( HB_LONG ) hb_itemGetNInt( pInfo->pNewVal ) ) ); @@ -2183,8 +2183,8 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) } /* Flag that caller configured itself */ - pWVT->pPP->bConfigured = TRUE; - pWVT->CentreWindow = FALSE; + pWVT->pPP->bConfigured = HB_TRUE; + pWVT->CentreWindow = HB_FALSE; } } /* Only possible when it is WvgDialog() Window */ @@ -2232,7 +2232,7 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) return HB_GTSUPER_INFO( pGT, iType, pInfo ); } } - return TRUE; + return HB_TRUE; } /* ********************************************************************** */ @@ -2249,7 +2249,7 @@ static HB_BOOL hb_gt_FuncInit( PHB_GT_FUNCS pFuncTable ) pFuncTable->ReadKey = hb_gt_wvt_ReadKey; - return TRUE; + return HB_TRUE; } /* ********************************************************************** */ diff --git a/harbour/contrib/gtwvg/wvgutils.c b/harbour/contrib/gtwvg/wvgutils.c index 2cc22f55e9..78bd3d5af1 100644 --- a/harbour/contrib/gtwvg/wvgutils.c +++ b/harbour/contrib/gtwvg/wvgutils.c @@ -506,7 +506,7 @@ HB_FUNC( WVT_SETMOUSEPOS ) } else { - hb_retl( FALSE ); + hb_retl( HB_FALSE ); } } @@ -1389,9 +1389,9 @@ HB_BOOL wvt_Array2Rect(PHB_ITEM aRect, RECT *rc ) rc->top = hb_arrayGetNL(aRect,2); rc->right = hb_arrayGetNL(aRect,3); rc->bottom = hb_arrayGetNL(aRect,4); - return TRUE ; + return HB_TRUE; } - return FALSE; + return HB_FALSE; } /*----------------------------------------------------------------------*/ @@ -1415,9 +1415,9 @@ HB_BOOL wvt_Array2Point(PHB_ITEM aPoint, POINT *pt ) if (HB_IS_ARRAY(aPoint) && hb_arrayLen(aPoint) == 2) { pt->x = hb_arrayGetNL(aPoint,1); pt->y = hb_arrayGetNL(aPoint,2); - return TRUE ; + return HB_TRUE; } - return FALSE; + return HB_FALSE; } /*----------------------------------------------------------------------*/ @@ -1439,9 +1439,9 @@ HB_BOOL wvt_Array2Size(PHB_ITEM aSize, SIZE *siz ) if (HB_IS_ARRAY(aSize) && hb_arrayLen(aSize) == 2) { siz->cx = hb_arrayGetNL(aSize,1); siz->cy = hb_arrayGetNL(aSize,2); - return TRUE ; + return HB_TRUE; } - return FALSE; + return HB_FALSE; } /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/gtwvg/wvgwin.c b/harbour/contrib/gtwvg/wvgwin.c index a03e6ec6c0..acb3315a30 100644 --- a/harbour/contrib/gtwvg/wvgwin.c +++ b/harbour/contrib/gtwvg/wvgwin.c @@ -590,13 +590,13 @@ HB_FUNC( WVG_CLIENTTOSCREEN ) if( ClientToScreen( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), &Point ) ) { wvt_Point2ArrayEx( &Point, pArray ); - hb_retl( TRUE ); + hb_retl( HB_TRUE ); } else - hb_retl( FALSE ); + hb_retl( HB_FALSE ); } else - hb_retl( FALSE ); + hb_retl( HB_FALSE ); } /*----------------------------------------------------------------------*/ @@ -611,13 +611,13 @@ HB_FUNC( WVG_SCREENTOCLIENT ) if( ScreenToClient( ( HWND ) ( HB_PTRDIFF ) hb_parnint( 1 ), &Point ) > 0 ) { wvt_Point2ArrayEx( &Point, pArray ); - hb_retl( TRUE ); + hb_retl( HB_TRUE ); } else - hb_retl( FALSE ); + hb_retl( HB_FALSE ); } else - hb_retl( FALSE ); + hb_retl( HB_FALSE ); } /*----------------------------------------------------------------------*/ @@ -1040,7 +1040,7 @@ HB_FUNC( WVG_ISICONIC ) #if ! defined( HB_OS_WIN_CE ) hb_retl( IsIconic( wvg_parhwnd( 1 ) ) ); #else - hb_retl( FALSE ); + hb_retl( HB_FALSE ); #endif } /*----------------------------------------------------------------------*/ @@ -1050,7 +1050,7 @@ HB_FUNC( WVG_ISZOOMED ) #if ! defined( HB_OS_WIN_CE ) hb_retl( IsZoomed( wvg_parhwnd( 1 ) ) ); #else - hb_retl( TRUE ); + hb_retl( HB_TRUE ); #endif } /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/gtwvg/wvgwing.c b/harbour/contrib/gtwvg/wvgwing.c index 924ae711e6..625265126f 100644 --- a/harbour/contrib/gtwvg/wvgwing.c +++ b/harbour/contrib/gtwvg/wvgwing.c @@ -487,7 +487,7 @@ HB_FUNC( WVG_STATUSBARCREATEPANEL ) if( hWndSB == NULL || !IsWindow( hWndSB ) ) { - hb_retl( FALSE ); + hb_retl( HB_FALSE ); return; } @@ -512,7 +512,7 @@ HB_FUNC( WVG_STATUSBARCREATEPANEL ) if( SendMessage( hWndSB, SB_SETPARTS, ( WPARAM ) iParts + 1, ( LPARAM ) ( LPINT ) ptArray ) ) { - hb_retl( TRUE ); + hb_retl( HB_TRUE ); return; } } @@ -527,13 +527,13 @@ HB_FUNC( WVG_STATUSBARCREATEPANEL ) SendMessage( hWndSB, SB_SETPARTS, ( WPARAM ) 1, ( LPARAM ) ( LPINT ) ptArray ); - hb_retl( TRUE ); + hb_retl( HB_TRUE ); return; } } } - hb_retl( FALSE ); + hb_retl( HB_FALSE ); } /*----------------------------------------------------------------------*/ @@ -577,11 +577,11 @@ HB_FUNC( WVG_STATUSBARREFRESH ) if( SendMessage( hWndSB, SB_SETPARTS, iParts, ( LPARAM ) ( LPINT ) ptArray ) ) { - hb_retl( TRUE ); + hb_retl( HB_TRUE ); return; } } - hb_retl( FALSE ); + hb_retl( HB_FALSE ); #endif } @@ -841,8 +841,8 @@ PHB_ITEM wvg_logfontTOarray( LPLOGFONT lf, HB_BOOL bEmpty ) BOOL CALLBACK WvgDialogProcChooseFont( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { - HB_BOOL bret = FALSE; - HB_BOOL binit = FALSE; + HB_BOOL bret = HB_FALSE; + HB_BOOL binit = HB_FALSE; PHB_ITEM block; if( msg == WM_INITDIALOG ) @@ -850,7 +850,7 @@ BOOL CALLBACK WvgDialogProcChooseFont( HWND hwnd, UINT msg, WPARAM wParam, LPARA CHOOSEFONT * cf = ( CHOOSEFONT * ) lParam; PHB_ITEM pBlock = ( PHB_ITEM ) hb_itemNew( ( PHB_ITEM ) cf->lCustData ); SetProp( hwnd, TEXT( "DIALOGPROC" ), pBlock ); - binit = TRUE; + binit = HB_TRUE; } block = ( PHB_ITEM ) GetProp( hwnd, TEXT( "DIALOGPROC" ) ); @@ -873,7 +873,7 @@ BOOL CALLBACK WvgDialogProcChooseFont( HWND hwnd, UINT msg, WPARAM wParam, LPARA } } if( binit ) - return TRUE; + return HB_TRUE; return bret; } @@ -949,7 +949,7 @@ HB_FUNC( WVG_CHOOSEFONT ) if( ChooseFont( &cf ) ) { - PHB_ITEM aFont = wvg_logfontTOarray( &lf, FALSE ); + PHB_ITEM aFont = wvg_logfontTOarray( &lf, HB_FALSE ); PHB_ITEM aInfo = hb_itemNew( NULL ); hb_arrayNew( aInfo, 4 ); @@ -981,7 +981,7 @@ HB_FUNC( WVG_CHOOSEFONT_GETLOGFONT ) SendMessage( wvg_parhwnd( 1 ), WM_CHOOSEFONT_GETLOGFONT, ( WPARAM ) 0, ( LPARAM ) &lf ); - aFont = wvg_logfontTOarray( &lf, FALSE ); + aFont = wvg_logfontTOarray( &lf, HB_FALSE ); hb_itemReturnRelease( aFont ); #endif @@ -1015,13 +1015,13 @@ HB_FUNC( WVG_FONTCREATE ) if( hFont ) { - PHB_ITEM aFont = wvg_logfontTOarray( &lf, FALSE ); + PHB_ITEM aFont = wvg_logfontTOarray( &lf, HB_FALSE ); hb_arraySetNInt( aFont, 15, ( HB_PTRDIFF ) hFont ); hb_itemReturnRelease( aFont ); } else { - PHB_ITEM aFont = wvg_logfontTOarray( &lf, TRUE ); + PHB_ITEM aFont = wvg_logfontTOarray( &lf, HB_TRUE ); hb_itemReturnRelease( aFont ); } }