diff options
author | Graeme Geldenhuys <graeme@mastermaths.co.za> | 2013-04-17 10:31:14 +0100 |
---|---|---|
committer | Graeme Geldenhuys <graeme@mastermaths.co.za> | 2013-04-17 10:31:14 +0100 |
commit | 4f22f1677698d4114b76c1ddb4216f48892c8d9c (patch) | |
tree | ed687c468ca2650ffc7d8a6595a41fc96cfd9e26 /src/gui/fpg_editcombo.pas | |
parent | 45183e34632af471e95a798db578e44c5319c4ad (diff) | |
download | fpGUI-4f22f1677698d4114b76c1ddb4216f48892c8d9c.tar.xz |
Revert "Add common procedures in fpg_base for deadkeys"
This reverts commit ccfd4b2ae0a9dfae0d19ae7ba673118af70c75da.
Diffstat (limited to 'src/gui/fpg_editcombo.pas')
-rw-r--r-- | src/gui/fpg_editcombo.pas | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/src/gui/fpg_editcombo.pas b/src/gui/fpg_editcombo.pas index 9145d641..72b804ef 100644 --- a/src/gui/fpg_editcombo.pas +++ b/src/gui/fpg_editcombo.pas @@ -526,7 +526,34 @@ begin prevval := FText; if FDeadKeyChar> -1 then begin - AText:= UseDeadKey(AText, FDeadKeyChar); + 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; FDeadKeyChar:= -1; end; s := AText; @@ -590,8 +617,8 @@ var begin hasChanged := False; - if FDeadKeyChar = -1 then - FDeadKeyChar:= ReadDeadKey(keycode); + if (keycode= 58536) or (keycode= 58462) then + FDeadKeyChar:= keycode; if not Enabled then consumed := False |