From 494b9b98a4b13fe05489828aab37b3e1f7fe4dc9 Mon Sep 17 00:00:00 2001
From: alexs75 <alexs75@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Wed, 15 Nov 2023 12:02:14 +0000
Subject: [PATCH] RxFPC:fix close form validator

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9029 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/rx/trunk/rx_sort_zeos/exsortzeos.pas         | 2 ++
 components/rx/trunk/rxcontrols/rxcloseformvalidator.pas | 2 +-
 components/rx/trunk/rxdb/rxdbgrid.pas                   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/rx/trunk/rx_sort_zeos/exsortzeos.pas b/components/rx/trunk/rx_sort_zeos/exsortzeos.pas
index d2de75343..9eaf2401a 100644
--- a/components/rx/trunk/rx_sort_zeos/exsortzeos.pas
+++ b/components/rx/trunk/rx_sort_zeos/exsortzeos.pas
@@ -79,6 +79,8 @@ begin
       TZAbstractRODataset(ADataSet).SortType:=stAscending
     else
       TZAbstractRODataset(ADataSet).SortType:=stDescending;}
+//    TZAbstractRODataset(ADataSet).SortedFields:='';
+//    TZAbstractRODataset(ADataSet).SortType:=stIgnored;
   end;
 end;
 
diff --git a/components/rx/trunk/rxcontrols/rxcloseformvalidator.pas b/components/rx/trunk/rxcontrols/rxcloseformvalidator.pas
index 394c2dd25..b4650a5b0 100644
--- a/components/rx/trunk/rxcontrols/rxcloseformvalidator.pas
+++ b/components/rx/trunk/rxcontrols/rxcloseformvalidator.pas
@@ -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);
diff --git a/components/rx/trunk/rxdb/rxdbgrid.pas b/components/rx/trunk/rxdb/rxdbgrid.pas
index 76e168cb6..7103671ca 100644
--- a/components/rx/trunk/rxdb/rxdbgrid.pas
+++ b/components/rx/trunk/rxdb/rxdbgrid.pas
@@ -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