From 028cd6f1171b68c5fe5aa42eeedf09a2dae2306b Mon Sep 17 00:00:00 2001 From: Maxim Ganetsky Date: Thu, 30 Nov 2023 19:49:10 +0300 Subject: [PATCH] Lazutils, LCL: fixed compilation with FPC 3.2.3 --- components/lazutils/uitypes.pas | 2 +- lcl/controls.pp | 16 ++++++++-------- lcl/dialogs.pp | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/components/lazutils/uitypes.pas b/components/lazutils/uitypes.pas index 68c4ca737b..27bed97738 100644 --- a/components/lazutils/uitypes.pas +++ b/components/lazutils/uitypes.pas @@ -103,7 +103,7 @@ const 'mrNoToAll', 'mrYesToAll', 'mrClose' - {$IF FPC_FULLVERSION>30300} + {$IF FPC_FULLVERSION>=30203} , 'mrContinue', 'mrTryAgain' diff --git a/lcl/controls.pp b/lcl/controls.pp index 713041d201..f4cbcb108d 100644 --- a/lcl/controls.pp +++ b/lcl/controls.pp @@ -68,7 +68,7 @@ const mrNoToAll = SysUITypes.mrNoToAll; mrYesToAll= SysUITypes.mrYesToAll; mrClose = SysUITypes.mrClose; - {$IF FPC_FULLVERSION>30300} + {$IF FPC_FULLVERSION>=30203} mrContinue= SysUITypes.mrContinue; mrTryAgain= SysUITypes.mrTryAgain; {$ENDIF} @@ -179,7 +179,7 @@ type TAlign = (alNone, alTop, alBottom, alLeft, alRight, alClient, alCustom); TAlignSet = set of TAlign; - {$IF FPC_FULLVERSION >= 30300} + {$IF FPC_FULLVERSION >= 30203} TAnchorKind = SysUITypes.TAnchorKind; TAnchors = SysUITypes.TAnchors; TAnchorSideReference = SysUITypes.TAnchorSideReference; @@ -190,7 +190,7 @@ type {$ENDIF} const - {$IF FPC_FULLVERSION >= 30300} + {$IF FPC_FULLVERSION >= 30203} akLeft = SysUITypes.akLeft; akTop = SysUITypes.akTop; akRight = SysUITypes.akRight; @@ -222,14 +222,14 @@ type TBevelCut = TGraphicsBevelCut; - {$IF FPC_FULLVERSION >= 30300} + {$IF FPC_FULLVERSION >= 30203} TMouseButton = SysUITypes.TMouseButton; {$ELSE} TMouseButton = (mbLeft, mbRight, mbMiddle, mbExtra1, mbExtra2); {$ENDIF} const - {$IF FPC_FULLVERSION >= 30300} + {$IF FPC_FULLVERSION >= 30203} mbLeft = SysUITypes.mbLeft; mbRight = SysUITypes.mbRight; mbMiddle = SysUITypes.mbMiddle; @@ -471,7 +471,7 @@ type TDragObject = class; - {$IF FPC_FULLVERSION >= 30300} + {$IF FPC_FULLVERSION >= 30203} TDragKind = SysUITypes.TDragKind; TDragMode = SysUITypes.TDragMode; TDragState = SysUITypes.TDragState; @@ -986,7 +986,7 @@ type ); TControlAutoSizePhases = set of TControlAutoSizePhase; - {$IF FPC_FULLVERSION >= 30300} + {$IF FPC_FULLVERSION >= 30203} TTabOrder = SysUITypes.TTabOrder; {$ELSE} TTabOrder = -1..32767; @@ -2788,7 +2788,7 @@ function CompareDataObjectWithLazAccessibleObject(o, ao: Pointer): Integer; // register (called by the package initialization in design mode) procedure Register; -{$IF FPC_FULLVERSION >= 30300} +{$IF FPC_FULLVERSION >= 30203} const dkDrag = SysUITypes.dkDrag; dkDock = SysUITypes.dkDock; diff --git a/lcl/dialogs.pp b/lcl/dialogs.pp index 1c435045c2..147c5c7653 100644 --- a/lcl/dialogs.pp +++ b/lcl/dialogs.pp @@ -819,7 +819,7 @@ const idButtonAll, idButtonNoToAll, idButtonYesToAll, - {$IF FPC_FULLVERSION>30300} + {$IF FPC_FULLVERSION>=30203} idButtonContinue, idButtonTryAgain, {$ENDIF}