pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

jvcllaz: Repeat prev commit.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5447 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-12-07 16:58:36 +00:00
parent 6085e8b9b7
commit 36baccb321
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/jvcllaz/run/JvCore/JvExControls.pas
View File

@ -44,7 +44,7 @@ unit JvExControls;
interface interface
uses uses
Classes, Controls, Graphics, LCLIntf, LCLType, LMessages, types, Forms, Classes, types, Controls, Graphics, LCLIntf, LCLType, LMessages, Forms,
JvTypes; JvTypes;
type type
@ -52,14 +52,7 @@ type
(dcWantAllKeys, dcWantArrows, dcWantChars, dcButton, dcHasSetSel, dcWantTab, (dcWantAllKeys, dcWantArrows, dcWantChars, dcButton, dcHasSetSel, dcWantTab,
dcNative); // if dcNative is in the set the native allowed keys are used and GetDlgCode is ignored dcNative); // if dcNative is in the set the native allowed keys are used and GetDlgCode is ignored
TDlgCodes = set of TDlgCode; TDlgCodes = set of TDlgCode;
(*
{$IFDEF WINDOWS}
TSmallPoint = Types.TSmallPoint;
{$ENDIF}
{$IFDEF LINUX}
TSmallPoint = Classes.TSmallPoint;
{$ENDIF}
*)
(******************** NOT CONVERTED (******************** NOT CONVERTED
const const
dcWantMessage = dcWantAllKeys; dcWantMessage = dcWantAllKeys;
@ -142,7 +135,6 @@ procedure HandleDotNetHighlighting(Control: TWinControl; const Msg: TLMessage;
MouseOver: Boolean; Color: TColor); 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: PtrInt): TLMessage; overload; {$IFDEF SUPPORTS_INLINE} inline {$ENDIF}
function CreateWMMessage(Msg: Integer; WParam: PtrInt; LParam: TControl): 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 SmallPointToLong(const Pt: TSmallPoint): LongInt; {$IFDEF SUPPORTS_INLINE} inline {$ENDIF}
function ShiftStateToKeyData(Shift: TShiftState): Longint; function ShiftStateToKeyData(Shift: TShiftState): Longint;
@ -380,7 +372,6 @@ begin
end; end;
function SmallPointToLong(const Pt: TSmallPoint): LongInt; function SmallPointToLong(const Pt: TSmallPoint): LongInt;
//function SmallPointToLong(const Pt: Classes.TSmallPoint): Longint;
begin begin
Result := Longint(Pt); Result := Longint(Pt);
end; end;

2
components/jvcllaz/run/JvCore/JvJVCLUtils.pas
View File

@ -37,8 +37,8 @@ uses
{$IFDEF WIN32} {$IFDEF WIN32}
Windows, // before Types! Windows, // before Types!
{$ENDIF} {$ENDIF}
LCLType, LCLProc, LMessages, Types,
Classes, Graphics, Controls, ImgList, Classes, Graphics, Controls, ImgList,
LCLType, LCLProc, LMessages, Types,
JvTypes; JvTypes;
(******************** NOT CONVERTED (******************** NOT CONVERTED