RxFPC: RxDBGrid - code refactoring. thx LearnMagic

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6014 8e941d3f-bd1b-0410-a28a-d453659cc2b4

components/rx/trunk/demos/RxDBVerticalGrid/project1.lps

@@ -9,7 +9,7 @@
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="-1"/>
         <CursorPos Y="16"/>
-        <UsageCount Value="37"/>
+        <UsageCount Value="52"/>
       </Unit0>
       <Unit1>
         <Filename Value="unit1.pas"/>
@@ -18,9 +18,10 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
-        <TopLine Value="75"/>
-        <CursorPos X="5" Y="92"/>
-        <UsageCount Value="37"/>
+        <IsVisibleTab Value="True"/>
+        <TopLine Value="123"/>
+        <CursorPos X="86" Y="146"/>
+        <UsageCount Value="52"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit1>
@@ -29,14 +30,14 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="575"/>
         <CursorPos Y="585"/>
-        <UsageCount Value="19"/>
+        <UsageCount Value="18"/>
       </Unit2>
       <Unit3>
         <Filename Value="../../rxdb/rxdbgrid.pas"/>
         <EditorIndex Value="3"/>
         <TopLine Value="4122"/>
         <CursorPos Y="4148"/>
-        <UsageCount Value="18"/>
+        <UsageCount Value="25"/>
         <Loaded Value="True"/>
       </Unit3>
       <Unit4>
@@ -45,7 +46,7 @@
         <EditorIndex Value="4"/>
         <TopLine Value="985"/>
         <CursorPos X="15" Y="1001"/>
-        <UsageCount Value="15"/>
+        <UsageCount Value="22"/>
         <Loaded Value="True"/>
       </Unit4>
       <Unit5>
@@ -54,7 +55,7 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="3172"/>
         <CursorPos X="3" Y="3172"/>
-        <UsageCount Value="15"/>
+        <UsageCount Value="14"/>
       </Unit5>
       <Unit6>
         <Filename Value="../../../../lcl/controls.pp"/>
@@ -62,7 +63,7 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="1668"/>
         <CursorPos X="14" Y="1686"/>
-        <UsageCount Value="12"/>
+        <UsageCount Value="11"/>
       </Unit6>
       <Unit7>
         <Filename Value="../../../../lcl/graphics.pp"/>
@@ -70,14 +71,14 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="957"/>
         <CursorPos X="28" Y="985"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit7>
       <Unit8>
         <Filename Value="../../../../install/source/fpcsrc/packages/fcl-db/src/base/db.pas"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="1793"/>
         <CursorPos Y="1816"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit8>
       <Unit9>
         <Filename Value="../../rxdb/rxdbtimeedit.pas"/>
@@ -85,7 +86,7 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="25"/>
         <CursorPos X="24" Y="48"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit9>
       <Unit10>
         <Filename Value="../../../../lcl/dbctrls.pp"/>
@@ -93,7 +94,7 @@
         <EditorIndex Value="1"/>
         <TopLine Value="1042"/>
         <CursorPos X="15" Y="1070"/>
-        <UsageCount Value="11"/>
+        <UsageCount Value="18"/>
         <Loaded Value="True"/>
       </Unit10>
       <Unit11>
@@ -101,69 +102,69 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="373"/>
         <CursorPos X="16" Y="392"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit11>
       <Unit12>
         <Filename Value="../../../../install/source/fpcsrc/rtl/objpas/classes/classesh.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="72"/>
         <CursorPos X="30" Y="91"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit12>
       <Unit13>
         <Filename Value="../../../../install/source/fpcsrc/packages/fcl-db/src/base/datasource.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="136"/>
         <CursorPos Y="156"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit13>
       <Unit14>
         <Filename Value="../../../../install/source/fpcsrc/rtl/objpas/classes/collect.inc"/>
         <EditorIndex Value="-1"/>
         <CursorPos Y="25"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit14>
       <Unit15>
         <Filename Value="../../../../install/source/fpcsrc/rtl/inc/objpas.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="30"/>
         <CursorPos Y="52"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit15>
       <Unit16>
         <Filename Value="../../../../install/source/fpcsrc/rtl/inc/except.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="169"/>
         <CursorPos Y="200"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit16>
       <Unit17>
         <Filename Value="../../../../install/source/fpcsrc/rtl/x86_64/setjump.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="29"/>
         <CursorPos Y="60"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit17>
       <Unit18>
         <Filename Value="../../../../install/source/fpcsrc/rtl/objpas/classes/persist.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="46"/>
         <CursorPos X="3" Y="49"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit18>
       <Unit19>
         <Filename Value="../../../../install/source/fpcsrc/rtl/inc/astrings.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="161"/>
         <CursorPos Y="180"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit19>
       <Unit20>
         <Filename Value="../../../../install/source/fpcsrc/rtl/inc/objpash.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="187"/>
         <CursorPos X="23" Y="206"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit20>
       <Unit21>
         <Filename Value="../../registerrxdb.pas"/>
