From 0d9f12f3642c584186d1fcd3d69f8c9de56db409 Mon Sep 17 00:00:00 2001 From: zeljko Date: Thu, 14 Nov 2013 06:47:14 +0000 Subject: [PATCH] Qt: changed defines for TQtFloatSpinEdit and CPU64 git-svn-id: trunk@43442 - --- lcl/interfaces/qt/qtwidgets.pas | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lcl/interfaces/qt/qtwidgets.pas b/lcl/interfaces/qt/qtwidgets.pas index f5011d9a07..e10cf4ed1b 100644 --- a/lcl/interfaces/qt/qtwidgets.pas +++ b/lcl/interfaces/qt/qtwidgets.pas @@ -1031,9 +1031,9 @@ type TQtAbstractSpinBox = class(TQtWidget, IQtEdit) private - {$ifdef CPU64 and not WIN64} + {$IF DEFINED(CPU64) AND NOT DEFINED(WIN64)} FParentShowPassed: PtrInt; - {$endif} + {$ENDIF} FEditingFinishedHook: QAbstractSpinBox_hookH; FLineEditHook: QObject_hookH; // parts @@ -10538,7 +10538,7 @@ begin {we must pass delete key to qt, qabstractspinbox doesn't like what we do} if IsDeleteKey then Result := False; - {$ifdef CPU64 and not WIN64} + {$IF DEFINED(CPU64) AND NOT DEFINED(WIN64)} if (FParentShowPassed = 1) then begin if QEvent_type(Event) <> QEventPaint then @@ -10553,7 +10553,7 @@ begin if (QEvent_type(Event) = QEventShowToParent) and (FParentShowPassed = 0) then inc(FParentShowPassed); - {$endif} + {$ENDIF} end; @@ -10585,9 +10585,9 @@ begin {$ifdef VerboseQt} WriteLn('TQtFloatSpinBox.Create'); {$endif} - {$ifdef CPU64 and not WIN64} + {$IF DEFINED(CPU64) AND NOT DEFINED(WIN64)} FParentShowPassed := 0; - {$endif} + {$ENDIF} FValue := 0; FLineEditHook := nil; if AParams.WndParent <> 0 then @@ -10666,9 +10666,9 @@ begin {$ifdef VerboseQt} WriteLn('TQtSpinBox.Create'); {$endif} - {$ifdef CPU64 and not WIN64} + {$IF DEFINED(CPU64) AND NOT DEFINED(WIN64)} FParentShowPassed := 0; - {$endif} + {$ENDIF} FLineEditHook := nil; if AParams.WndParent <> 0 then Parent := TQtWidget(AParams.WndParent).GetContainerWidget