From ccfd4b2ae0a9dfae0d19ae7ba673118af70c75da Mon Sep 17 00:00:00 2001
From: Jean-Marc Levecque <jean-marc.levecque@jmlesite.fr>
Date: Wed, 6 Mar 2013 14:11:29 +0100
Subject: Add common procedures in fpg_base for deadkeys

---
 src/gui/fpg_editcombo.pas | 33 +++------------------------------
 1 file changed, 3 insertions(+), 30 deletions(-)

(limited to 'src/gui/fpg_editcombo.pas')

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
-- 
cgit v1.2.3-70-g09d2