From cfc6cd1f3afafb52e8ae8fbe845f55b7b496de9e Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 15 Dec 2001 09:55:13 +0000 Subject: [PATCH] 2001-12-15 10:53 UTC+0100 Viktor Szakats --- harbour/ChangeLog | 9 +++++++++ harbour/source/rtl/fstemp.c | 2 -- harbour/source/rtl/tbcolumn.prg | 9 ++++----- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index dc402d69db..0febefc1ff 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,15 @@ 2002-12-01 23:12 UTC+0100 Foo Bar */ +2001-12-15 10:53 UTC+0100 Viktor Szakats + + * source/rtl/tbcolumn.prg + ! Fixed case when heading parameter was NIL + in TBColumnNew() or TBColumn():New() + + * source/rtl/fstemp.c + - One unused #include removed. + 2001-12-15 10:05 UTC+0100 Antonio Linares + source/vm/dynlibhb.c + HB_LIBLOAD() diff --git a/harbour/source/rtl/fstemp.c b/harbour/source/rtl/fstemp.c index 7f25b530ff..7fd0f5fe2b 100644 --- a/harbour/source/rtl/fstemp.c +++ b/harbour/source/rtl/fstemp.c @@ -51,8 +51,6 @@ * */ -#include - #include "hbapi.h" #include "hbapifs.h" diff --git a/harbour/source/rtl/tbcolumn.prg b/harbour/source/rtl/tbcolumn.prg index 5046cf36ba..0a5cbc663e 100644 --- a/harbour/source/rtl/tbcolumn.prg +++ b/harbour/source/rtl/tbcolumn.prg @@ -84,12 +84,14 @@ METHOD New( cHeading, bBlock ) CLASS TBColumn local cType, nTokenPos := 0, nL + DEFAULT cHeading TO "" + ::DefColor := { 1, 2 } ::FootSep := "" ::ColPos := 1 ::Width := 0 - ::Heading := iif(!Empty(cHeading), cHeading, "") + ::Heading := cHeading /* TOFIX: In Clipper the column widths are not determined at this point. [vszakats] */ @@ -116,7 +118,7 @@ METHOD New( cHeading, bBlock ) CLASS TBColumn ::Width := 0 endcase - cHeading += ";" + cHeading += ";" while (nL := Len(__StrTkPtr(@cHeading, @nTokenPos, ";"))) > 0 if nL > ::Width ::Width := nL @@ -141,6 +143,3 @@ function TBColumnNew(cHeading, bBlock) return TBColumn():New(cHeading, bBlock) - - -