From 36baccb321d8097a98032786170556d85588a6c4 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Wed, 7 Dec 2016 16:58:36 +0000
Subject: [PATCH] jvcllaz: Repeat prev commit.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5447 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/jvcllaz/run/JvCore/JvExControls.pas | 13 ++-----------
 components/jvcllaz/run/JvCore/JvJVCLUtils.pas  |  8 ++++----
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/components/jvcllaz/run/JvCore/JvExControls.pas b/components/jvcllaz/run/JvCore/JvExControls.pas
index 18c4bcccc..e0a71e8f2 100644
--- a/components/jvcllaz/run/JvCore/JvExControls.pas
+++ b/components/jvcllaz/run/JvCore/JvExControls.pas
@@ -44,7 +44,7 @@ unit JvExControls;
 interface
 
 uses
-  Classes, Controls, Graphics, LCLIntf, LCLType, LMessages, types, Forms,
+  Classes, types, Controls, Graphics, LCLIntf, LCLType, LMessages, Forms,
   JvTypes;
 
 type
@@ -52,14 +52,7 @@ type
    (dcWantAllKeys, dcWantArrows, dcWantChars, dcButton, dcHasSetSel, dcWantTab,
     dcNative); // if dcNative is in the set the native allowed keys are used and GetDlgCode is ignored
   TDlgCodes = set of TDlgCode;
-                 (*
- {$IFDEF WINDOWS}
-  TSmallPoint = Types.TSmallPoint;
- {$ENDIF}
- {$IFDEF LINUX}
-  TSmallPoint = Classes.TSmallPoint;
- {$ENDIF}
-                   *)
+
 (******************** NOT CONVERTED
 const
   dcWantMessage = dcWantAllKeys;
@@ -142,7 +135,6 @@ procedure HandleDotNetHighlighting(Control: TWinControl; const Msg: TLMessage;
   MouseOver: Boolean; Color: TColor);
 function CreateWMMessage(Msg: Integer; WParam: PtrInt; LParam: PtrInt): TLMessage; overload; {$IFDEF SUPPORTS_INLINE} inline {$ENDIF}
 function CreateWMMessage(Msg: Integer; WParam: PtrInt; LParam: TControl): TLMessage; overload; {$IFDEF SUPPORTS_INLINE} inline {$ENDIF}
-//function SmallPointToLong(const Pt: Classes.TSmallPoint): Longint; {$IFDEF SUPPORTS_INLINE} inline {$ENDIF}
 function SmallPointToLong(const Pt: TSmallPoint): LongInt; {$IFDEF SUPPORTS_INLINE} inline {$ENDIF}
 function ShiftStateToKeyData(Shift: TShiftState): Longint;
 
@@ -380,7 +372,6 @@ begin
 end;
 
 function SmallPointToLong(const Pt: TSmallPoint): LongInt;
-//function SmallPointToLong(const Pt: Classes.TSmallPoint): Longint;
 begin
   Result := Longint(Pt);
 end;
diff --git a/components/jvcllaz/run/JvCore/JvJVCLUtils.pas b/components/jvcllaz/run/JvCore/JvJVCLUtils.pas
index 4677ba3e2..292f2b65c 100644
--- a/components/jvcllaz/run/JvCore/JvJVCLUtils.pas
+++ b/components/jvcllaz/run/JvCore/JvJVCLUtils.pas
@@ -34,11 +34,11 @@ unit JvJVCLUtils;
 interface
 
 uses
-  {$IFDEF WIN32}
-   Windows,                 // before Types!
-  {$ENDIF}
-  LCLType, LCLProc, LMessages, Types,
+ {$IFDEF WIN32}
+  Windows,          // before Types!
+ {$ENDIF}
   Classes, Graphics, Controls, ImgList,
+  LCLType, LCLProc, LMessages, Types,
   JvTypes;
 
 (******************** NOT CONVERTED