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

jvcllaz: Fix compilation on macOS and on 64-bit.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7431 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-05-06 10:40:05 +00:00
parent 6952568642
commit f2502d8ad3
15 changed files with 73 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
components/jvcllaz/design/JvMM/jvfullcolorlistform.pas
View File

@ -142,7 +142,7 @@ begin
JvFullColorDialog.Options := JvFullColorDialog.Options - [foShowApply];
if JvFullColorDialog.Execute then
ListBoxColors.Items.InsertObject(ListBoxColors.ItemIndex, '',
TObject(JvFullColorDialog.FullColor));
TObject(PtrInt(JvFullColorDialog.FullColor)));
end;
procedure TJvFullColorListFrm.ActionInsertUpdate(Sender: TObject);
@ -153,9 +153,9 @@ end;
procedure TJvFullColorListFrm.ActionModifyExecute(Sender: TObject);
begin
JvFullColorDialog.Options := JvFullColorDialog.Options + [foShowApply];
JvFullColorDialog.FullColor := TJvFullColor(ListBoxColors.Items.Objects[ListBoxColors.ItemIndex]);
JvFullColorDialog.FullColor := TJvFullColor(PtrInt(ListBoxColors.Items.Objects[ListBoxColors.ItemIndex]));
if JvFullColorDialog.Execute then
ListBoxColors.Items.Objects[ListBoxColors.ItemIndex] := TObject(JvFullColorDialog.FullColor);
ListBoxColors.Items.Objects[ListBoxColors.ItemIndex] := TObject(PtrInt(JvFullColorDialog.FullColor));
end;
procedure TJvFullColorListFrm.ActionModifyUpdate(Sender: TObject);
@ -203,7 +203,7 @@ procedure TJvFullColorListFrm.ActionNewExecute(Sender: TObject);
begin
JvFullColorDialog.Options := JvFullColorDialog.Options - [foShowApply];
if JvFullColorDialog.Execute then begin
ListBoxColors.Items.AddObject('', TObject(JvFullColorDialog.FullColor));
ListBoxColors.Items.AddObject('', TObject(PtrInt(JvFullColorDialog.FullColor)));
ListBoxColors.ItemIndex := ListBoxColors.Items.Count-1;
end;
end;
@ -259,7 +259,7 @@ begin
FColorList.BeginUpdate;
FColorList.Clear;
for Index := 0 to ListBoxColors.Items.Count - 1 do
FColorList.Add(TJvFullColor(ListBoxColors.Items.Objects[Index]));
FColorList.Add(TJvFullColor(PtrInt(ListBoxColors.Items.Objects[Index])));
FColorList.EndUpdate;
Result := FColorList;
end;
@ -272,7 +272,7 @@ begin
begin
BeginUpdate;
for I := 0 to Value.Count - 1 do
AddObject('', TObject(Value.Items[I]));
AddObject('', TObject(PtrInt(Value.Items[I])));
EndUpdate;
end;
end;
@ -286,7 +286,7 @@ end;
procedure TJvFullColorListFrm.JvFullColorDialogApply(Sender: TObject;
AFullColor: TJvFullColor);
begin
ListBoxColors.Items.Objects[ListBoxColors.ItemIndex] := TObject(JvFullColorDialog.FullColor);
ListBoxColors.Items.Objects[ListBoxColors.ItemIndex] := TObject(PtrInt(JvFullColorDialog.FullColor));
end;
procedure TJvFullColorListFrm.ListBoxColorsDrawItem(Control: TWinControl;
@ -306,7 +306,7 @@ begin
Rectangle(Rect);
AFullColor := TJvFullColor(Items.Objects[Index]);
AFullColor := TJvFullColor(PtrInt(Items.Objects[Index]));
with ColorSpaceManager do
begin

8
components/jvcllaz/design/JvMM/jvfullcolorspaceseditors.pas
View File

@ -647,10 +647,10 @@ begin
if PropCount > 1 then
begin
FullColorList := TJvFullColorList.Create;
FullColorList.Assign(TJvFullColorList(GetOrdValue));
FullColorList.Assign(TJvFullColorList(PtrInt(GetOrdValue)));
for IndexList := 1 to PropCount - 1 do
with TJvFullColorList(GetOrdValueAt(IndexList)) do
with TJvFullColorList(PtrInt(GetOrdValueAt(PtrInt(IndexList)))) do
for IndexColor:=0 to Count - 1 do
if FullColorList.Items[IndexColor] <> Items[IndexColor] then
Exit;
@ -669,7 +669,7 @@ begin
FullColorList:=TJvFullColorList.Create;
try
for IndexList := 0 to PropCount - 1 do
with TJvFullColorList(GetOrdValueAt(IndexList)) do
with TJvFullColorList(PtrInt(GetOrdValueAt(IndexList))) do
for IndexColor := 0 to Count - 1 do
if FullColorList.IndexOf(Items[IndexColor]) = -1 then
FullColorList.Add(Items[IndexColor]);
@ -688,7 +688,7 @@ end;
procedure TJvFullColorListEditor.FormApply(Sender: TObject);
begin
SetOrdValue(Cardinal((Sender as TJvFullColorListFrm).ColorList));
SetOrdValue(PtrInt((Sender as TJvFullColorListFrm).ColorList));
end;
function TJvFullColorListEditor.GetAttributes: TPropertyAttributes;