diff options
author | Jean-Marc Levecque <jean-marc.levecque@jmlesite.fr> | 2013-03-06 14:11:29 +0100 |
---|---|---|
committer | Graeme Geldenhuys <graemeg@gmail.com> | 2013-03-22 16:29:58 +0000 |
commit | ccfd4b2ae0a9dfae0d19ae7ba673118af70c75da (patch) | |
tree | 9e9c310c4a04170bd66b4e2d47a575359cb96dcc /src/gui/fpg_editcombo.pas | |
parent | 5ee5b79db4825a3b2afa03dde72ddbe7e46b3c47 (diff) | |
download | fpGUI-ccfd4b2ae0a9dfae0d19ae7ba673118af70c75da.tar.xz |
Add common procedures in fpg_base for deadkeys
Diffstat (limited to 'src/gui/fpg_editcombo.pas')
-rw-r--r-- | src/gui/fpg_editcombo.pas | 33 |
1 files changed, 3 insertions, 30 deletions
diff --git a/src/gui/fpg_editcombo.pas b/src/gui/fpg_editcombo.pas index 72b804ef..9145d641 100644 --- a/src/gui/fpg_editcombo.pas +++ b/src/gui/fpg_editcombo.pas @@ -526,34 +526,7 @@ begin prevval := FText; if FDeadKeyChar> -1 then begin - case FDeadKeyChar of - keyDeadDiaeresis: - case AText of - 'a': - AText:= 'â'; - 'e': - AText:= 'ë'; - 'i': - AText:= 'ï'; - 'o': - AText:= 'ö'; - 'u': - AText:= 'ü'; - end; - keyDeadCircumflex: - case AText of - 'a': - AText:= 'â'; - 'e': - AText:= 'ê'; - 'i': - AText:= 'î'; - 'o': - AText:= 'ô'; - 'u': - AText:= 'û'; - end; - end; + AText:= UseDeadKey(AText, FDeadKeyChar); FDeadKeyChar:= -1; end; s := AText; @@ -617,8 +590,8 @@ var begin hasChanged := False; - if (keycode= 58536) or (keycode= 58462) then - FDeadKeyChar:= keycode; + if FDeadKeyChar = -1 then + FDeadKeyChar:= ReadDeadKey(keycode); if not Enabled then consumed := False |