From 2b2bae3fa91370b876c83e7f4031d7cac38a2b75 Mon Sep 17 00:00:00 2001 From: Maurilio Longo Date: Mon, 18 Feb 2002 13:04:58 +0000 Subject: [PATCH] 2002-02-18 14:01 UTC+0100 Maurilio Longo * source/rtl/tbrowse.prg ! fixed columns footing handling * source/rtl/tbcolumn.prg ! fixed columns footing handling --- harbour/ChangeLog | 12 +++++++++--- harbour/source/rtl/tbcolumn.prg | 23 ++++++++++++++--------- harbour/source/rtl/tbrowse.prg | 4 ++-- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 05e5ede305..12b0e10797 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,12 @@ 2002-12-01 23:12 UTC+0100 Foo Bar */ * Fixed minor bugs reported bu Chen + +2002-02-19 00:05 UTC+0100 Martin Vogel + + + contrib/libct/ftoc.c + + FTOC() and CTOF() functions, implemented by Walter + + contrib/libct/misc1.c + XTOC() function, implemented by Walter + contrib/libct/tab.c + contrib/libct/tests/tab.prg @@ -29,19 +35,19 @@ 2002-02-18 10:42 UTC+0200 Chen Kedem - Ex: + * doc/en/string.txt + AT() : Add note about Harbour extension in the $COMPLIANCE$ section ! Minor samples corrections * Line formating * doc/en/dir.txt - This allows that the string-number conversions are same for program + * doc/en/file.txt * doc/en/misc.txt * doc/en/rdddb.txt * doc/en/terminal.txt * doc/en/tlabel.txt * doc/en/treport.txt - *Added newline at the end to clear gcc warning + * Mostly line formating 2002-02-16 20:25 UTC+0500 Jorge A. Giraldo * source/vm/itemapi.c diff --git a/harbour/source/rtl/tbcolumn.prg b/harbour/source/rtl/tbcolumn.prg index f487b62e4c..d485ba356e 100644 --- a/harbour/source/rtl/tbcolumn.prg +++ b/harbour/source/rtl/tbcolumn.prg @@ -66,10 +66,10 @@ CLASS TBColumn DATA FootSep // Footing separator character DATA HeadSep // Heading separator character DATA Picture // Column picture string - - ACCESS Width INLINE ::nWidth // Column display width - ASSIGN Width(n) INLINE ::SetWidth(n) - + + ACCESS Width INLINE ::nWidth // Column display width + ASSIGN Width(n) INLINE ::SetWidth(n) + // NOTE: 17/08/01 - // It is not correct in my opinion that this instance variable be exported DATA ColPos // Temporary column position on screen needed by TBrowse class @@ -81,9 +81,9 @@ CLASS TBColumn #endif HIDDEN: /* H I D D E N */ - + DATA nWidth - METHOD SetWidth(n) + METHOD SetWidth(n) ENDCLASS @@ -97,8 +97,13 @@ METHOD New( cHeading, bBlock ) CLASS TBColumn ::FootSep := "" ::ColPos := 1 - ::nWidth := nil + ::nWidth := nil ::Heading := cHeading + + /* NOTE: needs to be initialized to an empty string or TBrowse()::WriteMLineText() does not work + if there are columns which have a footing and others which don't + */ + ::Footing := "" ::block := bBlock return Self @@ -107,10 +112,10 @@ return Self METHOD SetWidth(n) CLASS TBColumn // From a TOFIX inside TBrowse.prg: - // "Also Clipper will not allow the user to assign a NIL to the :width variable." + // "Also Clipper will not allow the user to assign a NIL to the :width variable." if n <> nil ::nWidth := n - endif + endif return n diff --git a/harbour/source/rtl/tbrowse.prg b/harbour/source/rtl/tbrowse.prg index ecc1a9fd04..db8ffe5d43 100644 --- a/harbour/source/rtl/tbrowse.prg +++ b/harbour/source/rtl/tbrowse.prg @@ -834,12 +834,12 @@ METHOD RedrawHeaders(nWidth) CLASS TBrowse next endif - if ! Empty( ::HeadSep ) //Drawing heading separator line + if ! Empty( ::HeadSep ) //Draw horizontal heading separator line DispOutAt((nScreenRowT := ::nTop + iif(::lHeaders, ::nHeaderHeight , 0 )), ::nLeft,; Replicate( Right( ::HeadSep, 1 ), nWidth), ::ColorSpec) endif - if ! Empty( ::FootSep ) //Drawing footing separator line + if ! Empty( ::FootSep ) //Draw horizontal footing separator line DispOutAt((nScreenRowB := ::nBottom - iif(::lFooters, ::nFooterHeight, 0)), ::nLeft,; Replicate(Right(::FootSep, 1), nWidth), ::ColorSpec) endif