diff options
author | Graeme Geldenhuys <graemeg@gmail.com> | 2013-04-18 12:16:30 +0100 |
---|---|---|
committer | Graeme Geldenhuys <graemeg@gmail.com> | 2013-04-18 12:16:30 +0100 |
commit | 37a30285f054d78fb1403e501a7d30ab01584ad0 (patch) | |
tree | d385dad0f54d257bae50732c098aa4af54471809 /src/gui/fpg_memo.pas | |
parent | cfa370eb864bb4e040321c47b5ee56476029cbf8 (diff) | |
parent | 75d8e848f6e599a477429c4ee95a95e2967b34a8 (diff) | |
download | fpGUI-37a30285f054d78fb1403e501a7d30ab01584ad0.tar.xz |
Merge branch 'hotfix-2' into develop
I found a problem with the deadkey support - it broke keyboard input under
Windows. The original deadkey input issue seems to have been X11 specific,
so should be fixed at widget level, but rather in the fpg_x11.pas unit.
Diffstat (limited to 'src/gui/fpg_memo.pas')
-rw-r--r-- | src/gui/fpg_memo.pas | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/gui/fpg_memo.pas b/src/gui/fpg_memo.pas index 2769e4d4..df16367b 100644 --- a/src/gui/fpg_memo.pas +++ b/src/gui/fpg_memo.pas @@ -98,7 +98,6 @@ type function GetSelectionText: TfpgString; procedure SetSelectionText(const AText: TfpgString); protected - FDeadKeyChar: integer; procedure HandleKeyChar(var AText: TfpgChar; var shiftstate: TShiftState; var consumed: boolean); override; procedure HandleKeyPress(var keycode: word; var shiftstate: TShiftState; var consumed: boolean); override; procedure HandleLMouseDown(x, y: integer; shiftstate: TShiftState); override; @@ -480,7 +479,6 @@ begin FReadOnly := False; FUpdateCount := 0; FBorderStyle := ebsDefault; - FDeadKeyChar := -1; FLines := TfpgMemoStrings.Create(self); FFirstLine := 0; @@ -1062,11 +1060,6 @@ var begin inherited; prevval := Text; - if FDeadKeyChar> -1 then - begin - AText:= UseDeadKey(AText, FDeadKeyChar); - FDeadKeyChar:= -1; - end; s := AText; if (not consumed) and (not ReadOnly) then @@ -1114,10 +1107,6 @@ begin fpgApplication.HideHint; Consumed := True; hasChanged := False; - - if FDeadKeyChar = -1 then - FDeadKeyChar:= ReadDeadKey(keycode); - case CheckClipBoardKey(keycode, shiftstate) of ckCopy: begin |