diff --git a/lcl/dbctrls.pp b/lcl/dbctrls.pp index d86e870661..a2a521d07b 100644 --- a/lcl/dbctrls.pp +++ b/lcl/dbctrls.pp @@ -923,7 +923,9 @@ begin L:=L+' '; L:=L+TField(LF[i]).AsString; end; - BC.AddBar(L,VF.AsInteger,AColor); + BC.AddBar(L, + {$IFDEF VER1_0}StrToIntDef(VF.AsString,0){$ELSE}VF.AsInteger{$ENDIF}, + AColor); Next; end; end; @@ -1284,6 +1286,9 @@ end. { ============================================================================= $Log$ + Revision 1.25 2004/10/01 13:25:51 mattias + fixed 1.0.10 compilation + Revision 1.24 2004/09/25 15:05:38 mattias implemented Rename Identifier diff --git a/lcl/graphics.pp b/lcl/graphics.pp index 0b87021c2c..f8041cacd2 100644 --- a/lcl/graphics.pp +++ b/lcl/graphics.pp @@ -1539,6 +1539,7 @@ begin Blue := (rgb shr 16) and $000000ff; end; +{$IFNDEF DisableFPImage} function FPColorToTColor(const FPColor: TFPColor): TColor; begin Result:=((FPColor.Red shr 8) and $ff) @@ -1556,6 +1557,7 @@ begin Result.Blue:=Result.Blue+(Result.Blue shr 8); Result.Alpha:=FPImage.alphaOpaque; end; +{$ENDIF} {$I graphicsobject.inc} {$I graphic.inc} @@ -1781,6 +1783,9 @@ end. { ============================================================================= $Log$ + Revision 1.158 2004/10/01 13:25:51 mattias + fixed 1.0.10 compilation + Revision 1.157 2004/10/01 13:16:43 mattias fixed unselecting TCanvas objects