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

jvcllaz: Fix compilation for 64-bit

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6251 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2018-03-17 00:19:46 +00:00
parent 4b403fca15
commit ac5d9f9de4
5 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/jvcllaz/examples/JvTMTimeLine/SimpleTLTest1.lpi
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="11"/>
<Version Value="10"/>
<PathDelim Value="\"/>
<General>
<SessionStorage Value="InProjectDir"/>
@ -22,8 +22,9 @@
<Version Value="2"/>
</PublishOptions>
<RunParams>
<FormatVersion Value="2"/>
<Modes Count="0"/>
<local>
<FormatVersion Value="1"/>
</local>
</RunParams>
<RequiredPackages Count="3">
<Item1>

6
components/jvcllaz/examples/JvTMTimeLine/TMTimeLineMainFormU.lfm
View File

@ -1,7 +1,7 @@
object TMTimeLineMainForm: TTMTimeLineMainForm
Left = 261
Left = 371
Height = 580
Top = 138
Top = 154
Width = 733
Caption = 'Team Manager Timeline demo'
ClientHeight = 580
@ -17,7 +17,7 @@ object TMTimeLineMainForm: TTMTimeLineMainForm
OnMouseWheelUp = FormMouseWheelUp
Position = poScreenCenter
ShowHint = True
LCLVersion = '1.9.0.0'
LCLVersion = '1.8.0.6'
Scaled = False
object Splitter1: TSplitter
Cursor = crVSplit

6
components/jvcllaz/run/JvCustomControls/jvoutlookbar.pas
View File

@ -45,7 +45,7 @@ unit JvOutlookBar;
interface
uses
LCLType, LCLIntf, LMessages, Types,
LCLType, LCLIntf, LMessages, Types, LCLVersion,
SysUtils, Classes, ActnList,
Buttons, Controls, Graphics, ImgList, Forms, StdCtrls, ExtCtrls, Themes,
{$IFDEF HAS_UNIT_SYSTEM_UITYPES}
@ -327,7 +327,9 @@ type
procedure SetThemed(const Value: Boolean);
procedure SetWordWrap(const Value: Boolean);
protected
{$IF LCL_FullVersion >= 1090000}
function DoEraseBackground(ACanvas: TCanvas; Param: LPARAM): Boolean; override;
{$ENDIF}
procedure FontChanged; override;
function GetButtonHeight(PageIndex, ButtonIndex: Integer): Integer;
function GetButtonTopHeight(PageIndex, ButtonIndex: Integer): Integer;
@ -2606,11 +2608,13 @@ begin
Inc(Result, 4);
end;
{$IF LCL_FullVersion >= 1090000}
function TJvCustomOutlookBar.DoEraseBackground(ACanvas: TCanvas; Param: LPARAM): Boolean;
begin
// don't redraw background: we always fill it anyway
Result := True;
end;
{$ENDIF}
procedure TJvCustomOutlookBar.RedrawRect(R: TRect; Erase: Boolean = False);
begin

8
components/jvcllaz/run/JvCustomControls/jvtmtimeline.pas
View File

@ -930,7 +930,7 @@ function TJvCustomTMTimeline.GetImageIndex(ADate: TDate): Integer;
begin
Result := FDateImages.IndexOf(IntToStr(Trunc(ADate)));
if Result > -1 then
Result := Integer(FDateImages.Objects[Result]);
Result := PtrUInt(FDateImages.Objects[Result]);
end;
procedure TJvCustomTMTimeline.SetImageIndex(ADate: TDate;
@ -941,7 +941,7 @@ begin
I := FDateImages.IndexOf(IntToStr(Trunc(ADate)));
if I < 0 then
I := FDateImages.Add(IntToStr(Trunc(ADate)));
FDateImages.Objects[I] := TObject(Value);
FDateImages.Objects[I] := TObject(PtrUInt(Value));
Invalidate;
end;
@ -1218,7 +1218,7 @@ begin
raise EStreamError.CreateRes(@RsInvalidImage);
FDateImages.Text := ReadStr(Stream);
for I := 0 to FDateImages.Count - 1 do
FDateImages.Objects[I] := TObject(ReadInt(Stream));
FDateImages.Objects[I] := TObject(PtrUInt(ReadInt(Stream)));
FObjects.Text := ReadStr(Stream);
for I := 0 to FObjects.Count - 1 do
begin
@ -1235,7 +1235,7 @@ begin
WriteStr(Stream, cMagic);
WriteStr(Stream, FDateImages.Text);
for I := 0 to FDateImages.Count - 1 do
WriteInt(Stream, Integer(FDateImages.Objects[I]));
WriteInt(Stream, PtrUInt(FDateImages.Objects[I]));
WriteStr(Stream, FObjects.Text);
for I := 0 to FObjects.Count - 1 do
SaveObject(Stream, FObjects.Objects[I]);

2
components/jvcllaz/run/JvDB/JvDBTreeView.pas
View File

@ -244,7 +244,9 @@ type
property HideSelection;
property Hint;
property HotTrack;
{$IFDEF LCL_FullVersion >= 1090000}
property HotTrackColor;
{$ENDIF}
property Images;
property Indent;
property Items;