You've already forked lazarus-ccr
fix draw text in RxDBLockupComboBox
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1125 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
@ -444,6 +444,9 @@ procedure TRxCustomDBLookupEdit.ShowPopUp;
|
|||||||
var
|
var
|
||||||
R:TPoint;
|
R:TPoint;
|
||||||
FValue:string;
|
FValue:string;
|
||||||
|
{$IFDEF LINUX}
|
||||||
|
TempF:TPopUpForm;
|
||||||
|
{$ENDIF}
|
||||||
begin
|
begin
|
||||||
|
|
||||||
if FLookupDataLink.Active then
|
if FLookupDataLink.Active then
|
||||||
@ -456,8 +459,18 @@ begin
|
|||||||
|
|
||||||
FRxPopUpForm:=ShowRxDBPopUpForm(Self, FLookupDataLink.DataSet, @OnClosePopup,
|
FRxPopUpForm:=ShowRxDBPopUpForm(Self, FLookupDataLink.DataSet, @OnClosePopup,
|
||||||
FPopUpFormOptions, FLookupDisplay, LookupDisplayIndex, 0 {ButtonWidth}, Font);
|
FPopUpFormOptions, FLookupDisplay, LookupDisplayIndex, 0 {ButtonWidth}, Font);
|
||||||
end
|
|
||||||
|
|
||||||
|
FRxPopUpForm:=ShowRxDBPopUpForm(Self, FLookupDataLink.DataSet, @OnClosePopup,
|
||||||
|
FPopUpFormOptions, FLookupDisplay, LookupDisplayIndex, 0 {ButtonWidth}, Font);
|
||||||
|
{$IFDEF LINUX}
|
||||||
|
TempF:=FRxPopUpForm;
|
||||||
|
if FRxPopUpForm.ShowModal = mrOk then
|
||||||
|
OnClosePopup(true);
|
||||||
|
TempF.Free;
|
||||||
|
FRxPopUpForm:=nil
|
||||||
|
{$ENDIF}
|
||||||
|
|
||||||
|
end
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
@ -211,7 +211,7 @@ begin
|
|||||||
Result.DataSet:=ADataSet;
|
Result.DataSet:=ADataSet;
|
||||||
Result.LookupDisplayIndex:=ALookupDisplayIndex;
|
Result.LookupDisplayIndex:=ALookupDisplayIndex;
|
||||||
|
|
||||||
AControl.Caption:='';
|
// AControl.Caption:='';
|
||||||
Result.WControl:=AControl;
|
Result.WControl:=AControl;
|
||||||
|
|
||||||
if Assigned(Font) then
|
if Assigned(Font) then
|
||||||
|
Reference in New Issue
Block a user