paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-13 13:19:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

LCL, check for modified charcode after keypress, issue #11793

Browse Source 
git-svn-id: trunk@16091 -
This commit is contained in:
jesus 2008-08-17 18:20:33 +00:00
parent c2bc66238c
commit b53d0aeba0
1 changed files with 3 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

@ -249,6 +249,7 @@ var
NMHdr: PNMHdr absolute LParam; // used by WM_NOTIFY NMHdr: PNMHdr absolute LParam; // used by WM_NOTIFY
TmpSize: TSize; // used by WM_MEASUREITEM TmpSize: TSize; // used by WM_MEASUREITEM
Info: TComboboxInfo; Info: TComboboxInfo;
OrgCharCode: word; // used in WM_CHAR handling
function ShowHideTabPage(NotebookHandle: HWnd; Showing: boolean): integer; function ShowHideTabPage(NotebookHandle: HWnd; Showing: boolean): integer;
var var
@ -1255,6 +1256,7 @@ begin
CharCode := Word(Char(WideChar(WParam))) CharCode := Word(Char(WideChar(WParam)))
else else
CharCode := Word(WParam); CharCode := Word(WParam);
OrgCharCode := CharCode;
Result := 0; Result := 0;
Assert(False,Format('WM_CHAR KeyData= %d CharCode= %d ',[KeyData,CharCode])); Assert(False,Format('WM_CHAR KeyData= %d CharCode= %d ',[KeyData,CharCode]));
end; end;
@ -2403,7 +2405,7 @@ begin
// if charcode was modified by LCL, convert ansi char // if charcode was modified by LCL, convert ansi char
// to unicode char, if not change was made WParam has // to unicode char, if not change was made WParam has
// the right unicode char so just use it. // the right unicode char so just use it.
if (LMChar.Result=1) then if (LMChar.Result=1) or (OrgCharCode<>LMChar.CharCode) then
WParam := Word(WideChar(Char(LMChar.CharCode))); WParam := Word(WideChar(Char(LMChar.CharCode)));
end else end else
{$ENDIF} {$ENDIF}