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

jvcllaz: Check packages and demos for Laz 1.8.4 / 2.0.0 / 2.0.2 / trunk and FPC 3.0.4 / FPC 3.2 / trunk. 32-bit, Laz 2.0.2/FPC 3.2 64 bit. Make fixes needed.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6971 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2019-05-29 23:35:34 +00:00
parent 35b4753bbc
commit a67a3f9d55
89 changed files with 441 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/jvcllaz/run/JvCmp/jvprofilerform.pas
View File

@ -115,6 +115,7 @@ type
implementation
uses
LCLVersion,
{$IFDEF LINUX}
baseunix, unix, linux, users,
{$ELSE}
@ -462,10 +463,12 @@ end;
procedure TProfReport.lvReportColumnClick(Sender: TObject; Column: TListColumn);
begin
{$IF LCL_FullVersion >= 2000000}
// lvReport.Items.BeginUpdate;
lvReport.CustomSort(TLVCompare(@DefSort), Column.Index);
OddClick := not OddClick;
// lvReport.Items.EndUpdate;
{$IFEND}
end;
procedure TProfReport.SaveBtnClick(Sender: TObject);

2
components/jvcllaz/run/JvCmp/jvspellerform.pas
View File

@ -91,7 +91,7 @@ implementation
uses
StrUtils,
JvConsts, JvResources, JvTypes;
JvConsts, JvResources, JvTypes, JvJCLUtils;
{$R *.lfm}

7
components/jvcllaz/run/JvCore/jvjvclutils.pas
View File

@ -1701,8 +1701,11 @@ begin
begin
Dest.Canvas.Brush.Color := clSilver;
Dest.Canvas.FillRect(Bounds(0, 0, CellWidth, CellHeight));
Dest.Canvas.Draw(-(Index mod Cols) * CellWidth,
-(Index div Cols) * CellHeight, Source);
Dest.Canvas.Draw(
-(Index mod Cols) * CellWidth,
-(Index div Cols) * CellHeight,
Source
);
end;
Dest.Transparent := Source.Transparent;
end;

9
components/jvcllaz/run/JvCtrls/jvcombolistbox.pas
View File

@ -69,7 +69,7 @@ unit JvComboListBox;
interface
uses
LCLIntf, LCLType,
LCLIntf, LCLType, LCLVersion,
Classes, Graphics, Controls, Forms, StdCtrls,
Menus;
@ -204,9 +204,11 @@ type
property OnMouseUp;
property OnMouseWheel;
property OnMouseWheelDown;
{$IF LCL_FullVersion >= 2000000}
property OnMouseWheelHorz;
property OnMouseWheelLeft;
property OnMouseWheelRight;
{$IFEND}
property OnMouseWheelUp;
property OnResize;
property OnSelectionChange;
@ -464,7 +466,10 @@ begin
// draw the combo button
GetCursorPos(Pt);
Pt := ScreenToClient(Pt);
I := ItemAtPos(Pt, True);
if (Pt.X < 0) or (Pt.Y < 0) then
I := -1
else
I := ItemAtPos(Pt, True);
if (not HotTrackCombo and (State * [odSelected, odFocused] <> [])) or (HotTrackCombo and (I = Index)) then
begin
// draw frame

4
components/jvcllaz/run/JvCtrls/jvinstalllabel.pas
View File

@ -75,9 +75,11 @@ type
property Styles[Index: Integer]: TFontStyles read GetStyles write SetStyles;
published
property Align;
property Font;
property BorderSpacing;
property Color default clBtnFace;
property Constraints;
property DefaultImage: Integer read FDefaultImage write SetIndex default -1;
property Font;
property Images: TCustomImageList read FImageList write SetImageList;
property Lines: TStrings read GetLines write SetLines;
property LineSpacing: Integer read FLineSpacing write SetLineSpacing default 10;

4
components/jvcllaz/run/JvCtrls/jvrollout.pas
View File

@ -41,7 +41,7 @@ unit JvRollOut;
interface
uses
LCLType, LCLIntf, LMessages,
LCLType, LCLIntf, LMessages, LCLVersion,
SysUtils, Classes, Controls, Graphics, ImgList, ExtCtrls, ActnList, Forms,
//JvExtComponent,
JvThemes;
@ -258,7 +258,9 @@ type
property Font;
property GroupIndex;
property ImageOptions;
{$IF LCL_FullVersion >= 2000000}
property ParentBackground default True;
{$IFEND}
property ParentColor;
property ParentFont;
property ParentShowHint;

