paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RxFPC:fix close form validator

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9029 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75 2023-11-15 12:02:14 +00:00
parent 11bd8c77ca
commit 380344d99e
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/rx/trunk/rx_sort_zeos/exsortzeos.pas
View File

@ -79,6 +79,8 @@ begin
TZAbstractRODataset(ADataSet).SortType:=stAscending
else
TZAbstractRODataset(ADataSet).SortType:=stDescending;}
// TZAbstractRODataset(ADataSet).SortedFields:='';
// TZAbstractRODataset(ADataSet).SortType:=stIgnored;
end;
end;

2
components/rx/trunk/rxcontrols/rxcloseformvalidator.pas
View File

@ -328,7 +328,7 @@ begin
for i:=0 to FItems.Count-1 do
begin
if FItems[i].Enabled and (FItems[i].FControl.Enabled) and (not FItems[i].CheckClose(F as TCustomForm)) then
if FItems[i].Enabled and Assigned(FItems[i].Control) and (FItems[i].FControl.Enabled) and (not FItems[i].CheckClose(F as TCustomForm)) then
begin
FItems[i].SetFocus;
Application.MessageBox(PChar(FItems[i].ErrorMessage), PChar(FErrorMsgCaption), MB_OK + MB_ICONERROR);

2
components/rx/trunk/rxdb/rxdbgrid.pas
View File

@ -5496,7 +5496,7 @@ var
CheckUp: boolean;
begin
inherited UTF8KeyPress(UTF8Key);
if ReadOnly then
if (rdgAllowQuickSearch in OptionsRx) and (ReadOnly or (Assigned(SelectedColumn) and SelectedColumn.ReadOnly)) then
begin
//0. Проверяем что это кнопка значащая, увеличиваем "строку поиска"
if Length(UTF8Key) = 1 then