diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 00624c9bd0..5f5b8140c3 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,11 @@ +19990918-14:59 GMT+1 Victor Szel + + * source/rtl/browdb.prg + + _lastrec() -> lastrec() + + _recno() -> recno() + * source/rtl/transfrm.c + * Small modification. + 19990918-14:05 GMT+2 Ryszard Glab *source/vm/hvm.c diff --git a/harbour/source/rtl/browdb.prg b/harbour/source/rtl/browdb.prg index 029b38ee3d..790e1a6b76 100644 --- a/harbour/source/rtl/browdb.prg +++ b/harbour/source/rtl/browdb.prg @@ -33,15 +33,13 @@ * */ -/* TODO: replace calls to _LastRec() and _Recno() with real versions. */ - function TBrowseDb( nTop, nLeft, nBott, nRight ) local oTb := TBrowseNew( nTop, nLeft, nBott, nRight ) oTb:SkipBlock := { | n | TBSkip( n ) } oTb:GoTopBlock := { || DbGoTop() } - oTb:GoBottomBlock := {|| DbGoBottom() } + oTb:GoBottomBlock := { || DbGoBottom() } Return oTb @@ -49,10 +47,10 @@ static function TbSkip( nRecs ) local nSkipped := 0 - if _LastRec() != 0 + if LastRec() != 0 if nRecs == 0 DbSkip( 0 ) - elseif nRecs > 0 .and. _Recno() != _LastRec() + 1 + elseif nRecs > 0 .and. Recno() != LastRec() + 1 while nSkipped < nRecs DbSkip( 1 ) if Eof() @@ -74,10 +72,3 @@ static function TbSkip( nRecs ) return nSkipped -static function _LastRec() // Waiting for those function to become available - -return 0 - -static function _RecNo() // Waiting for those function to become available - -return 0 diff --git a/harbour/source/rtl/transfrm.c b/harbour/source/rtl/transfrm.c index 954594594a..022b0aaebf 100644 --- a/harbour/source/rtl/transfrm.c +++ b/harbour/source/rtl/transfrm.c @@ -222,8 +222,13 @@ static char * NumPicture( char * szPic, ULONG ulPic, USHORT uiPicFlags, double d pNumber = hb_itemPutNDLen( NULL, dPush, -1, iDec ); pWidth = hb_itemPutNI( NULL, iWidth ); pDec = hb_itemPutNI( NULL, iDec ); + szStr = hb_itemStr( pNumber, pWidth, pDec ); + hb_itemRelease( pNumber ); + hb_itemRelease( pWidth ); + hb_itemRelease( pDec ); + if( szStr ) { iCount = 0; @@ -353,10 +358,6 @@ static char * NumPicture( char * szPic, ULONG ulPic, USHORT uiPicFlags, double d hb_xfree( szStr ); } - hb_itemRelease( pNumber ); - hb_itemRelease( pWidth ); - hb_itemRelease( pDec ); - return szRet; }