4
components/jvcllaz/run/JvDB/jvdbcontrols.pas
View File

@ -41,7 +41,7 @@ unit JvDBControls;
interface
uses
JvBaseEdits, DB, DBCtrls, Classes, LMessages, GroupedEdit;
JvBaseEdits, DB, DBCtrls, Classes, LMessages, LCLVersion, GroupedEdit;
type
@ -129,8 +129,10 @@ type
property Enabled;
property Font;
property FormatOnEditing;
{$IF LCL_FullVersion >= 2000000}
property ImageIndex;
property Images;
{$IFEND}
property ButtonWidth;
property HideSelection;
property Anchors;

6
components/jvcllaz/run/JvHMI/jvled.pas
View File

@ -115,7 +115,7 @@ type
implementation
uses
SysUtils;
SysUtils, LCLVersion;
{$R ../../resource/jvled.res}
@ -234,7 +234,11 @@ end;
procedure TJvCustomLED.DoBlink(Sender: TObject);
begin
{$IF LCL_FullVersion >= 2000000}
if not IsIconic(Application.Handle) then
{$ELSE}
if not IsIconic(Application.MainForm.Handle) then
{$IFEND}
Status := not Status;
end;

8
components/jvcllaz/run/JvMM/jvfullcolorspaces.pas
View File

@ -1433,10 +1433,10 @@ end;
procedure TJvDEFColorSpace.AddCustomColor(AColor: TColor;
AShortName, APrettyName: string);
begin
if FDelphiColors.IndexOfObject(TObject(AColor)) = -1 then
if FDelphiColors.IndexOfObject(TObject(PtrInt(AColor))) = -1 then
begin
FDelphiColors.Values[AShortName] := APrettyName;
FDelphiColors.Objects[FDelphiColors.IndexOfName(AShortName)] := TObject(AColor);
FDelphiColors.Objects[FDelphiColors.IndexOfName(AShortName)] := TObject(PtrInt(AColor));
end;
end;
@ -1447,7 +1447,7 @@ var
begin
NewColor := clNone;
for I := 0 to FDelphiColors.Count - 1 do
if AColor = TColor(FDelphiColors.Objects[I]) then
if AColor = PtrInt(FDelphiColors.Objects[I]) then
begin
NewColor := AColor;
Break;
@ -1512,7 +1512,7 @@ end;
function TJvDEFColorSpace.GetColorValue(Index: Integer): TColor;
begin
if (Index >= 0) and (Index < FDelphiColors.Count) then
Result := TColor(FDelphiColors.Objects[Index])
Result := PtrInt(FDelphiColors.Objects[Index])
else
Result := clNone;
end;

4
components/jvcllaz/run/JvMM/jvid3v2base.pas
View File

@ -3854,7 +3854,7 @@ begin
if hfUnsynchronisation in Header.Flags then
ApplyUnsynchronisationSchemeOnCurrentStream;
FileStream := TFileStream.Create(FFileName, fmOpenReadWrite or fmShareExclusive);
FileStream := TFileStream.Create(AFileName, fmOpenReadWrite or fmShareExclusive);
try
OldTagSizeInclHeader := GetTagSizeInclHeader(FileStream);
@ -5151,7 +5151,7 @@ end;
procedure TJvID3Frame.DataChanged;
begin
if Assigned(FController) then
FController.ID3Event(ideFrameChange, Longint(Self));
FController.ID3Event(ideFrameChange, PtrInt(Self));
end;
procedure TJvID3Frame.Error(const Msg: string);

24
components/jvcllaz/run/JvMM/jvid3v2types.pas
View File

