From 66ffe8d97e1a365b140e0986645cfd6ad75be83b Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 20 Jun 2008 19:19:00 +0000 Subject: [PATCH] 2008-06-20 21:16 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * source/rtl/gtwvt/gtwvt.c + Refreshing whole screen after palette change. This replaces the previous method which had some side effects. * source/vm/fm.c * source/vm/extrap.c * Changed "Harbour" to "Application" in user visible screen/log messages. * contrib/hbwhat32/_winfont.c ! Fixed typo in previous commit. --- harbour/ChangeLog | 14 ++++++++++++++ harbour/contrib/hbwhat32/_winfont.c | 2 +- harbour/source/rtl/gtwvt/gtwvt.c | 7 +++++++ harbour/source/vm/extrap.c | 4 ++-- harbour/source/vm/fm.c | 2 +- 5 files changed, 25 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 33e63741ae..9d8e17820a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,20 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-06-20 21:16 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * source/rtl/gtwvt/gtwvt.c + + Refreshing whole screen after palette change. + This replaces the previous method which had some + side effects. + + * source/vm/fm.c + * source/vm/extrap.c + * Changed "Harbour" to "Application" in user visible + screen/log messages. + + * contrib/hbwhat32/_winfont.c + ! Fixed typo in previous commit. + 2008-06-20 17:56 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbtpathy/telepath.prg ! Fixed embedded comments. diff --git a/harbour/contrib/hbwhat32/_winfont.c b/harbour/contrib/hbwhat32/_winfont.c index 018205189f..b38cea28be 100644 --- a/harbour/contrib/hbwhat32/_winfont.c +++ b/harbour/contrib/hbwhat32/_winfont.c @@ -296,7 +296,7 @@ int CALLBACK GenericCallblockProc( LONG param1, LONG param2, int wParam, LPARAM HB_FUNC( GETFONTDATA ) { - char *cBuffer == NULL; + char * cBuffer = NULL; DWORD dwRet ; if ( ! ISNIL( 5 ) && ( hb_parnl( 5 ) > 0 ) ) cBuffer = (char *) hb_xgrab( hb_parnl(5)); diff --git a/harbour/source/rtl/gtwvt/gtwvt.c b/harbour/source/rtl/gtwvt/gtwvt.c index d35465e0f5..fe3a160f8c 100644 --- a/harbour/source/rtl/gtwvt/gtwvt.c +++ b/harbour/source/rtl/gtwvt/gtwvt.c @@ -2243,12 +2243,17 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) if( hb_itemType( pInfo->pNewVal ) & HB_IT_NUMERIC ) { int iIndex = hb_itemGetNI( pInfo->pNewVal ); + if( iIndex > 0 && iIndex <= 16 ) { pInfo->pResult = hb_itemPutNL( pInfo->pResult, pWVT->COLORS[ iIndex - 1 ] ); if( hb_itemType( pInfo->pNewVal2 ) & HB_IT_NUMERIC ) + { pWVT->COLORS[ iIndex - 1 ] = hb_itemGetNL( pInfo->pNewVal2 ); + + HB_GTSELF_EXPOSEAREA( pWVT->pGT, 0, 0, pWVT->ROWS, pWVT->COLS ); + } } } else @@ -2268,6 +2273,8 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) { for( i = 0; i < 16; i++ ) pWVT->COLORS[ i ] = hb_arrayGetNL( pInfo->pNewVal, i + 1 ); + + HB_GTSELF_EXPOSEAREA( pWVT->pGT, 0, 0, pWVT->ROWS, pWVT->COLS ); } } } diff --git a/harbour/source/vm/extrap.c b/harbour/source/vm/extrap.c index 167f348990..aa7c64c35b 100644 --- a/harbour/source/vm/extrap.c +++ b/harbour/source/vm/extrap.c @@ -79,7 +79,7 @@ LONG WINAPI hb_win32ExceptionHandler( struct _EXCEPTION_POINTERS * ExceptionInfo hb_dateToday( &iYear, &iMonth, &iDay ); hb_dateTimeStr( szTime ); - fprintf( hLog, "Harbour Exception - %s\n", hb_cmdargARGV()[0] ); + fprintf( hLog, "Application Exception - %s\n", hb_cmdargARGV()[0] ); fprintf( hLog, "Terminated at: %04d.%02d.%02d %s\n", iYear, iMonth, iDay, szTime ); } @@ -103,7 +103,7 @@ LONG WINAPI hb_win32ExceptionHandler( struct _EXCEPTION_POINTERS * ExceptionInfo /* GUI */ { LPTSTR lpStr = HB_TCHAR_CONVTO( msg ); - MessageBox( NULL, lpStr, TEXT( "Harbour Exception" ), MB_ICONSTOP ); + MessageBox( NULL, lpStr, TEXT( "Application Exception" ), MB_ICONSTOP ); HB_TCHAR_FREE( lpStr ); } diff --git a/harbour/source/vm/fm.c b/harbour/source/vm/fm.c index 37e39708f0..3d9aa920ed 100644 --- a/harbour/source/vm/fm.c +++ b/harbour/source/vm/fm.c @@ -602,7 +602,7 @@ HB_EXPORT void hb_xexit( void ) /* Deinitialize fixed memory subsystem */ hb_dateToday( &iYear, &iMonth, &iDay ); hb_dateTimeStr( szTime ); - fprintf( hLog, "Harbour Memory Allocation Report - %s\n", hb_cmdargARGV()[0] ); + fprintf( hLog, "Application Memory Allocation Report - %s\n", hb_cmdargARGV()[0] ); fprintf( hLog, "Terminated at: %04d.%02d.%02d %s\n", iYear, iMonth, iDay, szTime ); fprintf( hLog, "%s\n", buffer ); }