diff --git a/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi b/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi
index 31ed17619..a4974dad3 100644
--- a/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi
+++ b/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.lpi
@@ -71,8 +71,8 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="RxDBGridMainUnit"/>
         <IsVisibleTab Value="True"/>
-        <TopLine Value="241"/>
-        <CursorPos X="29" Y="263"/>
+        <TopLine Value="202"/>
+        <CursorPos Y="225"/>
         <UsageCount Value="103"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -98,12 +98,12 @@
       <Unit5>
         <Filename Value="../../rxdbgrid.pas"/>
         <EditorIndex Value="1"/>
-        <TopLine Value="4051"/>
-        <CursorPos X="135" Y="4080"/>
+        <TopLine Value="867"/>
+        <CursorPos Y="891"/>
         <UsageCount Value="18"/>
         <Bookmarks Count="2">
-          <Item0 Y="2573" ID="2"/>
-          <Item1 Y="3776" ID="1"/>
+          <Item0 Y="2575" ID="2"/>
+          <Item1 Y="3778" ID="1"/>
         </Bookmarks>
         <Loaded Value="True"/>
       </Unit5>
@@ -433,10 +433,11 @@
       <Unit58>
         <Filename Value="../../../../lcl/dbgrids.pas"/>
         <UnitName Value="DBGrids"/>
-        <EditorIndex Value="-1"/>
-        <TopLine Value="213"/>
-        <CursorPos X="3" Y="216"/>
+        <EditorIndex Value="2"/>
+        <TopLine Value="510"/>
+        <CursorPos Y="546"/>
         <UsageCount Value="19"/>
+        <Loaded Value="True"/>
       </Unit58>
       <Unit59>
         <Filename Value="../../../../lcl/grids.pas"/>
@@ -806,7 +807,7 @@
         <UsageCount Value="10"/>
       </Unit116>
     </Units>
-    <JumpHistory Count="3" HistoryIndex="2">
+    <JumpHistory Count="7" HistoryIndex="6">
       <Position1>
         <Filename Value="../../rxdbgrid.pas"/>
         <Caret Line="518" Column="3" TopLine="441"/>
@@ -819,6 +820,22 @@
         <Filename Value="rxdbgridmainunit.pas"/>
         <Caret Line="274" Column="3" TopLine="242"/>
       </Position3>
+      <Position4>
+        <Filename Value="rxdbgridmainunit.pas"/>
+        <Caret Line="225" Column="26" TopLine="202"/>
+      </Position4>
+      <Position5>
+        <Filename Value="../../rxdbgrid.pas"/>
+        <Caret Line="846" Column="14" TopLine="519"/>
+      </Position5>
+      <Position6>
+        <Filename Value="../../../../lcl/dbgrids.pas"/>
+        <Caret Line="283" Column="3" TopLine="262"/>
+      </Position6>
+      <Position7>
+        <Filename Value="rxdbgridmainunit.pas"/>
+        <Caret Line="225" Column="26" TopLine="202"/>
+      </Position7>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.res b/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.res
index d75090b2d..35e6104e0 100644
Binary files a/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.res and b/components/rx/trunk/Demos/RxDBGrid/RxDBGridDemo.res differ
diff --git a/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.lfm b/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.lfm
index a2694a09e..d01aae4a2 100644
--- a/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.lfm
+++ b/components/rx/trunk/Demos/RxDBGrid/rxdbgridmainunit.lfm
@@ -5,18 +5,19 @@ object RxDBGridMainForm: TRxDBGridMainForm
   Width = 1151
   ActiveControl = Panel1
   Caption = 'RxDBGrid Demo'
-  ClientHeight = 692
+  ClientHeight = 693
   ClientWidth = 1151
   Menu = MainMenu1
   OnCreate = FormCreate
   SessionProperties = 'RxDBGridExportSpreadSheet1.FileName;RxDBGridExportSpreadSheet1.OpenAfterExport;RxDBGridExportSpreadSheet1.Options;RxDBGridExportSpreadSheet1.PageName;RxDBGridPrint1.Options;RxDBGridPrint1.Orientation;RxDBGridPrint1.PageMargin;RxDBGridPrint1.ReportTitle;RxDBGridPrint1.ShowColumnHeaderOnAllPage'
   ShowHint = True
-  LCLVersion = '1.5'
+  LCLVersion = '1.7'
   object RxDBGrid1: TRxDBGrid
     Left = 0
