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

2007-09-16 20:14 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* source/rtl/tbrowse.prg
     ! C5.x compatible fix for non-numeric values inside the 
       defColor array or the one returned by colorBlock.
This commit is contained in:
Viktor Szakats
2007-09-16 18:16:26 +00:00
parent 76aaa169db
commit 4aadee430a
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -8,6 +8,11 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2007-09-16 20:14 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* source/rtl/tbrowse.prg
! C5.x compatible fix for non-numeric values inside the
defColor array or the one returned by colorBlock.
2007-09-16 18:44 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* source/rtl/tbrowse.prg
! Another fix for TBrowse() full color compatibility.

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

@@ -2148,7 +2148,6 @@ STATIC FUNCTION tbr_CookColor( cColorSpec )
return aColorSpec
/* NOTE: nMode can be 1/2 or 1/2/3/4 when compiled with HB_COMPAT_C53 (default) [vszakats] */
STATIC FUNCTION tbr_GetColor( aColorSpec, aDefColor, nMode )
if !ISARRAY( aDefColor )
@@ -2161,12 +2160,12 @@ STATIC FUNCTION tbr_GetColor( aColorSpec, aDefColor, nMode )
switch nMode
case TBC_CLR_STANDARD ; return aColorSpec[ 1 ]
case TBC_CLR_ENHANCED ; return aColorSpec[ 2 ]
case TBC_CLR_HEADING ; return aColorSpec[ iif( Len( aDefColor ) >= 1 .AND. aDefColor[ 1 ] <= Len( aColorSpec ), aDefColor[ 1 ], 1 ) ]
case TBC_CLR_FOOTING ; return aColorSpec[ iif( Len( aDefColor ) >= 1 .AND. aDefColor[ 1 ] <= Len( aColorSpec ), aDefColor[ 1 ], 1 ) ]
case TBC_CLR_HEADING ; return aColorSpec[ iif( Len( aDefColor ) >= 1 .AND. ISNUMBER( aDefColor[ 1 ] ) .AND. aDefColor[ 1 ] <= Len( aColorSpec ), aDefColor[ 1 ], 1 ) ]
case TBC_CLR_FOOTING ; return aColorSpec[ iif( Len( aDefColor ) >= 1 .AND. ISNUMBER( aDefColor[ 1 ] ) .AND. aDefColor[ 1 ] <= Len( aColorSpec ), aDefColor[ 1 ], 1 ) ]
endswitch
endif
return aColorSpec[ iif( aDefColor[ nMode ] <= Len( aColorSpec ), aDefColor[ nMode ], { 1, 2, 1, 1 }[ nMode ] ) ]
return aColorSpec[ iif( ISNUMBER( aDefColor[ nMode ] ) .AND. aDefColor[ nMode ] <= Len( aColorSpec ), aDefColor[ nMode ], { 1, 2, 1, 1 }[ nMode ] ) ]
STATIC FUNCTION tbr_CalcWidth( xValue, cType, cPicture )