diff --git a/components/jvcllaz/examples/JvTMTimeLine/SimpleTLTest1.lpi b/components/jvcllaz/examples/JvTMTimeLine/SimpleTLTest1.lpi index 2c23f35ec..3d13aca4d 100644 --- a/components/jvcllaz/examples/JvTMTimeLine/SimpleTLTest1.lpi +++ b/components/jvcllaz/examples/JvTMTimeLine/SimpleTLTest1.lpi @@ -1,7 +1,7 @@ - + @@ -22,8 +22,9 @@ - - + + + diff --git a/components/jvcllaz/examples/JvTMTimeLine/TMTimeLineMainFormU.lfm b/components/jvcllaz/examples/JvTMTimeLine/TMTimeLineMainFormU.lfm index 28b0cf95c..00d19ea44 100644 --- a/components/jvcllaz/examples/JvTMTimeLine/TMTimeLineMainFormU.lfm +++ b/components/jvcllaz/examples/JvTMTimeLine/TMTimeLineMainFormU.lfm @@ -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 diff --git a/components/jvcllaz/run/JvCustomControls/jvoutlookbar.pas b/components/jvcllaz/run/JvCustomControls/jvoutlookbar.pas index bdbb90dcb..0aaf6bd98 100644 --- a/components/jvcllaz/run/JvCustomControls/jvoutlookbar.pas +++ b/components/jvcllaz/run/JvCustomControls/jvoutlookbar.pas @@ -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 diff --git a/components/jvcllaz/run/JvCustomControls/jvtmtimeline.pas b/components/jvcllaz/run/JvCustomControls/jvtmtimeline.pas index 0f0dede9c..3179147f8 100644 --- a/components/jvcllaz/run/JvCustomControls/jvtmtimeline.pas +++ b/components/jvcllaz/run/JvCustomControls/jvtmtimeline.pas @@ -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]); diff --git a/components/jvcllaz/run/JvDB/JvDBTreeView.pas b/components/jvcllaz/run/JvDB/JvDBTreeView.pas index adb7d17f1..a7c4fc59f 100644 --- a/components/jvcllaz/run/JvDB/JvDBTreeView.pas +++ b/components/jvcllaz/run/JvDB/JvDBTreeView.pas @@ -244,7 +244,9 @@ type property HideSelection; property Hint; property HotTrack; + {$IFDEF LCL_FullVersion >= 1090000} property HotTrackColor; + {$ENDIF} property Images; property Indent; property Items;