@@ -171,14 +172,14 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="65"/>
         <CursorPos X="48" Y="77"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit21>
       <Unit22>
         <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
         <EditorIndex Value="5"/>
-        <TopLine Value="1174"/>
-        <CursorPos X="9" Y="1194"/>
-        <UsageCount Value="18"/>
+        <TopLine Value="1289"/>
+        <CursorPos X="26" Y="1290"/>
+        <UsageCount Value="25"/>
         <Bookmarks Count="1">
           <Item0 X="38" Y="914" ID="1"/>
         </Bookmarks>
@@ -188,90 +189,90 @@
         <Filename Value="../../rx.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="23"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit23>
       <Unit24>
         <Filename Value="../../registerrx.pas"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="62" Y="9"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit24>
       <Unit25>
         <Filename Value="../../registerrxtools.pas"/>
         <UnitName Value="RegisterRxTools"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="37"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit25>
       <Unit26>
         <Filename Value="../../rxcontrols/rxvclutils.pas"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="77"/>
         <CursorPos Y="93"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit26>
       <Unit27>
         <Filename Value="../../rxcontrols/rxfduallst.pas"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="65"/>
         <CursorPos X="9" Y="84"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit27>
       <Unit28>
         <Filename Value="../../rxcontrols/rxtbrsetup.pas"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="74"/>
         <CursorPos X="9" Y="93"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit28>
       <Unit29>
         <Filename Value="../../rxcontrols/rxtoolbar.pas"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="262"/>
         <CursorPos X="36" Y="281"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit29>
       <Unit30>
         <Filename Value="../../rxcontrols/rxctrls.pas"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="805"/>
         <CursorPos X="35" Y="824"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit30>
       <Unit31>
         <Filename Value="../../rxcontrols/rxpickdate.pas"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="248"/>
         <CursorPos X="49" Y="267"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit31>
       <Unit32>
         <Filename Value="../../rxcontrols/rxswitch.pas"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="138"/>
         <CursorPos X="9" Y="157"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit32>
       <Unit33>
         <Filename Value="../../rxcontrols/rxdice.pas"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="19"/>
         <CursorPos X="57" Y="38"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit33>
       <Unit34>
         <Filename Value="../../rxcontrols/rxclock.pas"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="162"/>
         <CursorPos X="9" Y="181"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit34>
       <Unit35>
         <Filename Value="../../rxcontrols/rxspin.pas"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="226"/>
         <CursorPos X="6" Y="245"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit35>
       <Unit36>
         <Filename Value="../../rxcontrols/rxmdi.pas"/>
@@ -279,21 +280,21 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="146"/>
         <CursorPos X="13" Y="169"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit36>
       <Unit37>
         <Filename Value="../../rxdb/rxdbutils.pas"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="27"/>
         <CursorPos X="50" Y="39"/>
-        <UsageCount Value="12"/>
+        <UsageCount Value="11"/>
       </Unit37>
       <Unit38>
         <Filename Value="../../rxdb/rxpopupunit.pas"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="21"/>
         <CursorPos X="32" Y="40"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit38>
       <Unit39>
         <Filename Value="../../rxdb/rxdbctrls.pas"/>
@@ -301,16 +302,14 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="196"/>
         <CursorPos X="32" Y="215"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit39>
       <Unit40>
         <Filename Value="../../rxcontrols/rxlclutils.pas"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="6"/>
-        <TopLine Value="743"/>
-        <CursorPos X="111" Y="772"/>
-        <UsageCount Value="10"/>
-        <Loaded Value="True"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="753"/>
+        <CursorPos X="79" Y="778"/>
+        <UsageCount Value="9"/>
       </Unit40>
       <Unit41>
         <Filename Value="../../rxdb/rxdbgridexportpdf.pas"/>
@@ -318,14 +317,14 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="21"/>
         <CursorPos X="39" Y="40"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit41>
       <Unit42>
         <Filename Value="../../rxcontrols/rxlogin.pas"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="190"/>
         <CursorPos X="55" Y="209"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit42>
       <Unit43>
         <Filename Value="../../rxdbgrid_print/rxdbgridprintgrid.pas"/>