@ -1325,7 +1325,7 @@ end;
procedure TJvID3TermFinder.BuildList_ID3Genres;
var
I: Integer;
I: PtrInt;
begin
if Assigned(FLists[ltID3Genres]) then
Exit;
@ -1358,7 +1358,7 @@ begin
for FrameID := Low(TJvID3FrameID) to High(TJvID3FrameID) do
with CID3FrameDefs[FrameID] do
if LongTextID[0] <> #0 then
AddObject(string(LongTextID), TObject(FrameID));
AddObject(string(LongTextID), TObject(PtrInt(FrameID)));
end;
end;
@ -1378,13 +1378,13 @@ begin
for FrameID := Low(TJvID3FrameID) to High(TJvID3FrameID) do
with CID3FrameDefs[FrameID] do
if ShortTextID[0] <> #0 then
AddObject(string(ShortTextID), TObject(FrameID));
AddObject(string(ShortTextID), TObject(PtrInt(FrameID)));
end;
end;
procedure TJvID3TermFinder.BuildList_ISO_639_2Code;
var
I: Integer;
I: PtrInt;
begin
if Assigned(FLists[ltISO_639_2Code]) then
Exit;
@ -1403,7 +1403,7 @@ end;
procedure TJvID3TermFinder.BuildList_ISO_639_2Name;
var
I: Integer;
I: PtrInt;
begin
if Assigned(FLists[ltISO_639_2Name]) then
Exit;
@ -1436,7 +1436,7 @@ begin
AStrings.AddObject('', TObject(255));
for I := 0 to FLists[ltID3Genres].Count - 1 do
if InclWinampGenres or (Integer(FLists[ltID3Genres].Objects[I]) <= CGenre_HighV1) then
if InclWinampGenres or (PtrInt(FLists[ltID3Genres].Objects[I]) <= CGenre_HighV1) then
AStrings.AddObject(FLists[ltID3Genres][I], FLists[ltID3Genres].Objects[I]);
finally
AStrings.EndUpdate;
@ -1464,7 +1464,7 @@ begin
Result := -1;
if Result >= 0 then
Result := Integer(FLists[ltID3Genres].Objects[Result])
Result := PtrInt(FLists[ltID3Genres].Objects[Result])
else
Result := cDefaultGenre[InclWinampGenres];
end;
@ -1494,7 +1494,7 @@ begin
Result := -1;
if Result >= 0 then
Result := Integer(FLists[ltID3Genres].Objects[Result])
Result := PtrInt(FLists[ltID3Genres].Objects[Result])
else
Result := CDefaultGenre[InclWinampGenres];
end;
@ -1516,7 +1516,7 @@ begin
if I < 0 then
Result := fiUnknownFrame
else
Result := TJvID3FrameID(FLists[ltID3LongText].Objects[I]);
Result := TJvID3FrameID(PtrInt(FLists[ltID3LongText].Objects[I]));
end;
function TJvID3TermFinder.ID3ShortTextToFrameID(
@ -1536,7 +1536,7 @@ begin
if I < 0 then
Result := fiUnknownFrame
else
Result := TJvID3FrameID(FLists[ltID3ShortText].Objects[I]);
Result := TJvID3FrameID(PtrInt(FLists[ltID3ShortText].Objects[I]));
end;
function TJvID3TermFinder.IsFrameOk(const S: AnsiString): Boolean;
@ -1560,7 +1560,7 @@ begin
Result := FLists[ltISO_639_2Code].IndexOf(string(AnsiLowerCase(ACode)));
if Result >= 0 then
Result := Integer(FLists[ltISO_639_2Code].Objects[Result]);
Result := Integer(PtrInt(FLists[ltISO_639_2Code].Objects[Result]));
end;
procedure TJvID3TermFinder.ISO_639_2Names(AStrings: TStrings);
@ -1577,7 +1577,7 @@ begin
Result := FLists[ltISO_639_2Name].IndexOf(AName);
if Result >= 0 then
Result := Integer(FLists[ltISO_639_2Name].Objects[Result]);
Result := PtrInt(FLists[ltISO_639_2Name].Objects[Result]);
end;
initialization

7
components/jvcllaz/run/JvNet/jvstrtohtml.pas
View File

@ -32,7 +32,6 @@ interface
uses
SysUtils, Classes;
// JvComponentBase;
type
TJvStrToHtml = class(TComponent) // TJvComponent)
@ -58,7 +57,7 @@ function HtmlToString(const Value: string): string;
implementation
uses
LazUtf8;
LCLVersion, LazUtf8;
type
TJvHtmlCodeRec = record
@ -408,7 +407,11 @@ begin
if P^ in ['a'..'z', 'A'..'Z', '0'..'9', '_', ' '] then
Append(P^)
else begin
{$IF LCL_FullVersion >= 2000000}
ch := UTF8CodePointToUniCode(P, n);
{$ELSE}
ch := UTF8CharacterToUniCode(P, n);
{$IFEND}
found := false;
for J := Low(Conversions) to High(Conversions) do
if ch = Conversions[J].Ch then begin

2
components/jvcllaz/run/JvPageComps/jvnavigationpane.pas
View File

@ -2260,7 +2260,7 @@ end;
procedure TJvNavIconButton.ParentStyleManagerChanged(var Msg: TMsgStyleManagerChange);
begin
if (Msg.Sender <> Self) and ParentStyleManager then
if (Msg.Sender <> Self) and ParentStyleManager and not (csDestroying in ComponentState) then
begin
StyleManager := Msg.StyleManager;
ParentStyleManager := True;

4
components/jvcllaz/run/JvPageComps/jvtabbar.pas
View File

@ -67,7 +67,7 @@ type
FImageIndex: TImageIndex;
FEnabled: Boolean;
FVisible: Boolean;
FTag: Integer;
FTag: PtrInt;
FData: TObject;
FHint: TCaption;
FName: string;
@ -121,7 +121,7 @@ type
property Modified: Boolean read GetModified write SetModified default False;
property Hint: TCaption read FHint write FHint;
property ImageIndex: TImageIndex read FImageIndex write SetImageIndex default -1;
property Tag: Integer read FTag write FTag default 0;
property Tag: PtrInt read FTag write FTag default 0;
property Visible: Boolean read FVisible write SetVisible default True;
property PopupMenu: TPopupMenu read FPopupMenu write SetPopupMenu;
property ShowHint: Boolean read FShowHint write FShowHint default True;

7
components/jvcllaz/run/JvStdCtrls/jvbaseedits.pas
View File

@ -37,7 +37,8 @@ unit JvBaseEdits;
interface
uses
Classes, SysUtils, EditBtn, LMessages, CalcForm, Forms, GroupedEdit;
Classes, SysUtils, EditBtn, LMessages, LCLVersion, Forms,
CalcForm, GroupedEdit;
type
@ -173,9 +174,11 @@ type
property ButtonWidth;
property Glyph;
property NumGlyphs;
{$IF LCL_FullVersion >= 2000000}
property Images;
property ImageIndex;
property ImageWidth;
{$IFEND}
property Action;
property DirectInput;
property FocusOnButtonClick;
@ -254,9 +257,11 @@ type
property DragKind;
property Glyph;
property NumGlyphs;
{$IF LCL_FullVersion >= 2000000}
property Images;
property ImageIndex;
property ImageWidth;
{$IFEND}
property Flat;
property ParentBiDiMode;
property OnEndDock;

7
components/jvcllaz/run/JvWizard/jvwizard.pas
View File

@ -337,7 +337,8 @@ interface
uses
SysUtils, Classes,
Controls, Forms, Graphics, Buttons, ImgList, Types, LMessages, LCLType, LCLIntf,
Controls, Forms, Graphics, Buttons, ImgList, Types,
LMessages, LCLType, LCLIntf, LCLVersion,
JvWizardCommon, JvComponent;
type
@ -795,7 +796,9 @@ type
procedure RepositionButtons;
procedure UpdateButtonsStatus;
procedure WMEraseBkgnd(var Msg: TLMEraseBkgnd); message LM_ERASEBKGND;
{$IF LCL_FullVersion >= 2000000}
procedure WMGetDlgCode(var Msg: TLMGetDlgCode); message LM_GETDLGCODE;
{$IFEND}
procedure CMDesignHitTest(var Msg: TCMDesignHitTest); message CM_DESIGNHITTEST;
function FindNextEnabledPage(PageIndex: Integer; const Step: Integer = 1;
CheckDisable: Boolean = True): TJvWizardCustomPage;
@ -2959,10 +2962,12 @@ begin
Rect.Bottom := Rect.Bottom - FButtonBarHeight;
end;
{$IF LCL_FullVersion >= 2000000}
procedure TJvWizard.WMGetDlgCode(var Msg: TLMGetDlgCode);
begin
Msg.Result := DLGC_WANTALLKEYS or DLGC_WANTARROWS;
end;
{$IFEND}
procedure TJvWizard.UpdateButtonsStatus;
var