diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f28cfc7743..10adaeaeac 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,11 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-10-01 14:46 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * contrib/hbct/ctmisc.prg + ! Fix to CENTER() when 3rd param is logical. + + Added ALLOFREE(). + 2008-09-30 11:37 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/Makefile + harbour/include/hbvmint.h diff --git a/harbour/contrib/hbct/ctmisc.prg b/harbour/contrib/hbct/ctmisc.prg index 2ee60d040e..8f2949d2c1 100644 --- a/harbour/contrib/hbct/ctmisc.prg +++ b/harbour/contrib/hbct/ctmisc.prg @@ -54,15 +54,32 @@ #include "common.ch" #include "setcurs.ch" +#include "hbmemory.ch" + MEMVAR GetList +FUNCTION AlloFree( lMode ) + + DEFAULT lMode TO .F. + + RETURN Memory( iif( lMode, HB_MEM_CHAR, HB_MEM_BLOCK ) ) + FUNCTION CENTER( c, n, p, lMode ) LOCAL cRet - DEFAULT n TO MaxCol() + 1 - Col()*2 + + DEFAULT n TO MaxCol() + 1 - Col() * 2 DEFAULT c TO "" - DEFAULT lMode TO .F. + + IF ISLOGICAL( p ) + lMode := c + c := NIL + ELSE + DEFAULT lMode TO .F. + ENDIF + cRet := PadC( AllTrim( c ), n, p ) - RETURN iif(lMode, cRet, RTrim( cRet ) ) + + RETURN iif( lMode, cRet, RTrim( cRet ) ) FUNCTION CSETCURS( l ) @@ -76,23 +93,19 @@ FUNCTION CSETKEY( n ) RETURN SetKey( n ) FUNCTION CSETCENT( nCentury ) - if nCentury == NIL - RETURN __SETCENTURY() - else - RETURN __SETCENTURY( nCentury ) - endif - RETURN NIL + RETURN __SETCENTURY( nCentury ) FUNCTION LTOC( l ) RETURN iif( l, "T", "F" ) -FUNCTION DOSPARAM +FUNCTION DOSPARAM() LOCAL cRet := "" LOCAL nCount := HB_ARGC(), i FOR i := 1 TO nCount - cRet += iif(i==1, "", " ") + HB_ARGV( i ) + cRet += iif( i == 1, "", " " ) + HB_ARGV( i ) NEXT + RETURN cRet FUNCTION EXENAME()