diff --git a/components/lazcontrols/spinex.inc b/components/lazcontrols/spinex.inc
index 8ef28ff09a..dda6ec2f97 100644
--- a/components/lazcontrols/spinex.inc
+++ b/components/lazcontrols/spinex.inc
@@ -99,10 +99,10 @@ begin
   FInitialValue := GetValue;
 end;
 
-function TCustomFloatSpinEditEx.GetText: TCaption;
+function TCustomFloatSpinEditEx.RealGetText: TCaption;
 begin
   if HandleAllocated then
-    Result := inherited GetText
+    Result := inherited RealGetText
   else
     Result := ValueToStr(FValue);
 end;
diff --git a/components/lazcontrols/spinex.pp b/components/lazcontrols/spinex.pp
index 957eed3432..fc08f26020 100644
--- a/components/lazcontrols/spinex.pp
+++ b/components/lazcontrols/spinex.pp
@@ -118,7 +118,7 @@ type
   protected
     function GetBuddyClassType: TControlClass; override;
     procedure DoEnter; override;
-    function GetText: TCaption; override;
+    function RealGetText: TCaption; override;
     procedure Reset; override;
     procedure EditChange; override;
     procedure EditKeyDown(var Key: word; Shift: TShiftState); override;
diff --git a/lcl/editbtn.pas b/lcl/editbtn.pas
index efbf730e74..c229d291b5 100644
--- a/lcl/editbtn.pas
+++ b/lcl/editbtn.pas
@@ -568,7 +568,7 @@ type
     procedure ButtonClick; override;
     procedure EditDblClick; override;
     procedure SetDirectInput(AValue: Boolean); override;
-    procedure SetText(AValue: TCaption); override;
+    procedure RealSetText(const AValue: TCaption); override;
     procedure SetDateMask; virtual;
   public
     constructor Create(AOwner: TComponent); override;
@@ -1619,7 +1619,7 @@ begin
   SetDate(FDate);
 end;
 
-procedure TDateEdit.SetText(AValue: TCaption);
+procedure TDateEdit.RealSetText(const AValue: TCaption);
 begin
   if (not DirectInput) and not FUpdatingDate then
   begin
@@ -1629,9 +1629,9 @@ begin
       FDate := TextToDate(AValue, SysUtils.Date)
     else
       FDate := TextToDate(AValue, NullDate);
-    AValue := DateToText(FDate);
-  end;
-  inherited SetText(AValue);
+    inherited RealSetText(DateToText(FDate));
+  end else
+    inherited RealSetText(AValue);
 end;
 
 procedure TDateEdit.SetDateMask;
diff --git a/lcl/groupededit.pp b/lcl/groupededit.pp
index e62f3b5980..4a0c576aaa 100644
--- a/lcl/groupededit.pp
+++ b/lcl/groupededit.pp
@@ -188,8 +188,8 @@ type
     function GetBuddyClassType: TControlClass; virtual; abstract;
     class function GetControlClassDefaultSize: TSize; override;
     procedure SetDirectInput(AValue: Boolean); virtual;
-    function GetText: TCaption; virtual;
-    procedure SetText(AValue: TCaption); virtual;
+    function RealGetText: TCaption; override;
+    procedure RealSetText(const AValue: TCaption); override;
 
     function GetEditPopupMenu: TPopupMenu;
     function GetBuddyCaption: TCaption;
@@ -299,7 +299,7 @@ type
     property SelStart: Integer read GetSelStart write SetSelStart;
     property SelText: String read GetSelText write SetSelText;
     property TabStop: Boolean read GetTabStop write SetTabStop default True;
-    property Text: TCaption read GetText write SetText;
+    property Text;
     property TextHint: TTranslateString read GetTextHint write SetTextHint;
     property TextHintFontColor: TColor read GetTextHintFontColor write SetTextHintFontColor default clGrayText;
     property TextHintFontStyle: TFontStyles read GetTextHintFontStyle write SetTextHintFontStyle default [fsItalic];
@@ -622,7 +622,7 @@ begin
   Result := inherited TabStop;
 end;
 
-function TCustomAbstractGroupedEdit.GetText: TCaption;
+function TCustomAbstractGroupedEdit.RealGetText: TCaption;
 begin
   Result := FEdit.Text;
 end;
@@ -903,7 +903,7 @@ begin
   FEdit.PopupMenu := AValue;
 end;
 
-procedure TCustomAbstractGroupedEdit.SetText(AValue: TCaption);
+procedure TCustomAbstractGroupedEdit.RealSetText(const AValue: TCaption);
 begin
   FEdit.Text := AValue;
 end;