From c26553007573f4b460523c0672b22a80f9461172 Mon Sep 17 00:00:00 2001
From: Graeme Geldenhuys <graeme@mastermaths.co.za>
Date: Wed, 17 Apr 2013 10:31:17 +0100
Subject: Revert "Use dead key codes for special accentuated characters"

This reverts commit 5ee5b79db4825a3b2afa03dde72ddbe7e46b3c47.
---
 src/gui/fpg_editcombo.pas | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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

diff --git a/src/gui/fpg_editcombo.pas b/src/gui/fpg_editcombo.pas
index 72b804ef..311d452f 100644
--- a/src/gui/fpg_editcombo.pas
+++ b/src/gui/fpg_editcombo.pas
@@ -87,7 +87,7 @@ type
     FSelStart: integer;
     FSelOffset: integer;
     FCursorPos: integer;
-    FDeadKeyChar: integer;
+    FSpecialChar: integer;
     procedure   DoDropDown; override;
     function    GetText: string; virtual;
     function    HasText: boolean; virtual;
@@ -524,10 +524,10 @@ var
   i: integer;
 begin
   prevval   := FText;
-  if FDeadKeyChar> -1 then
+  if FSpecialChar> -1 then
   begin
-    case FDeadKeyChar of
-      keyDeadDiaeresis:
+    case FSpecialChar of
+      58536:
         case AText of
           'a':
             AText:= 'â';
@@ -540,7 +540,7 @@ begin
           'u':
             AText:= 'ü';
         end;
-      keyDeadCircumflex:
+      58462:
         case AText of
           'a':
             AText:= 'â';
@@ -554,7 +554,7 @@ begin
             AText:= 'û';
         end;
     end;
-    FDeadKeyChar:= -1;
+    FSpecialChar:= -1;
   end;
   s         := AText;
   consumed  := False;
@@ -618,7 +618,7 @@ begin
   hasChanged := False;
 
   if (keycode= 58536) or (keycode= 58462) then
-    FDeadKeyChar:= keycode;
+    FSpecialChar:= keycode;
 
   if not Enabled then
     consumed := False
@@ -919,7 +919,7 @@ begin
   FDrawOffset       := 0;
   FSelectedItem     := -1;       // to allow typing if list is empty
   FNewItem          := False;
-  FDeadKeyChar      := -1;
+  FSpecialChar      := -1;
 
   CalculateInternalButtonRect;
 end;
-- 
cgit v1.2.3-70-g09d2