@@ -333,83 +332,83 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="20"/>
         <CursorPos X="53" Y="37"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit43>
       <Unit44>
         <Filename Value="../../../../install/source/fpcsrc/rtl/objpas/objpas.pp"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="8" Y="36"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit44>
       <Unit45>
         <Filename Value="../../../../lcl/menus.pp"/>
         <UnitName Value="Menus"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="11" Y="30"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit45>
       <Unit46>
         <Filename Value="../../../../lcl/include/control.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="1902"/>
         <CursorPos X="3" Y="1907"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit46>
       <Unit47>
         <Filename Value="../../../../install/source/fpcsrc/rtl/objpas/classes/reader.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="1703"/>
         <CursorPos Y="1738"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit47>
       <Unit48>
         <Filename Value="../../../../install/source/fpcsrc/rtl/objpas/typinfo.pp"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="1494"/>
         <CursorPos Y="1512"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit48>
       <Unit49>
         <Filename Value="../../../../lcl/include/popupmenu.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="56"/>
         <CursorPos Y="82"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit49>
       <Unit50>
         <Filename Value="/home/install/source/fpcsrc/packages/fcl-db/src/base/db.pas"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="76"/>
         <CursorPos X="37" Y="108"/>
-        <UsageCount Value="13"/>
+        <UsageCount Value="12"/>
       </Unit50>
       <Unit51>
         <Filename Value="/home/install/source/fpcsrc/packages/fcl-db/src/base/datasource.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="136"/>
         <CursorPos Y="156"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit51>
       <Unit52>
         <Filename Value="/home/install/source/fpcsrc/rtl/objpas/classes/lists.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="784"/>
         <CursorPos Y="803"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit52>
       <Unit53>
         <Filename Value="/home/install/source/fpcsrc/rtl/objpas/sysutils/dati.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="504"/>
         <CursorPos X="18" Y="516"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit53>
       <Unit54>
         <Filename Value="../../../../lcl/stdctrls.pp"/>
         <UnitName Value="StdCtrls"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="14" Y="18"/>
-        <UsageCount Value="11"/>
+        <UsageCount Value="10"/>
       </Unit54>
       <Unit55>
         <Filename Value="../../../../lcl/themes.pas"/>
@@ -417,14 +416,15 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="16"/>
         <CursorPos X="12" Y="42"/>
-        <UsageCount Value="11"/>
+        <UsageCount Value="10"/>
       </Unit55>
       <Unit56>
         <Filename Value="../../../../lcl/lcltype.pp"/>
         <UnitName Value="LCLType"/>
         <EditorIndex Value="-1"/>
-        <CursorPos X="13" Y="31"/>
-        <UsageCount Value="11"/>
+        <TopLine Value="226"/>
+        <CursorPos X="3" Y="245"/>
+        <UsageCount Value="10"/>
       </Unit56>
       <Unit57>
         <Filename Value="../../../../lcl/forms.pp"/>
@@ -432,19 +432,19 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="1801"/>
         <CursorPos X="3" Y="1820"/>
-        <UsageCount Value="9"/>
+        <UsageCount Value="8"/>
       </Unit57>
       <Unit58>
         <Filename Value="../../rxtools/rxdconst.pas"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="14" Y="32"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit58>
       <Unit59>
         <Filename Value="/home/install/source/fpcsrc/rtl/objpas/sysutils/diskh.inc"/>
         <EditorIndex Value="-1"/>
         <CursorPos X="10" Y="29"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit59>
       <Unit60>
         <Filename Value="../../../lazutils/fileutil.pas"/>
@@ -452,21 +452,21 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="250"/>
         <CursorPos X="14" Y="287"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit60>
       <Unit61>
         <Filename Value="../../../lazutils/fileutil.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="1076"/>
         <CursorPos X="3" Y="1078"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit61>
       <Unit62>
         <Filename Value="../../rxtools/rxstrutils.pas"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="50"/>
         <CursorPos X="16" Y="50"/>
-        <UsageCount Value="11"/>
+        <UsageCount Value="10"/>
       </Unit62>
       <Unit63>
         <Filename Value="../../../../lcl/interfaces/win32/win32wscontrols.pp"/>
