Merge branch 'hotfix-2' into develop

I found a problem with the deadkey support - it broke keyboard input under
Windows. The original deadkey input issue seems to have been X11 specific,
so should be fixed at widget level, but rather in the fpg_x11.pas unit.

1 files changed, 0 insertions, 10 deletions

diff --git a/src/gui/fpg_edit.pas b/src/gui/fpg_edit.pas
index 21e6895e..f164ef76 100644
--- a/src/gui/fpg_edit.pas
+++ b/src/gui/fpg_edit.pas
@@ -94,7 +94,6 @@ type
     FVisibleText: TfpgString;
     FVisSelStartPx: integer;
     FVisSelEndPx: integer;
-    FDeadKeyChar: integer;
     function    GetMarginAdjustment: integer; virtual;
     procedure   DrawSelection; virtual;
     procedure   DoOnChange; virtual;
@@ -756,11 +755,6 @@ var
   prevval: string;
 begin
   prevval   := Text;
-  if FDeadKeyChar> -1 then
-  begin
-    AText:= UseDeadKey(AText, FDeadKeyChar);
-    FDeadKeyChar:= -1;
-  end;
   s         := AText;
 
   if (not consumed) and (not ReadOnly) then
@@ -804,9 +798,6 @@ begin
   hasChanged := False;
   fpgApplication.HideHint;
 
-  if FDeadKeyChar = -1 then
-    FDeadKeyChar:= ReadDeadKey(keycode);
-
   Consumed := True;
   case CheckClipBoardKey(keycode, shiftstate) of
     ckCopy:
@@ -1079,7 +1070,6 @@ begin
   FPopupMenu          := nil;
   FDefaultPopupMenu   := nil;
   FOnChange           := nil;
-  FDeadKeyChar        := -1;
 end;
 
 destructor TfpgBaseEdit.Destroy;