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

jvcllaz: Another fix for the TSmallPoint issue.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5446 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2016-12-07 16:51:48 +00:00
parent eb75a1cbfb
commit 6085e8b9b7
3 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ unit JvExControls;
interface interface
uses uses
Classes, types, Controls, Graphics, LCLIntf, LCLType, LMessages, Forms, Classes, Controls, Graphics, LCLIntf, LCLType, LMessages, types, Forms,
JvTypes; JvTypes;
type type
@ -52,14 +52,14 @@ 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} {$IFDEF WINDOWS}
TSmallPoint = Types.TSmallPoint; TSmallPoint = Types.TSmallPoint;
{$ENDIF} {$ENDIF}
{$IFDEF LINUX} {$IFDEF LINUX}
TSmallPoint = Classes.TSmallPoint; TSmallPoint = Classes.TSmallPoint;
{$ENDIF} {$ENDIF}
*)
(******************** NOT CONVERTED (******************** NOT CONVERTED
const const
dcWantMessage = dcWantAllKeys; dcWantMessage = dcWantAllKeys;
@ -664,8 +664,12 @@ begin
end; end;
function TJvExGraphicControl.HitTest(X, Y: Integer): Boolean; function TJvExGraphicControl.HitTest(X, Y: Integer): Boolean;
var
pt: Types.TSmallPoint;
begin begin
Result := BaseWndProc(CM_HITTEST, 0, SmallPointToLong(PointToSmallPoint(Point(X, Y)))) <> 0; pt.X := X;
pt.Y := Y;
Result := BaseWndProc(CM_HITTEST, 0, SmallPointToLong(pt)) <> 0;
end; end;
function TJvExGraphicControl.HintShow(var HintInfo: THintInfo): Boolean; function TJvExGraphicControl.HintShow(var HintInfo: THintInfo): Boolean;
@ -849,8 +853,12 @@ begin
end; end;
function TJvExCustomControl.HitTest(X, Y: Integer): Boolean; function TJvExCustomControl.HitTest(X, Y: Integer): Boolean;
var
pt: Types.TSmallPoint;
begin begin
Result := BaseWndProc(CM_HITTEST, 0, SmallPointToLong(PointToSmallPoint(Point(X, Y)))) <> 0; pt.X := X;
pt.Y := Y;
Result := BaseWndProc(CM_HITTEST, 0, SmallPointToLong(pt)) <> 0;
end; end;
function TJvExCustomControl.HintShow(var HintInfo: THintInfo): Boolean; function TJvExCustomControl.HintShow(var HintInfo: THintInfo): Boolean;

9
components/jvcllaz/run/JvCore/JvExExtCtrls.pas
View File

@ -153,6 +153,9 @@ type
implementation implementation
uses
Types;
//******************** NOT CONVERTED //******************** NOT CONVERTED
//CONTROL_IMPL_DEFAULT(Shape) //CONTROL_IMPL_DEFAULT(Shape)
@ -293,8 +296,12 @@ begin
end; end;
function TJvExSplitter.HitTest(X, Y: Integer): Boolean; function TJvExSplitter.HitTest(X, Y: Integer): Boolean;
var
pt: Types.TSmallPoint;
begin begin
Result := BaseWndProc(CM_HITTEST, 0, SmallPointToLong(PointToSmallPoint(Point(X, Y)))) <> 0; pt.X := X;
pt.Y := Y;
Result := BaseWndProc(CM_HITTEST, 0, SmallPointToLong(pt)) <> 0;
end; end;
function TJvExSplitter.HintShow(var HintInfo: THintInfo): Boolean; function TJvExSplitter.HintShow(var HintInfo: THintInfo): Boolean;

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

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