@@ -474,35 +474,35 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="202"/>
         <CursorPos Y="217"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit63>
       <Unit64>
         <Filename Value="Z:/home/install/source/fpcsrc/packages/fcl-db/src/base/db.pas"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="906"/>
         <CursorPos X="27" Y="927"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit64>
       <Unit65>
         <Filename Value="Z:/home/install/source/fpcsrc/packages/fcl-db/src/base/fields.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="2966"/>
         <CursorPos X="3" Y="2972"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit65>
       <Unit66>
         <Filename Value="../../../../lcl/include/dbimage.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="27"/>
         <CursorPos X="3" Y="29"/>
-        <UsageCount Value="11"/>
+        <UsageCount Value="10"/>
       </Unit66>
       <Unit67>
         <Filename Value="../../../../lcl/include/picture.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="571"/>
         <CursorPos Y="578"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit67>
       <Unit68>
         <Filename Value="../../../../lcl/extctrls.pp"/>
@@ -510,7 +510,7 @@
         <EditorIndex Value="2"/>
         <TopLine Value="494"/>
         <CursorPos X="6" Y="504"/>
-        <UsageCount Value="11"/>
+        <UsageCount Value="18"/>
         <Loaded Value="True"/>
       </Unit68>
       <Unit69>
@@ -518,21 +518,21 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="168"/>
         <CursorPos Y="210"/>
-        <UsageCount Value="11"/>
+        <UsageCount Value="10"/>
       </Unit69>
       <Unit70>
         <Filename Value="/home/install/source/fpcsrc/rtl/objpas/classes/classesh.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="470"/>
         <CursorPos X="15" Y="489"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit70>
       <Unit71>
         <Filename Value="/home/install/source/fpcsrc/rtl/objpas/classes/collect.inc"/>
         <EditorIndex Value="-1"/>
         <TopLine Value="41"/>
         <CursorPos X="2" Y="44"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit71>
       <Unit72>
         <Filename Value="/home/install/source/fpcsrc/rtl/objpas/types.pp"/>
@@ -540,130 +540,122 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="313"/>
         <CursorPos X="10" Y="331"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="9"/>
       </Unit72>
     </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
+    <JumpHistory Count="28" HistoryIndex="27">
       <Position1>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="102" Column="54" TopLine="91"/>
+        <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
+        <Caret Line="293" Column="15" TopLine="272"/>
       </Position1>
       <Position2>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="104" Column="54" TopLine="93"/>
+        <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
+        <Caret Line="1168" Column="3" TopLine="1166"/>
       </Position2>
       <Position3>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="106" TopLine="92"/>
+        <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
+        <Caret Line="222" Column="15" TopLine="207"/>
       </Position3>
       <Position4>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="57" Column="15" TopLine="38"/>
+        <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
+        <Caret Line="189" Column="15" TopLine="172"/>
       </Position4>
       <Position5>
         <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
-        <Caret Line="1457" Column="21" TopLine="1439"/>
+        <Caret Line="903" Column="3" TopLine="897"/>
       </Position5>
       <Position6>
         <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
-        <Caret Line="302" TopLine="282"/>
+        <Caret Line="294" Column="15" TopLine="275"/>
       </Position6>
       <Position7>
         <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
-        <Caret Line="1372" Column="3" TopLine="1364"/>
+        <Caret Line="1173" Column="3" TopLine="1171"/>
       </Position7>
       <Position8>
         <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
-        <Caret Line="301" Column="15" TopLine="284"/>
+        <Caret Line="295" Column="31" TopLine="275"/>
       </Position8>
       <Position9>
         <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
-        <Caret Line="1308" Column="3" TopLine="1293"/>
+        <Caret Line="1188" Column="18" TopLine="1185"/>
       </Position9>
       <Position10>
         <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
-        <Caret Line="300" Column="15" TopLine="283"/>
+        <Caret Line="1185" Column="35" TopLine="1169"/>
       </Position10>
       <Position11>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="100" Column="5" TopLine="73"/>
+        <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
+        <Caret Line="314" Column="15" TopLine="295"/>
       </Position11>
       <Position12>
         <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
-        <Caret Line="345" Column="14" TopLine="327"/>
+        <Caret Line="291" Column="15" TopLine="272"/>
       </Position12>
       <Position13>
         <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
-        <Caret Line="316" Column="14" TopLine="298"/>
+        <Caret Line="1613" Column="19" TopLine="1594"/>
       </Position13>
       <Position14>
-        <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
-        <Caret Line="291" Column="15" TopLine="271"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="100" Column="5" TopLine="73"/>
       </Position14>
       <Position15>
