fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2002-09-02 16:58 UTC+0200 Maurilio Longo <maurilio.longo@libero.it>

Browse Source 
* harbour/source/rtl/tbrowse.prg
     ! fixed columns' width calulation on ::SetColumnWidth( oCol ) method
This commit is contained in:
Maurilio Longo
2002-09-02 15:32:50 +00:00
parent b34c220cd5
commit 14c5859b97
2 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
harbour/ChangeLog
View File

@@ -8,6 +8,10 @@
2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2002-09-02 16:58 UTC+0200 Maurilio Longo <maurilio.longo@libero.it>
* harbour/source/rtl/tbrowse.prg
! fixed columns' width calulation on ::SetColumnWidth( oCol ) method
2002-08-30 11:20 UTC-0300 Luiz Rafael Culik <culikr@uol.com.br>
* source/rtl/tget.prg
! fix for DeleteAll() method when Variable is Date type Reported by Charles Kwon
@@ -68,7 +72,7 @@
* contrib/odbc/odbc.c
+ Added SQLConnect function
* contrib/odbc/todbc.prg
+ Method new() now accepts additional parameters username and password.
+ Method new() now accepts additional parameters username and password.
If TODBC:new() is called with username and password, it uses
SQLConnect insted of SQLDriverConnect to establish ODBC conenction.
@@ -110,24 +114,24 @@
2002-08-05 09:33 UTC+0100 Dave Pearson <davep@davep.org>
* source/compiler/genc.c
* Corrected misspelling of "Alpha".
2002-08-03 22:50 UTC+0100 Tomaz Zupan <tomaz.zupan@orpo.si>
* contrib/odbc/odbc.c
contrib/odbc/todbc.prg
contrib/odbc/todbc.prg
* Added bof(), reccount(), lastrec() and recno() functionality to
ODBC library.
* contrib/odbc/browodbc.prg
* enabled statusline
* enabled statusline
2002-08-02 12:35 UTC-0400 David G. Holm <dholm@jsd-llc.com>
* doc/howtobsd.txt
* Changed BSD reference in heading to FreeBSD.
* Removed reference to specific FreeBSD version number.
* Changed BSD reference in heading to FreeBSD.
* Removed reference to specific FreeBSD version number.
2002-08-02 12:05 UTC-0400 David G. Holm <dholm@jsd-llc.com>
* source/rtl/set.c
! When encountering SET ALTERNATE TO, close the file.
! When encountering SET(_SET_EXTRAFILE,NIL), close the file.
! When encountering SET ALTERNATE TO, close the file.
! When encountering SET(_SET_EXTRAFILE,NIL), close the file.
2002-07-25 13:42 UTC+0100 Ignacio Ortiz <ignacio@fivetech.com>
* source/pp/ppcore.c
@@ -151,8 +155,8 @@
2002-07-19 15:45 UTC-0400 David G. Holm <dholm@jsd-llc.com>
* source/rtl/gtwin/gtwin.c
! Don't test for dead keys when dealing with international characters
that have a negative character value.
! Don't test for dead keys when dealing with international characters
that have a negative character value.
2002-07-17 12:34 UTC-0300 Walter Negro <anegro@overnet.com.ar>
* include/hbmath.h
@@ -316,9 +320,9 @@
2002-07-11 14:30 UTC-0400 David G. Holm <dholm@jsd-llc.com>
* config/dos/djgpp.cf
+ Added the -lm option to LDFLAGS to enable math error handling.
+ Added the -lm option to LDFLAGS to enable math error handling.
* source/rtl/gtwin/gtwin.c
! Shift Tab is now properly reported as 271.
! Shift Tab is now properly reported as 271.
2002-07-11 02:30 UTC-0300 Walter Negro <anegro@overnet.com.ar>
* source/vm/itemapi.c
@@ -1914,8 +1918,8 @@
the use of third-party (Apollo) include files.
2002-02-27 01:27 UTC+0100 Maurilio Longo <maurilio.longo@libero.it>
* harbour/source/rtl/tbrowse.prg
! fixed columns' width calc (quick and not very much tested)
* harbour/source/rtl/tbrowse.prg
! fixed columns' width calc (quick and not very much tested)
2002-02-26 21:50 UTC+0100 Tomaz Zupan <tomaz.zupan@orpo.si>
* include/hbapi.h

34
harbour/source/rtl/tbrowse.prg
View File

@@ -268,7 +268,7 @@ METHOD New(nTop, nLeft, nBottom, nRight) CLASS TBrowse
::nRow := 0
::nCol := 0
::aSetStyle := ARRAY( 4096 )
::aSetStyle[ TBR_APPEND ] := .f.
::aSetStyle[ TBR_APPENDING ] := .f.
::aSetStyle[ TBR_MODIFY ] := .f.
@@ -490,12 +490,12 @@ METHOD SetColumnWidth( oCol ) CLASS TBrowse
LOCAL xRes, cType, nTokenPos := 0, nL, cHeading
LOCAL nWidthMax := ::nRight - ::nLeft +1 // Visible width of TBrowse
LOCAL nWidth := 0,nColWidth:=0,nLen:=0
LOCAL nWidth := 0, nColWidth := 0, nLen := 0
// if oCol has :Width property set I use it
if oCol:Width <> nil //.AND. oCol:Width < (nWidthMax - 4)
nWidth := oCol:Width
if oCol:Width <> nil
nWidth := Min(oCol:Width, nWidthMax - 2)
else
if ISBLOCK( oCol:block )
@@ -507,18 +507,18 @@ METHOD SetColumnWidth( oCol ) CLASS TBrowse
nLen := Len( Str( xRes ) )
case cType == "L"
nLen:=1
nLen := 1
case cType == "C"
nLen := Len( xRes )
case cType == "D"
nLen= len(DToC( xRes ) )
nLen := Len(DToC( xRes ) )
otherwise
nLen := 0
endcase
cHeading := oCol:Heading + ";"
while (nL := Len(__StrTkPtr(@cHeading, @nTokenPos, ";"))) > 0
@@ -526,14 +526,10 @@ METHOD SetColumnWidth( oCol ) CLASS TBrowse
enddo
endif
if nColWidth>nWidthMax
nColWidth:=nWidthMax
endif
if nlen>nWidthMax
nLen:=nWidthMax
endif
nWidth:= if(nColwidth>nLen,nColwidth,nLen)
nWidth:= Min(iif(nColwidth > nLen, nColwidth, nLen), nWidthMax - 2)
endif
return nWidth
@@ -806,7 +802,7 @@ METHOD Hilite() CLASS TBrowse
// Put cursor back on first char of cell value
SetPos(nRow, nCol)
#ifdef HB_COMPAT_C53
::nRow := nRow
::nCol := nCol
@@ -818,9 +814,9 @@ return Self
METHOD PosCursor() CLASS TBrowse
local nRow := ::nTop + ::RowPos + iif(::lHeaders, ::nHeaderHeight, 0) + iif(Empty(::HeadSep), 0, 1) - 1
local nCol
local nCol
local cType := ValType( Eval( ::aColumns[ ::ColPos ]:block ) )
nCol := ::aColumns[ ::ColPos ]:ColPos + iif(cType == "L", ::aColsWidth[::ColPos] / 2, 0 )
// Put cursor on first char of cell value
@@ -1589,6 +1585,6 @@ METHOD SetStyle( nMode, lSetting ) CLASS TBROWSE
IF ISLOGICAL( lSetting )
::aSetStyle[ nMode ] := lSetting
ENDIF
RETURN lRet
#endif