-    Height = 620
-    Top = 72
+    Height = 623
+    Top = 70
     Width = 1151
+    ColumnDefValues.BlobText = '(примечание)'
     TitleButtons = True
     AutoSort = True
     OnGetCellProps = RxDBGrid1GetCellProps
@@ -324,12 +325,12 @@ object RxDBGridMainForm: TRxDBGridMainForm
   end
   object Panel1: TPanel
     Left = 0
-    Height = 72
+    Height = 70
     Top = 0
     Width = 1151
     Align = alTop
     AutoSize = True
-    ClientHeight = 72
+    ClientHeight = 70
     ClientWidth = 1151
     TabOrder = 1
     object Label1: TLabel
@@ -337,7 +338,7 @@ object RxDBGridMainForm: TRxDBGridMainForm
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = Panel1
       Left = 270
-      Height = 21
+      Height = 20
       Top = 7
       Width = 36
       BorderSpacing.Around = 6
@@ -348,7 +349,7 @@ object RxDBGridMainForm: TRxDBGridMainForm
       AnchorSideLeft.Control = Panel1
       AnchorSideTop.Control = Panel1
       Left = 7
-      Height = 33
+      Height = 32
       Top = 7
       Width = 87
       Action = actCalcTotal
@@ -361,7 +362,7 @@ object RxDBGridMainForm: TRxDBGridMainForm
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = Panel1
       Left = 100
-      Height = 33
+      Height = 32
       Top = 7
       Width = 164
       Action = actOptimizeColumnsWidthAll
@@ -375,10 +376,10 @@ object RxDBGridMainForm: TRxDBGridMainForm
       AnchorSideTop.Control = CheckBox2
       AnchorSideTop.Side = asrBottom
       Left = 499
-      Height = 25
+      Height = 24
       Hint = 'Use filter line'
-      Top = 38
-      Width = 83
+      Top = 37
+      Width = 84
       BorderSpacing.Left = 6
       Caption = 'Use filter'
       OnChange = CheckBox1Change
@@ -389,8 +390,8 @@ object RxDBGridMainForm: TRxDBGridMainForm
       AnchorSideTop.Control = Label1
       AnchorSideTop.Side = asrBottom
       Left = 276
-      Height = 31
-      Top = 34
+      Height = 30
+      Top = 33
       Width = 217
       BorderSpacing.Around = 6
       ItemHeight = 0
@@ -409,10 +410,10 @@ object RxDBGridMainForm: TRxDBGridMainForm
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = Panel1
       Left = 499
-      Height = 25
+      Height = 24
       Hint = 'Auto fill column width'
       Top = 7
-      Width = 132
+      Width = 133
       BorderSpacing.Around = 6
       Caption = 'Auto fill columns'
       OnChange = CheckBox2Change
@@ -422,8 +423,8 @@ object RxDBGridMainForm: TRxDBGridMainForm
       AnchorSideLeft.Control = CheckBox2
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = Panel1
-      Left = 637
-      Height = 25
+      Left = 638
+      Height = 24
       Top = 7
       Width = 120
       BorderSpacing.Around = 6
@@ -438,9 +439,9 @@ object RxDBGridMainForm: TRxDBGridMainForm
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = CheckBox3
       AnchorSideTop.Side = asrBottom
-      Left = 637
-      Height = 25
-      Top = 38
+      Left = 638
+      Height = 24
+      Top = 37
       Width = 116
       BorderSpacing.Around = 6
       Caption = 'Show headers'
@@ -453,8 +454,8 @@ object RxDBGridMainForm: TRxDBGridMainForm
       AnchorSideLeft.Control = CheckBox3
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = Panel1
-      Left = 763
-      Height = 25
+      Left = 764
+      Height = 24
       Top = 7
       Width = 95
       BorderSpacing.Around = 6
diff --git a/components/rx/trunk/rxdbgrid.pas b/components/rx/trunk/rxdbgrid.pas
index 48d63d6c8..4d5bc5feb 100644
--- a/components/rx/trunk/rxdbgrid.pas
+++ b/components/rx/trunk/rxdbgrid.pas
@@ -886,6 +886,8 @@ type
     property OnMouseDown;
     property OnMouseMove;
     property OnMouseUp;
+    property OnMouseEnter;
+    property OnMouseLeave;
     property OnMouseWheel;
     property OnMouseWheelDown;
     property OnMouseWheelUp;