diff --git a/components/rx/trunk/docs/rxmemds.xml b/components/rx/trunk/docs/rxmemds.xml index 50830e472..c2995e09e 100644 --- a/components/rx/trunk/docs/rxmemds.xml +++ b/components/rx/trunk/docs/rxmemds.xml @@ -3,7 +3,8 @@ - TRxMemoryData - таблица в памяти. Является наследником от TDataSetTRxMemoryData - таблица в памяти. Является наследником от TDataSet + TRxMemoryData - таблица в памяти. Является наследником от TDataSetTRxMemoryData - таблица в памяти. Является наследником от TDataSet + diff --git a/components/rx/trunk/rxdb/rxdbgrid.pas b/components/rx/trunk/rxdb/rxdbgrid.pas index 3732c5947..f03228de8 100644 --- a/components/rx/trunk/rxdb/rxdbgrid.pas +++ b/components/rx/trunk/rxdb/rxdbgrid.pas @@ -31,7 +31,7 @@ {$I rx.inc} -unit rxdbgrid; +unit RxDBGrid; interface @@ -753,6 +753,7 @@ type FIsSelectedDefaultFont:boolean; FFooterOptions: TRxDBGridFooterOptions; + FBeforeSorting: TNotifyEvent; FOnCalcRowHeight: TRxDBGridCalcRowHeight; FSearchOptions: TRxDBGridSearchOptions; FSelectedFont: TFont; @@ -1046,6 +1047,7 @@ type property OnFiltred: TNotifyEvent read FOnFiltred write FOnFiltred; property OnSortChanged: TNotifyEvent read FOnSortChanged write FOnSortChanged; + property BeforeSorting: TNotifyEvent read FBeforeSorting write FBeforeSorting; property OnDataHintShow: TRxDBGridDataHintShowEvent read FOnDataHintShow write FOnDataHintShow; //from DBGrid @@ -5070,6 +5072,13 @@ begin end; end; + if Assigned(FBeforeSorting) then + begin + FSortingNow := True; + FBeforeSorting(Self); + FSortingNow := False; + end; + CollumnSortListUpdate; if Assigned(FSortEngine) then CollumnSortListApply; diff --git a/components/rx/trunk/rxnew.lpk b/components/rx/trunk/rxnew.lpk index 607b55e14..6d93f1a28 100644 --- a/components/rx/trunk/rxnew.lpk +++ b/components/rx/trunk/rxnew.lpk @@ -1,6 +1,6 @@ - + @@ -23,9 +23,9 @@ +translate to Lazarus by alexs in 2005 - 2020"/> - +