From 021e5b4e4527e13e29349337e70d63a019e7d347 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 10 Jul 2009 00:33:57 +0000 Subject: [PATCH] 2009-07-10 02:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbclipsm/gauge.c % Minor cleanup. * source/rtl/setcolor.c % Cleaned explicit cast. --- harbour/ChangeLog | 7 +++++++ harbour/contrib/hbclipsm/gauge.c | 13 ++++++------- harbour/source/rtl/setcolor.c | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 18bab17871..31b47023a3 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,13 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-07-10 02:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbclipsm/gauge.c + % Minor cleanup. + + * source/rtl/setcolor.c + % Cleaned explicit cast. + 2009-07-10 02:19 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * include/hbgtcore.h * include/hbapigt.h diff --git a/harbour/contrib/hbclipsm/gauge.c b/harbour/contrib/hbclipsm/gauge.c index 2c2e298c5a..0071a00d7b 100644 --- a/harbour/contrib/hbclipsm/gauge.c +++ b/harbour/contrib/hbclipsm/gauge.c @@ -120,13 +120,13 @@ HB_FUNC( GAUGENEW ) { PHB_ITEM pReturn = hb_itemArrayNew( B_LEN ); /* Create array */ - hb_arraySetNL( pReturn, B_TOP, hb_parni( B_TOP ) ); - hb_arraySetNL( pReturn, B_LEFT, hb_parni( B_LEFT ) ); - hb_arraySetNL( pReturn, B_BOTTOM, + hb_arraySetNI( pReturn, B_TOP, hb_parni( B_TOP ) ); + hb_arraySetNI( pReturn, B_LEFT, hb_parni( B_LEFT ) ); + hb_arraySetNI( pReturn, B_BOTTOM, HB_ISNUM( B_BOTTOM ) ? ( hb_parni( B_BOTTOM ) < hb_parni( B_TOP ) + 2 ? hb_parni( B_TOP ) + 2 : hb_parni( B_BOTTOM ) ) : 0 ); - hb_arraySetNL( pReturn, B_RIGHT, + hb_arraySetNI( pReturn, B_RIGHT, HB_ISNUM( B_RIGHT ) ? ( hb_parni( B_RIGHT ) < hb_parni( B_LEFT ) + 4 ? hb_parni( B_LEFT ) + 4 : hb_parni( B_RIGHT ) ) : 0 ); @@ -137,7 +137,7 @@ HB_FUNC( GAUGENEW ) HB_ISNUM( B_LEFT ) && ( hb_parni( B_RIGHT ) < hb_parni( B_LEFT ) + 9 ) ) ); hb_arraySetC( pReturn, B_BARCHAR, HB_ISCHAR( B_BARCHAR ) ? hb_parc( B_BARCHAR ) : "\xdb" ); - hb_arraySetNL( pReturn, B_PERCENT, 0 ); + hb_arraySetND( pReturn, B_PERCENT, 0.0 ); hb_itemReturnRelease( pReturn ); } @@ -190,8 +190,7 @@ HB_FUNC( GAUGEUPDATE ) if( pArray ) { - hb_gaugeUpdate( pArray, HB_ISNUM( 2 ) ? ( float ) hb_parnd( 2 ) : 0 ); - + hb_gaugeUpdate( pArray, ( float ) hb_parnd( 2 ) ); hb_itemReturn( pArray ); } } diff --git a/harbour/source/rtl/setcolor.c b/harbour/source/rtl/setcolor.c index ef8739ae46..118876b4f4 100644 --- a/harbour/source/rtl/setcolor.c +++ b/harbour/source/rtl/setcolor.c @@ -77,7 +77,7 @@ HB_FUNC( SETCOLOR ) HB_FUNC( COLORSELECT ) { if( HB_ISNUM( 1 ) ) - hb_gtColorSelect( ( USHORT ) hb_parni( 1 ) ); + hb_gtColorSelect( hb_parni( 1 ) ); } HB_FUNC( SETBLINK )