pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

* Fix compilation with fpc 3.1. Issue 29552

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4485 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
blikblum
2016-02-01 01:22:32 +00:00
parent a9c3c81c14
commit aad2fa0dc1
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/lclextensions/oleutils.pas
View File

@ -104,7 +104,11 @@ begin
//soFrom* constants are equal to STREAM_SEEK_* constants. Assume it here //soFrom* constants are equal to STREAM_SEEK_* constants. Assume it here
liOffset.LowPart:=Offset; liOffset.LowPart:=Offset;
liOffset.HighPart:=0; liOffset.HighPart:=0;
{$if FPC_FULLVERSION >= 30100}
Res:=FSrcStream.Seek(QWord(liOffset), Origin, QWord(liResult));
{$else}
Res:=FSrcStream.Seek(Int64(liOffset), Origin, Int64(liResult)); Res:=FSrcStream.Seek(Int64(liOffset), Origin, Int64(liResult));
{$endif}
Result:=liResult.LowPart; Result:=liResult.LowPart;
if Res <> S_OK then if Res <> S_OK then
Raise Exception.Create('TOLEStream - Error while seeking: '+ErrorString(Res)); Raise Exception.Create('TOLEStream - Error while seeking: '+ErrorString(Res));

22
components/virtualtreeview-new/branches/4.8/VirtualTrees.pas
View File

@ -2471,7 +2471,7 @@ type
procedure SetVerticalAlignment(Node: PVirtualNode; Value: Byte); procedure SetVerticalAlignment(Node: PVirtualNode; Value: Byte);
procedure SetVisible(Node: PVirtualNode; Value: Boolean); procedure SetVisible(Node: PVirtualNode; Value: Boolean);
procedure SetVisiblePath(Node: PVirtualNode; Value: Boolean); procedure SetVisiblePath(Node: PVirtualNode; Value: Boolean);
procedure StaticBackground(Source: TBitmap; Target: TCanvas; const Offset: TPoint; const R: TRect); procedure StaticBackground(Source: TBitmap; Target: TCanvas; const OffsetPosition: TPoint; const R: TRect);
procedure TileBackground(Source: TBitmap; Target: TCanvas; const Offset: TPoint; R: TRect); procedure TileBackground(Source: TBitmap; Target: TCanvas; const Offset: TPoint; R: TRect);
function ToggleCallback(Step, StepSize: Integer; Data: Pointer): Boolean; function ToggleCallback(Step, StepSize: Integer; Data: Pointer): Boolean;
protected protected
@ -14433,7 +14433,7 @@ end;
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
procedure TBaseVirtualTree.StaticBackground(Source: TBitmap; Target: TCanvas; const Offset: TPoint; const R: TRect); procedure TBaseVirtualTree.StaticBackground(Source: TBitmap; Target: TCanvas; const OffsetPosition: TPoint; const R: TRect);
// Draws the given source graphic so that it stays static in the given rectangle which is relative to the target bitmap. // Draws the given source graphic so that it stays static in the given rectangle which is relative to the target bitmap.
// The graphic is aligned so that it always starts at the upper left corner of the target canvas. // The graphic is aligned so that it always starts at the upper left corner of the target canvas.
@ -14456,7 +14456,7 @@ begin
PicRect := Rect(FBackgroundOffsetX, FBackgroundOffsetY, FBackgroundOffsetX + Source.Width, FBackgroundOffsetY + Source.Height); PicRect := Rect(FBackgroundOffsetX, FBackgroundOffsetY, FBackgroundOffsetX + Source.Width, FBackgroundOffsetY + Source.Height);
// Area to be draw in relation to client viewscreen. // Area to be draw in relation to client viewscreen.
AreaRect := Rect(Offset.X + R.Left, Offset.Y + R.Top, Offset.X + R.Right, Offset.Y + R.Bottom); AreaRect := Rect(OffsetPosition.X + R.Left, OffsetPosition.Y + R.Top, OffsetPosition.X + R.Right, OffsetPosition.Y + R.Bottom);
// If picture falls in AreaRect, return intersection (DrawRect). // If picture falls in AreaRect, return intersection (DrawRect).
if IntersectRect(DrawRect, PicRect, AreaRect) then if IntersectRect(DrawRect, PicRect, AreaRect) then
@ -14466,16 +14466,16 @@ begin
begin begin
// Leave transparent area as destination unchanged (DST), copy non-transparent areas to canvas (SRCCOPY). // Leave transparent area as destination unchanged (DST), copy non-transparent areas to canvas (SRCCOPY).
with DrawRect do with DrawRect do
MaskBlt(Target.Handle, Left - Offset.X, Top - Offset.Y, (Right - Offset.X) - (Left - Offset.X), MaskBlt(Target.Handle, Left - OffsetPosition.X, Top - OffsetPosition.Y, (Right - OffsetPosition.X) - (Left - OffsetPosition.X),
(Bottom - Offset.Y) - (Top - Offset.Y), Source.Canvas.Handle, Left - PicRect.Left, DrawRect.Top - PicRect.Top, (Bottom - OffsetPosition.Y) - (Top - OffsetPosition.Y), Source.Canvas.Handle, Left - PicRect.Left, DrawRect.Top - PicRect.Top,
Source.MaskHandle, Left - PicRect.Left, Top - PicRect.Top, MakeROP4(DST, SRCCOPY)); Source.MaskHandle, Left - PicRect.Left, Top - PicRect.Top, MakeROP4(DST, SRCCOPY));
end end
else else
begin begin
// copy image to destination // copy image to destination
with DrawRect do with DrawRect do
BitBlt(Target.Handle, Left - Offset.X, Top - Offset.Y, (Right - Offset.X) - (Left - Offset.X), BitBlt(Target.Handle, Left - OffsetPosition.X, Top - OffsetPosition.Y, (Right - OffsetPosition.X) - (Left - OffsetPosition.X),
(Bottom - Offset.Y) - (Top - Offset.Y) + R.Top, Source.Canvas.Handle, Left - PicRect.Left, DrawRect.Top - PicRect.Top, (Bottom - OffsetPosition.Y) - (Top - OffsetPosition.Y) + R.Top, Source.Canvas.Handle, Left - PicRect.Left, DrawRect.Top - PicRect.Top,
SRCCOPY); SRCCOPY);
end; end;
end; end;
@ -30827,7 +30827,7 @@ procedure TStringEditLink.SetBounds(R: TRect);
// Sets the outer bounds of the edit control and the actual edit area in the control. // Sets the outer bounds of the edit control and the actual edit area in the control.
var var
Offset: Integer; lOffset: Integer;
begin begin
if not FStopping then if not FStopping then
@ -30853,10 +30853,10 @@ begin
// We have to take out the two pixel border of the edit control as well as a one pixel "edit border" the // We have to take out the two pixel border of the edit control as well as a one pixel "edit border" the
// control leaves around the (selected) text. // control leaves around the (selected) text.
R := FEdit.ClientRect; R := FEdit.ClientRect;
Offset := 2; lOffset := 2;
if tsUseThemes in FTree.FStates then if tsUseThemes in FTree.FStates then
Inc(Offset); Inc(lOffset);
InflateRect(R, -FTree.FTextMargin + Offset, Offset); InflateRect(R, -FTree.FTextMargin + lOffset, lOffset);
if not (vsMultiline in FNode.States) then if not (vsMultiline in FNode.States) then
OffsetRect(R, 0, FTextBounds.Top - FEdit.Top); OffsetRect(R, 0, FTextBounds.Top - FEdit.Top);