From cd836a393bca9c57e71fd350356d6fa90720e9dd Mon Sep 17 00:00:00 2001 From: alexs75 Date: Thu, 14 Jan 2016 12:04:08 +0000 Subject: [PATCH] RxLazReport controls - fix TlrRxDBLookupComboBox.Text property git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4422 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/rx/trunk/Demos/ToolPanel/unit1.pas | 2 +- components/rx/trunk/LazReport/lrrxcontrols.pas | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/components/rx/trunk/Demos/ToolPanel/unit1.pas b/components/rx/trunk/Demos/ToolPanel/unit1.pas index 939ca0ff5..b7904fc10 100644 --- a/components/rx/trunk/Demos/ToolPanel/unit1.pas +++ b/components/rx/trunk/Demos/ToolPanel/unit1.pas @@ -73,7 +73,7 @@ end; procedure TMainForm.actCustomExecute(Sender: TObject); begin - ToolPanel1.Customize(0); + ToolPanel1.Customize(0); ToolPanel1.:=; end; diff --git a/components/rx/trunk/LazReport/lrrxcontrols.pas b/components/rx/trunk/LazReport/lrrxcontrols.pas index 24a85da2c..19266af7f 100644 --- a/components/rx/trunk/LazReport/lrrxcontrols.pas +++ b/components/rx/trunk/LazReport/lrrxcontrols.pas @@ -20,12 +20,12 @@ type function GetKeyField: string; function GetListField: string; function GetListSource: string; - function GetText: Variant; + function GetText: string; procedure SetKeyField(AValue: string); procedure SetListField(AValue: string); procedure SetListSource(AValue: string); procedure RxDBLookupComboBox1CloseUp(Sender: TObject; SearchResult:boolean); - procedure SetText(AValue: Variant); + procedure SetText(AValue: string); protected procedure PaintDesignControl; override; function CreateControl:TControl;override; @@ -42,7 +42,7 @@ type property ListSource:string read GetListSource write SetListSource; property Color; property Enabled; - property Text:Variant read GetText write SetText; + property Text:string read GetText write SetText; property OnClick; end; @@ -160,9 +160,9 @@ begin Result:=FListSource; end; -function TlrRxDBLookupComboBox.GetText: Variant; +function TlrRxDBLookupComboBox.GetText: string; begin - Result:=TRxDBLookupCombo(FControl).KeyValue; + Result:=TRxDBLookupCombo(FControl).Value; end; procedure TlrRxDBLookupComboBox.SetKeyField(AValue: string); @@ -201,9 +201,9 @@ begin } end; -procedure TlrRxDBLookupComboBox.SetText(AValue: Variant); +procedure TlrRxDBLookupComboBox.SetText(AValue: string); begin - TRxDBLookupCombo(FControl).KeyValue:=AValue; + TRxDBLookupCombo(FControl).Value:=AValue; end; procedure TlrRxDBLookupComboBox.PaintDesignControl;