diff options
author | Graeme Geldenhuys <graeme@mastermaths.co.za> | 2013-04-17 10:31:17 +0100 |
---|---|---|
committer | Graeme Geldenhuys <graeme@mastermaths.co.za> | 2013-04-17 10:31:17 +0100 |
commit | 4bb0fed12993ab26e6e4a61e481f8e405551c92e (patch) | |
tree | f4230c24b560d092f1c0d710698f3aa9201f52a4 /src/gui/fpg_memo.pas | |
parent | 4f22f1677698d4114b76c1ddb4216f48892c8d9c (diff) | |
download | fpGUI-4bb0fed12993ab26e6e4a61e481f8e405551c92e.tar.xz |
Revert "Use dead key codes for special accentuated characters"
This reverts commit 5ee5b79db4825a3b2afa03dde72ddbe7e46b3c47.
Diffstat (limited to 'src/gui/fpg_memo.pas')
-rw-r--r-- | src/gui/fpg_memo.pas | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/fpg_memo.pas b/src/gui/fpg_memo.pas index c0b227ae..71bcee56 100644 --- a/src/gui/fpg_memo.pas +++ b/src/gui/fpg_memo.pas @@ -98,7 +98,7 @@ type function GetSelectionText: TfpgString; procedure SetSelectionText(const AText: TfpgString); protected - FDeadKeyChar: integer; + FSpecialChar: 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 +480,7 @@ begin FReadOnly := False; FUpdateCount := 0; FBorderStyle := ebsDefault; - FDeadKeyChar := -1; + FSpecialChar := -1; FLines := TfpgMemoStrings.Create(self); FFirstLine := 0; @@ -1062,10 +1062,10 @@ var begin inherited; prevval := Text; - if FDeadKeyChar> -1 then + if FSpecialChar> -1 then begin - case FDeadKeyChar of - keyDeadDiaeresis: + case FSpecialChar of + 58536: case AText of 'a': AText:= 'â'; @@ -1078,7 +1078,7 @@ begin 'u': AText:= 'ü'; end; - keyDeadCircumflex: + 58462: case AText of 'a': AText:= 'â'; @@ -1092,7 +1092,7 @@ begin AText:= 'û'; end; end; - FDeadKeyChar:= -1; + FSpecialChar:= -1; end; s := AText; @@ -1143,7 +1143,7 @@ begin hasChanged := False; if (keycode= 58536) or (keycode= 58462) then - FDeadKeyChar:= keycode; + FSpecialChar:= keycode; case CheckClipBoardKey(keycode, shiftstate) of ckCopy: |