1. TRxDBLookupCombo - fix fired OnClosePopup event

2. TRxDBGrid - fix show filter in table dropdown box in Windows XP



git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2702 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2013-03-14 14:29:55 +00:00
parent a567920d3d
commit 1edb9a7a9c
3 changed files with 31 additions and 28 deletions

View File

@ -252,13 +252,11 @@ begin
Result.DataSet:=ADataSet;
Result.LookupDisplayIndex:=ALookupDisplayIndex;
// AControl.Caption:='';
Result.WControl:=AControl;
if Assigned(Font) then
begin
Result.FGrid.Font.Assign(Font);
// Result.Font.Assign(Font);
end;
{$IFDEF LINUX}
@ -299,7 +297,7 @@ end;
procedure TPopUpForm.FormClose(Sender: TObject; var CloseAction: TCloseAction);
begin
CloseAction:=caFree;
if Assigned(FOnPopUpCloseEvent) then
if (ModalResult <> mrOk) and Assigned(FOnPopUpCloseEvent) then
FOnPopUpCloseEvent(FFindResult);
end;
@ -321,7 +319,7 @@ end;
procedure TPopUpForm.Deactivate;
begin
inherited Deactivate;
if Assigned(FOnPopUpCloseEvent) then
if (ModalResult = mrOk) and Assigned(FOnPopUpCloseEvent) then
FOnPopUpCloseEvent(FFindResult);
Close;
end;