diff options
| author | Graeme Geldenhuys <graeme@mastermaths.co.za> | 2013-04-17 11:13:23 +0100 |
|---|---|---|
| committer | Graeme Geldenhuys <graeme@mastermaths.co.za> | 2013-04-17 11:13:23 +0100 |
| commit | c45010b6370b50f8e6192ddb7dc3d7762c8c29f7 (patch) | |
| tree | 2009f748b797c6effebebb8ac3ac0f114b3a1b9f /src/gui/fpg_memo.pas | |
| parent | 45183e34632af471e95a798db578e44c5319c4ad (diff) | |
| parent | 75d8e848f6e599a477429c4ee95a95e2967b34a8 (diff) | |
| download | fpGUI-c45010b6370b50f8e6192ddb7dc3d7762c8c29f7.tar.xz | |
Merge branch 'hotfix-2'
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 |