diff --git a/lcl/dbctrls.pp b/lcl/dbctrls.pp index 0c750f818b..a776003f34 100644 --- a/lcl/dbctrls.pp +++ b/lcl/dbctrls.pp @@ -437,8 +437,8 @@ Type protected procedure DataChange(Sender: TObject); override; procedure DoSelectionChange(User: Boolean); override; + procedure InitializeWnd; override; procedure KeyDown(var Key: Word; Shift: TShiftState); override; - procedure Loaded; override; procedure UpdateData(Sender: TObject); override; public constructor Create(AOwner: TComponent); override; @@ -755,8 +755,8 @@ Type procedure SetNullValueKey(const AValue: TShortCut); procedure UpdateLookup; protected + procedure InitializeWnd; override; procedure KeyDown(var Key: Word; Shift: TShiftState); override; - procedure Loaded; override; procedure UpdateData(Sender: TObject); override; procedure DataChange(Sender: TObject); override; public diff --git a/lcl/include/dblookupcombobox.inc b/lcl/include/dblookupcombobox.inc index 19dcd863a1..25fa61496f 100644 --- a/lcl/include/dblookupcombobox.inc +++ b/lcl/include/dblookupcombobox.inc @@ -56,9 +56,9 @@ begin inherited KeyDown(Key, Shift); end; -procedure TDBLookupComboBox.Loaded; +procedure TDBLookupComboBox.InitializeWnd; begin - inherited Loaded; + inherited InitializeWnd; if FDataLink.Active then UpdateLookup; end; diff --git a/lcl/include/dblookuplistbox.inc b/lcl/include/dblookuplistbox.inc index c17cae8ab7..3a8bafb526 100644 --- a/lcl/include/dblookuplistbox.inc +++ b/lcl/include/dblookuplistbox.inc @@ -59,6 +59,13 @@ begin inherited DoSelectionChange(User); end; +procedure TDBLookupListBox.InitializeWnd; +begin + inherited InitializeWnd; + if FDataLink.Active then + UpdateLookup; +end; + procedure TDBLookupListBox.KeyDown(var Key: Word; Shift: TShiftState); begin if FLookup.HandleNullKey(Key, Shift) then @@ -71,13 +78,6 @@ begin inherited KeyDown(Key, Shift); end; -procedure TDBLookupListBox.Loaded; -begin - inherited Loaded; - if FDataLink.Active then - UpdateLookup; -end; - function TDBLookupListBox.GetKeyField: string; begin Result := FLookup.KeyField;