From dab2caa6c50464ee0f7c046dc1494fa359561b5c Mon Sep 17 00:00:00 2001
From: bart <9132501-flyingsheep@users.noreply.gitlab.com>
Date: Sat, 25 Jul 2015 21:17:53 +0000
Subject: [PATCH] EditButton: fix wrong value of TTimeEdit.Time in
 TTimeEdit.OnExit (Issue #0028434).

git-svn-id: trunk@49570 -
---
 lcl/editbtn.pas | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/lcl/editbtn.pas b/lcl/editbtn.pas
index dfebc2df7e..cc429edf12 100644
--- a/lcl/editbtn.pas
+++ b/lcl/editbtn.pas
@@ -887,8 +887,7 @@ type
       function GetDefaultGlyphName: String; override;
       procedure ButtonClick; override;
       procedure EditDblClick; override;
-      procedure EditExit; override;
-      procedure EditKeyDown(var Key: word; Shift: TShiftState); override;
+      procedure EditEditingDone; override;
     public
       constructor Create(AOwner: TComponent); override;
       property Time: TDateTime read GetTime write SetTime;
@@ -3043,18 +3042,13 @@ begin
   OpenTimePopup;
 end;
 
-procedure TTimeEdit.EditExit;
+
+procedure TTimeEdit.EditEditingDone;
 begin
-  inherited EditExit;
   ParseInput;
+  inherited EditEditingDone;
 end;
 
-procedure TTimeEdit.EditKeyDown(var Key: word; Shift: TShiftState);
-begin
-  if Key = VK_RETURN then
-    ParseInput;
-  inherited EditKeyDown(Key, Shift);
-end;
 
 constructor TTimeEdit.Create(AOwner: TComponent);
 begin