paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-12 13:17:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: fixed compilation with fpc 2.3.1; TShiftState is now declared with {$PACKSET 1}

Browse Source 
git-svn-id: trunk@11389 -
This commit is contained in:
vincents 2007-06-27 09:23:39 +00:00
parent 4184fe11fe
commit 9552b8fc14
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ideintf/idecommands.pas
View File

@ -572,6 +572,14 @@ begin
IDECmdScopeObjectInspectorOnly:=RegisterIDECommandScope('ObjectInspectorOnly'); IDECmdScopeObjectInspectorOnly:=RegisterIDECommandScope('ObjectInspectorOnly');
end; end;
type
// in fpc 2.3.1 TShiftState is declared with {$packset 1}
{$IF sizeof(TShiftState)=2}
TShiftStateInt = word;
{$ELSE}
TShiftStateInt = integer;
{$ENDIF}
function CompareIDEShortCuts(Data1, Data2: Pointer): integer; function CompareIDEShortCuts(Data1, Data2: Pointer): integer;
var var
ShortCut1: PIDEShortCut; ShortCut1: PIDEShortCut;
@ -583,17 +591,17 @@ begin
Result:=1 Result:=1
else if ShortCut1^.Key1<ShortCut2^.Key1 then else if ShortCut1^.Key1<ShortCut2^.Key1 then
Result:=-1 Result:=-1
else if integer(ShortCut1^.Shift1)>integer(ShortCut2^.Shift1) then else if TShiftStateInt(ShortCut1^.Shift1)>TShiftStateInt(ShortCut2^.Shift1) then
Result:=1 Result:=1
else if integer(ShortCut1^.Shift1)<integer(ShortCut2^.Shift1) then else if TShiftStateInt(ShortCut1^.Shift1)<TShiftStateInt(ShortCut2^.Shift1) then
Result:=-1 Result:=-1
else if ShortCut1^.Key2>ShortCut2^.Key2 then else if ShortCut1^.Key2>ShortCut2^.Key2 then
Result:=1 Result:=1
else if ShortCut1^.Key2<ShortCut2^.Key2 then else if ShortCut1^.Key2<ShortCut2^.Key2 then
Result:=-1 Result:=-1
else if integer(ShortCut1^.Shift2)>integer(ShortCut2^.Shift2) then else if TShiftStateInt(ShortCut1^.Shift2)>TShiftStateInt(ShortCut2^.Shift2) then
Result:=1 Result:=1
else if integer(ShortCut1^.Shift2)<integer(ShortCut2^.Shift2) then else if TShiftStateInt(ShortCut1^.Shift2)<TShiftStateInt(ShortCut2^.Shift2) then
Result:=-1 Result:=-1
else else
Result:=0; Result:=0;
@ -610,9 +618,9 @@ begin
Result:=1 Result:=1
else if ShortCut1^.Key1<ShortCut2^.Key1 then else if ShortCut1^.Key1<ShortCut2^.Key1 then
Result:=-1 Result:=-1
else if integer(ShortCut1^.Shift1)>integer(ShortCut2^.Shift1) then else if TShiftStateInt(ShortCut1^.Shift1)>TShiftStateInt(ShortCut2^.Shift1) then
Result:=1 Result:=1
else if integer(ShortCut1^.Shift1)<integer(ShortCut2^.Shift1) then else if TShiftStateInt(ShortCut1^.Shift1)<TShiftStateInt(ShortCut2^.Shift1) then
Result:=-1 Result:=-1
else else
Result:=0; Result:=0;