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