-        <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
-        <Caret Line="1585" Column="3" TopLine="1581"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="101" Column="5" TopLine="74"/>
       </Position15>
       <Position16>
         <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
-        <Caret Line="293" Column="15" TopLine="272"/>
+        <Caret Line="1194" Column="9" TopLine="1190"/>
       </Position16>
       <Position17>
         <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
-        <Caret Line="1168" Column="3" TopLine="1166"/>
+        <Caret Line="301" Column="15" TopLine="277"/>
       </Position17>
       <Position18>
         <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
-        <Caret Line="222" Column="15" TopLine="207"/>
+        <Caret Line="1295" Column="39" TopLine="1277"/>
       </Position18>
       <Position19>
         <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
-        <Caret Line="189" Column="15" TopLine="172"/>
+        <Caret Line="1289" Column="42" TopLine="1279"/>
       </Position19>
       <Position20>
         <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
-        <Caret Line="903" Column="3" TopLine="897"/>
+        <Caret Line="1291" TopLine="1279"/>
       </Position20>
       <Position21>
         <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
-        <Caret Line="294" Column="15" TopLine="275"/>
+        <Caret Line="1302" Column="51" TopLine="1279"/>
       </Position21>
       <Position22>
         <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
-        <Caret Line="1173" Column="3" TopLine="1171"/>
+        <Caret Line="1295" TopLine="1279"/>
       </Position22>
       <Position23>
         <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
-        <Caret Line="295" Column="31" TopLine="275"/>
+        <Caret Line="1292" TopLine="1279"/>
       </Position23>
       <Position24>
         <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
-        <Caret Line="1188" Column="18" TopLine="1185"/>
+        <Caret Line="1312" TopLine="1291"/>
       </Position24>
       <Position25>
         <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
-        <Caret Line="1185" Column="35" TopLine="1169"/>
+        <Caret Line="752" TopLine="733"/>
       </Position25>
       <Position26>
         <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
-        <Caret Line="314" Column="15" TopLine="295"/>
+        <Caret Line="753" TopLine="733"/>
       </Position26>
       <Position27>
         <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
-        <Caret Line="291" Column="15" TopLine="272"/>
+        <Caret Line="756" TopLine="733"/>
       </Position27>
       <Position28>
         <Filename Value="../../rxdb/rxdbverticalgrid.pas"/>
-        <Caret Line="1613" Column="19" TopLine="1594"/>
+        <Caret Line="1290" Column="26" TopLine="1289"/>
       </Position28>
-      <Position29>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="100" Column="5" TopLine="73"/>
-      </Position29>
-      <Position30>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="101" Column="5" TopLine="74"/>
-      </Position30>
     </JumpHistory>
   </ProjectSession>
   <Debugging>

components/rx/trunk/demos/RxDBVerticalGrid/unit1.lfm

@@ -148,7 +148,7 @@ object Form1: TForm1
         FieldName = 'TB_CLEINT_MEMO'
         RowTitle.Caption = 'Описание'
         WordWrap = False
-        RowHeight = 27
+        RowHeight = 90
         ReadOnly = False
       end>
     TitleStyle = tsNative
@@ -166,7 +166,7 @@ object Form1: TForm1
       20
       20
       90
-      27
+      90
     )
   end
   object RxDBGrid1: TRxDBGrid

components/rx/trunk/demos/RxDBVerticalGrid/unit1.pas

@@ -106,6 +106,7 @@ begin
     2:RxDBVerticalGrid1.Rows[11].Alignment:=taCenter;
   end;
   RxDBVerticalGrid1.Rows[11].ShowBlobImagesAndMemo:=CheckBox2.Checked;
+  RxDBVerticalGrid1.Rows[12].ShowBlobImagesAndMemo:=CheckBox2.Checked;
 
 end;
 
@@ -142,7 +143,7 @@ end;
 
 begin
   rxData.Open;
