paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 15:59:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL-Win32: Support compilation with FPC 2.6.4. Will be merged to 1.8 fixes.

Browse Source 
git-svn-id: trunk@56686 -
This commit is contained in:
juha 2017-12-10 16:02:25 +00:00
parent 2edba99094
commit 216afc7132
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lcl/interfaces/win32/win32callback.inc
View File

@ -1234,7 +1234,11 @@ procedure TWindowProcHelper.DoMsgChar(var WinResult: LResult);
begin begin
OrgCharCode := Word(WParam); OrgCharCode := Word(WParam);
// Process surrogate pairs later // Process surrogate pairs later
{$IF FPC_FULLVERSION>=30000}
if TCharacter.IsSurrogate(WideChar(OrgCharCode)) then if TCharacter.IsSurrogate(WideChar(OrgCharCode)) then
{$ELSE}
if False then
{$ENDIF}
WinProcess := True WinProcess := True
// first send a IntfUTF8KeyPress to the LCL // first send a IntfUTF8KeyPress to the LCL
// if the key was not handled send a CN_CHAR for AnsiChar<=#127 // if the key was not handled send a CN_CHAR for AnsiChar<=#127

5
lcl/interfaces/win32/win32int.pp
View File

@ -29,7 +29,10 @@ interface
} }
uses uses
Windows, // keep as first Windows, // keep as first
Classes, SysUtils, RtlConsts, ActiveX, MultiMon, CommCtrl, character, Classes, SysUtils, RtlConsts, ActiveX, MultiMon, CommCtrl,
{$IF FPC_FULLVERSION>=30000}
character,
{$ENDIF}
// LCL // LCL
LCLPlatformDef, InterfaceBase, LCLIntf, LclProc, LCLType, LMessages, LCLPlatformDef, InterfaceBase, LCLIntf, LclProc, LCLType, LMessages,
Controls, Buttons, Forms, Dialogs, GraphMath, GraphType, StdCtrls, Controls, Buttons, Forms, Dialogs, GraphMath, GraphType, StdCtrls,