From 2cd14f1d8aef0556e21de45182d900207352903d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 29 Jun 2012 01:02:07 +0000 Subject: [PATCH] 2012-06-29 02:59 UTC+0200 Viktor Szakats (harbour syenar.net) * src/rtl/gtwvt/gtwvt.c * using TEXT( '\0' ) instead of 0 * src/rtl/run.c * using contants instead of literals --- harbour/ChangeLog | 10 ++++++++-- harbour/src/rtl/gtwvt/gtwvt.c | 2 +- harbour/src/rtl/run.c | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0f0f402cd5..1cf5439a6d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,12 @@ The license applies to all entries newer than 2009-04-28. */ +2012-06-29 02:59 UTC+0200 Viktor Szakats (harbour syenar.net) + * src/rtl/gtwvt/gtwvt.c + * using TEXT( '\0' ) instead of 0 + + * src/rtl/run.c + * using contants instead of literals 2012-06-28 12:30 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbxbp/xbpfiledialog.prg @@ -23,12 +29,12 @@ 2012-06-28 12:14 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbxbp/xbpfiledialog.prg - ! Fixed: memory leak. Please read previously documented here + ! Fixed: memory leak. Please read previously documented here how a child can be destroyed properly with a temp parent. 2012-06-28 11:56 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbxbp/xbpfiledialog.prg - ! Fixed: a regression where QApplication():focusWidget() + ! Fixed: a regression where QApplication():focusWidget() was returned as a NIL instead of QWidget. 2012-06-28 11:25 UTC+0200 Viktor Szakats (harbour syenar.net) diff --git a/harbour/src/rtl/gtwvt/gtwvt.c b/harbour/src/rtl/gtwvt/gtwvt.c index 19f2d116bb..cd7f288ce6 100644 --- a/harbour/src/rtl/gtwvt/gtwvt.c +++ b/harbour/src/rtl/gtwvt/gtwvt.c @@ -2415,7 +2415,7 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING ) { HB_ITEMCOPYSTR( pInfo->pNewVal, pWVT->fontFace, HB_SIZEOFARRAY( pWVT->fontFace ) ); - pWVT->fontFace[ HB_SIZEOFARRAY( pWVT->fontFace ) - 1 ] = 0; + pWVT->fontFace[ HB_SIZEOFARRAY( pWVT->fontFace ) - 1 ] = TEXT( '\0' ); } break; diff --git a/harbour/src/rtl/run.c b/harbour/src/rtl/run.c index 05dd87e341..e3ec4d821b 100644 --- a/harbour/src/rtl/run.c +++ b/harbour/src/rtl/run.c @@ -63,7 +63,7 @@ HB_FUNC( __RUN ) { const char * pszCommand = hb_parc( 1 ); - if( pszCommand && hb_gtSuspend() == 0 ) + if( pszCommand && hb_gtSuspend() == HB_SUCCESS ) { #if defined( HB_OS_WIN ) hb_fsProcessRun( pszCommand, NULL, 0, NULL, NULL, NULL, NULL, HB_FALSE ); @@ -76,7 +76,7 @@ HB_FUNC( __RUN ) hb_xfree( pszFree ); #endif - if( hb_gtResume() != 0 ) + if( hb_gtResume() != HB_SUCCESS ) { /* an error should be generated here !! Something like */ /* hb_errRT_BASE_Ext1( EG_GTRESUME, 6002, NULL, HB_ERR_FUNCNAME, 0, EF_CANDEFAULT ); */