-  AppendRecord(1, 1, '01000100101', 'JSC "BOOT"', 'Описание', 'test1@email.com', '5(555)-557-88-77', 'alexs', true, 'splash_logo.png');
+  AppendRecord(1, 1, '01000100101', 'JSC "BOOT"', 'Описание'#13'Строка 2'#13'Строка 3', 'test1@email.com', '5(555)-557-88-77', 'alexs', true, 'splash_logo.png');
   AppendRecord(2, 2, '02000100101', 'Wikimedia Foundation, Inc.', 'Описание', 'test2@email.com', '5(555)-557-88-77', 'boss', false, 'splash_logo.xpm');
   AppendRecord(3, 3, '03000100101', 'LLC Pilot ', 'Описание', 'test3@email.com', '5(555)-557-88-77', 'master', false, 'powered_by.png');
   AppendRecord(4, 4, '04000100101', 'Pilot, OOO', 'Описание', 'test4@email.com', '5(555)-557-88-77', 'onegin', false, 'folder.png');

components/rx/trunk/rxdb/rxdbgrid.pas

@@ -3219,14 +3219,15 @@ end;
 procedure TRxDBGrid.CalcTitle;
 var
   i, j: integer;
-  H, H1, W, {H2,} W1: integer;
+  H, H1, W, W1, FDefRowH: integer;
   rxCol, rxColNext: TRxColumn;
   rxTit, rxTitleNext: TRxColumnTitle;
   MLRec1, P: TMLCaptionItem;
   MLRec2: TMLCaptionItem;
   tmpCanvas: TCanvas;
-  //S: string;
 begin
+ FDefRowH:=GetDefaultRowHeight;
+
   { TODO -oalexs : need rewrite code - split to 2 step:
 1. make links between column
 2. calc title width for all linked column series }
@@ -3324,14 +3325,14 @@ begin
       begin
         if rxTit.Orientation in [toVertical270, toVertical90] then
           H1 := Max((tmpCanvas.TextWidth(Columns[i].Title.Caption) +
-            tmpCanvas.TextWidth('W')) div GetDefaultRowHeight, H)
+            tmpCanvas.TextWidth('W')) div FDefRowH, H)
         else
         begin
           if rxTit.CaptionLinesCount = 0 then
           begin
             H1 := Max((tmpCanvas.TextWidth(rxTit.Caption) + 2) div W + 1, H);
-            if H1 > WordCount(rxTit.Caption, [' ']) then
-              H1 := WordCount(rxTit.Caption, [' ']);
+            FWC:=WordCount(rxTit.Caption, [' ']);
+            if H1 > FWC then H1 := FWC;
           end
           else
           begin
@@ -3374,9 +3375,9 @@ begin
     end;
 
     if not (rdgDisableWordWrapTitles in OptionsRx) then
-      RowHeights[0] := GetDefaultRowHeight * H
+      RowHeights[0] := FDefRowH * H
     else
-      RowHeights[0] := GetDefaultRowHeight;
+      RowHeights[0] := FDefRowH;
 
     if rdgFilter in OptionsRx then
     begin
@@ -3386,7 +3387,7 @@ begin
       end
       else
       begin
-        RowHeights[0] := RowHeights[0] + GetDefaultRowHeight;
+        RowHeights[0] := RowHeights[0] + FDefRowH;
       end;
     end;
 

components/rx/trunk/rxdb/rxdbverticalgrid.pas

@@ -1270,17 +1270,7 @@ begin
           DrawCellBitmap(AGridRow, aRect, aState, AImageIndex);
       end
       else
-      if AGridRow.Field.dataType <> ftBlob then
-      begin
-          S := AGridRow.Field.DisplayText;
-          if (AGridRow.KeyList.Count > 0) and (AGridRow.PickList.Count > 0) then
-          begin
-            J := AGridRow.KeyList.IndexOf(S);
-            if (J >= 0) and (J < AGridRow.PickList.Count) then
-              S := AGridRow.PickList[j];
-          end;
-      end
-      else
+      if AGridRow.Field.dataType = ftBlob then
       begin
         if AGridRow.ShowBlobImagesAndMemo then
         begin
@@ -1294,6 +1284,29 @@ begin
           else
             S := UTF8UpperCase(GridDefValues.FBlobText);
         end;
+      end
+      else
+      if AGridRow.Field.dataType = ftMemo then
+      begin
+        if AGridRow.ShowBlobImagesAndMemo then
+          S := AGridRow.Field.AsString
+        else
+        begin
+          if AGridRow.Field.IsNull then
+            S := GridDefValues.FBlobText
+          else
+            S := UTF8UpperCase(GridDefValues.FBlobText);
+        end;
+      end
+      else
+      begin
+          S := AGridRow.Field.DisplayText;
+          if (AGridRow.KeyList.Count > 0) and (AGridRow.PickList.Count > 0) then
+          begin
+            J := AGridRow.KeyList.IndexOf(S);
+            if (J >= 0) and (J < AGridRow.PickList.Count) then
+              S := AGridRow.PickList[j];
+          end;
       end;
 
       WriteTextHeader(Canvas, aRect, S, AGridRow.Alignment);