From 48445d706a8cf174883a7f3e11452b6f256e0d64 Mon Sep 17 00:00:00 2001
From: alexs75 <alexs75@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Tue, 24 Mar 2020 13:25:48 +0000
Subject: [PATCH] RxFPC:RxDBGrid - add new event BeforeSorting

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7341 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/rx/trunk/docs/rxmemds.xml  |  3 ++-
 components/rx/trunk/rxdb/rxdbgrid.pas | 11 ++++++++++-
 components/rx/trunk/rxnew.lpk         |  6 +++---
 3 files changed, 15 insertions(+), 5 deletions(-)

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 @@
 <package name="rxnew">
 
     <module name="rxmemds">
-      <element name="TRxMemoryData"><short>TRxMemoryData - таблица в памяти. Является наследником от TDataSet</short><descr>TRxMemoryData - таблица в памяти. Является наследником от TDataSet</descr>
+      <element name="TRxMemoryData"><short>TRxMemoryData - таблица в памяти. Является наследником от TDataSet</short><descr>TRxMemoryData - таблица в памяти. Является наследником от TDataSet
+</descr>
       </element>
       <element name="TRxMemoryData.Create"/>
       <element name="TRxMemoryData.Destroy"/>
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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <Package Version="4">
+  <Package Version="5">
     <PathDelim Value="\"/>
     <Name Value="rxnew"/>
     <Type Value="RunAndDesignTime"/>
@@ -23,9 +23,9 @@
     </CompilerOptions>
     <Description Value="Delphi VCL Extensions (RX) 
 Copyright (c) 1998 Master-Bank
-translate to Lazarus by alexs in 2005 - 2018"/>
+translate to Lazarus by alexs in 2005 - 2020"/>
     <License Value="LGPL"/>
-    <Version Major="3" Minor="3" Release="1" Build="220"/>
+    <Version Major="3" Minor="3" Release="2" Build="222"/>
     <Files Count="70">
       <Item1>
         <Filename Value="registerrx.pas"/>