diff --git a/components/dockedformeditor/source/dockedanchordesigner.pas b/components/dockedformeditor/source/dockedanchordesigner.pas index dbb5f49995..2a815310eb 100644 --- a/components/dockedformeditor/source/dockedanchordesigner.pas +++ b/components/dockedformeditor/source/dockedanchordesigner.pas @@ -149,7 +149,7 @@ begin if not (Shift = [ssLeft]) and not (Shift = [ssCtrl, ssLeft]) then Exit; GetCursorPos(FMousePos); Include(FState, asMouseDown); - {$IF Defined(LCLWin32) or Defined(LCLWin64)} + {$IFDEF LCLWin32} SetCapture(TWinControl(Sender).Handle); {$ENDIF} end; @@ -227,7 +227,7 @@ begin UndoAdd; Screen.Cursor := crDefault; - {$IF Defined(LCLWin32) or Defined(LCLWin64)} + {$IFDEF LCLWin32} ReleaseCapture; {$ENDIF} @@ -257,7 +257,7 @@ begin if not (Shift = [ssLeft]) and not (Shift = [ssCtrl, ssLeft]) then Exit; GetCursorPos(FMousePos); Include(FState, asMouseDown); - {$IF Defined(LCLWin32) or Defined(LCLWin64)} + {$IFDEF LCLWin32} SetCapture(TWinControl(Sender).Handle); {$ENDIF} end; @@ -371,7 +371,7 @@ begin UndoAdd; Screen.Cursor := crDefault; - {$IF Defined(LCLWin32) or Defined(LCLWin64)} + {$IFDEF LCLWin32} ReleaseCapture; {$ENDIF} @@ -1011,7 +1011,7 @@ begin FreeAndNil(FPreviousControl); end; Screen.Cursor := crDefault; - {$IF Defined(LCLWin32) or Defined(LCLWin64)} + {$IFDEF LCLWin32} if asMouseDown in State then ReleaseCapture; {$ENDIF} diff --git a/components/dockedformeditor/source/dockeddesignform.pas b/components/dockedformeditor/source/dockeddesignform.pas index 85e76a1b5a..e120b22b4b 100644 --- a/components/dockedformeditor/source/dockeddesignform.pas +++ b/components/dockedformeditor/source/dockeddesignform.pas @@ -121,7 +121,7 @@ begin end; case Msg.msg of - {$IF Defined(LCLWin32) or Defined(LCLWin64)} + {$IFDEF LCLWin32} // we need to correct ActiveEditor to right form // this code works correctly on Windows platform // (is necessery for selecting controls after form resizing). diff --git a/components/dockedformeditor/source/dockedformaccesses.pas b/components/dockedformeditor/source/dockedformaccesses.pas index bc8620ebfa..07fc8eb294 100644 --- a/components/dockedformeditor/source/dockedformaccesses.pas +++ b/components/dockedformeditor/source/dockedformaccesses.pas @@ -135,7 +135,7 @@ end; function TFormAccess.ClientOffset: TPoint; begin Result := Point(0, 0); - {$IF Defined(LCLWin32) or Defined(LCLWin64)} + {$IFDEF LCLWin32} Result.X := GetSystemMetrics(SM_CXSIZEFRAME); Result.Y := GetSystemMetrics(SM_CYSIZEFRAME) + GetSystemMetrics(SM_CYCAPTION); {$ENDIF} @@ -224,7 +224,7 @@ var i: Integer; begin Result := False; -// {$IF DEFINED(LCLWin32) OR DEFINED(LCLWin64) OR DEFINED(LCLGtk2) OR DEFINED(LCLQt) OR DEFINED(LCLQt5)} +// {$IF DEFINED(LCLWin32) OR DEFINED(LCLGtk2) OR DEFINED(LCLQt) OR DEFINED(LCLQt5)} {$IF DEFINED(LCLQt) OR DEFINED(LCLQt5)} // Menu is already shown in designer Exit; diff --git a/components/dockedformeditor/source/dockedresizecontrol.pas b/components/dockedformeditor/source/dockedresizecontrol.pas index 5b703696df..7197b34e00 100644 --- a/components/dockedformeditor/source/dockedresizecontrol.pas +++ b/components/dockedformeditor/source/dockedresizecontrol.pas @@ -314,7 +314,7 @@ begin FResizing := True; BeginFormSizeUpdate(Sender); - {$IF Defined(LCLWin32) or Defined(LCLWin64)} + {$IFDEF LCLWin32} SetCapture(TWinControl(Sender).Handle); {$ENDIF} GetCursorPos(FOldMousePos); @@ -346,7 +346,7 @@ begin ClientChangeBounds(nil); Screen.Cursor := crDefault; - {$IF Defined(LCLWin32) or Defined(LCLWin64)} + {$IFDEF LCLWin32} ReleaseCapture; {$ENDIF}