pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

RxFPC:fix show text data in RxDBGrid

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5927 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2017-06-09 13:40:16 +00:00
parent 06fca537ad
commit cfc02a2279
2 changed files with 52 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
components/rx/trunk/demos/rxdbgrid/MergeCell/project1.lps
View File

@ -17,6 +17,7 @@
<Filename Value="unit1.pas"/> <Filename Value="unit1.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="Form1"/> <ComponentName Value="Form1"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="Unit1"/> <UnitName Value="Unit1"/>
<TopLine Value="43"/> <TopLine Value="43"/>
@ -26,11 +27,11 @@
<LoadedDesigner Value="True"/> <LoadedDesigner Value="True"/>
</Unit1> </Unit1>
<Unit2> <Unit2>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdb/rxdbgrid.pas"/> <Filename Value="../../../rxdb/rxdbgrid.pas"/>
<IsVisibleTab Value="True"/> <IsVisibleTab Value="True"/>
<EditorIndex Value="1"/> <EditorIndex Value="1"/>
<TopLine Value="4317"/> <TopLine Value="4344"/>
<CursorPos Y="4335"/> <CursorPos X="3" Y="4366"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Bookmarks Count="1"> <Bookmarks Count="1">
<Item0 X="7" Y="4331" ID="1"/> <Item0 X="7" Y="4331" ID="1"/>
@ -38,18 +39,18 @@
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit2> </Unit2>
<Unit3> <Unit3>
<Filename Value="/usr/local/share/lazarus/lcl/grids.pas"/> <Filename Value="../../../../../lcl/grids.pas"/>
<UnitName Value="Grids"/> <UnitName Value="Grids"/>
<EditorIndex Value="8"/> <EditorIndex Value="6"/>
<TopLine Value="4437"/> <TopLine Value="4437"/>
<CursorPos Y="4468"/> <CursorPos Y="4468"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit3> </Unit3>
<Unit4> <Unit4>
<Filename Value="/usr/local/share/lazarus/lcl/dbgrids.pas"/> <Filename Value="../../../../../lcl/dbgrids.pas"/>
<UnitName Value="DBGrids"/> <UnitName Value="DBGrids"/>
<EditorIndex Value="7"/> <EditorIndex Value="5"/>
<TopLine Value="1920"/> <TopLine Value="1920"/>
<CursorPos Y="1939"/> <CursorPos Y="1939"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
@ -70,16 +71,16 @@
<UsageCount Value="10"/> <UsageCount Value="10"/>
</Unit6> </Unit6>
<Unit7> <Unit7>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxtools/rxutils.pas"/> <Filename Value="../../../rxtools/rxutils.pas"/>
<EditorIndex Value="5"/> <EditorIndex Value="3"/>
<TopLine Value="64"/> <TopLine Value="64"/>
<CursorPos X="2" Y="91"/> <CursorPos X="2" Y="91"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit7> </Unit7>
<Unit8> <Unit8>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxtools/rxstrutils.pas"/> <Filename Value="../../../rxtools/rxstrutils.pas"/>
<EditorIndex Value="6"/> <EditorIndex Value="4"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit8> </Unit8>
@ -92,22 +93,20 @@
</Unit9> </Unit9>
<Unit10> <Unit10>
<Filename Value="../../../../install/source/fpcsrc/packages/fcl-db/src/base/db.pas"/> <Filename Value="../../../../install/source/fpcsrc/packages/fcl-db/src/base/db.pas"/>
<EditorIndex Value="3"/> <EditorIndex Value="-1"/>
<TopLine Value="1783"/> <TopLine Value="1783"/>
<CursorPos X="15" Y="1801"/> <CursorPos X="15" Y="1801"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit10> </Unit10>
<Unit11> <Unit11>
<Filename Value="../../../../install/source/fpcsrc/packages/fcl-db/src/base/datasource.inc"/> <Filename Value="../../../../install/source/fpcsrc/packages/fcl-db/src/base/datasource.inc"/>
<EditorIndex Value="4"/> <EditorIndex Value="-1"/>
<TopLine Value="146"/> <TopLine Value="146"/>
<CursorPos X="48" Y="149"/> <CursorPos X="48" Y="149"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit11> </Unit11>
<Unit12> <Unit12>
<Filename Value="/usr/local/share/lazarus/lcl/include/wincontrol.inc"/> <Filename Value="../../../../../lcl/include/wincontrol.inc"/>
<EditorIndex Value="2"/> <EditorIndex Value="2"/>
<TopLine Value="8050"/> <TopLine Value="8050"/>
<CursorPos Y="8080"/> <CursorPos Y="8080"/>
@ -115,7 +114,7 @@
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit12> </Unit12>
<Unit13> <Unit13>
<Filename Value="/usr/local/share/lazarus/lcl/lclproc.pas"/> <Filename Value="../../../../../lcl/lclproc.pas"/>
<UnitName Value="LCLProc"/> <UnitName Value="LCLProc"/>
<EditorIndex Value="-1"/> <EditorIndex Value="-1"/>
<TopLine Value="899"/> <TopLine Value="899"/>
@ -123,24 +122,24 @@
<UsageCount Value="10"/> <UsageCount Value="10"/>
</Unit13> </Unit13>
<Unit14> <Unit14>
<Filename Value="/usr/local/share/lazarus/lcl/include/control.inc"/> <Filename Value="../../../../../lcl/include/control.inc"/>
<EditorIndex Value="-1"/> <EditorIndex Value="-1"/>
<TopLine Value="3877"/> <TopLine Value="3877"/>
<CursorPos Y="3897"/> <CursorPos Y="3897"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
</Unit14> </Unit14>
<Unit15> <Unit15>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<EditorIndex Value="10"/> <EditorIndex Value="8"/>
<TopLine Value="1273"/> <TopLine Value="1273"/>
<CursorPos Y="1303"/> <CursorPos Y="1303"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit15> </Unit15>
<Unit16> <Unit16>
<Filename Value="/usr/local/share/lazarus/lcl/graphics.pp"/> <Filename Value="../../../../../lcl/graphics.pp"/>
<UnitName Value="Graphics"/> <UnitName Value="Graphics"/>
<EditorIndex Value="9"/> <EditorIndex Value="7"/>
<TopLine Value="1193"/> <TopLine Value="1193"/>
<CursorPos X="15" Y="1210"/> <CursorPos X="15" Y="1210"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
@ -149,123 +148,123 @@
</Units> </Units>
<JumpHistory Count="30" HistoryIndex="29"> <JumpHistory Count="30" HistoryIndex="29">
<Position1> <Position1>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1246" TopLine="1226"/> <Caret Line="1246" TopLine="1226"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1239" Column="119" TopLine="1226"/> <Caret Line="1239" Column="119" TopLine="1226"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1248" TopLine="1226"/> <Caret Line="1248" TopLine="1226"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1251" TopLine="1226"/> <Caret Line="1251" TopLine="1226"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1252" TopLine="1226"/> <Caret Line="1252" TopLine="1226"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1255" TopLine="1226"/> <Caret Line="1255" TopLine="1226"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1257" TopLine="1227"/> <Caret Line="1257" TopLine="1227"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1263" TopLine="1233"/> <Caret Line="1263" TopLine="1233"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1264" TopLine="1243"/> <Caret Line="1264" TopLine="1243"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1266" TopLine="1243"/> <Caret Line="1266" TopLine="1243"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1267" TopLine="1243"/> <Caret Line="1267" TopLine="1243"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1269" TopLine="1243"/> <Caret Line="1269" TopLine="1243"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1272" TopLine="1243"/> <Caret Line="1272" TopLine="1243"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1273" TopLine="1243"/> <Caret Line="1273" TopLine="1243"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1275" TopLine="1245"/> <Caret Line="1275" TopLine="1245"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1278" TopLine="1248"/> <Caret Line="1278" TopLine="1248"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1279" TopLine="1249"/> <Caret Line="1279" TopLine="1249"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1280" TopLine="1250"/> <Caret Line="1280" TopLine="1250"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1281" TopLine="1251"/> <Caret Line="1281" TopLine="1251"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1283" TopLine="1253"/> <Caret Line="1283" TopLine="1253"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1285" TopLine="1255"/> <Caret Line="1285" TopLine="1255"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1286" TopLine="1256"/> <Caret Line="1286" TopLine="1256"/>
</Position22> </Position22>
<Position23> <Position23>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1287" TopLine="1257"/> <Caret Line="1287" TopLine="1257"/>
</Position23> </Position23>
<Position24> <Position24>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1289" TopLine="1259"/> <Caret Line="1289" TopLine="1259"/>
</Position24> </Position24>
<Position25> <Position25>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1293" TopLine="1263"/> <Caret Line="1293" TopLine="1263"/>
</Position25> </Position25>
<Position26> <Position26>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1294" TopLine="1264"/> <Caret Line="1294" TopLine="1264"/>
</Position26> </Position26>
<Position27> <Position27>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1296" TopLine="1266"/> <Caret Line="1296" TopLine="1266"/>
</Position27> </Position27>
<Position28> <Position28>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1299" TopLine="1269"/> <Caret Line="1299" TopLine="1269"/>
</Position28> </Position28>
<Position29> <Position29>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1302" TopLine="1272"/> <Caret Line="1302" TopLine="1272"/>
</Position29> </Position29>
<Position30> <Position30>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/> <Filename Value="../../../../../lcl/include/canvas.inc"/>
<Caret Line="1303" TopLine="1273"/> <Caret Line="1303" TopLine="1273"/>
</Position30> </Position30>
</JumpHistory> </JumpHistory>

2
components/rx/trunk/rxdb/rxdbgrid.pas
View File

@ -4363,7 +4363,7 @@ begin
else else
S := ''; S := '';
S:='11'; // S:='11';
if (rdgWordWrap in FOptionsRx) and Assigned(C) and (C.WordWrap) then if (rdgWordWrap in FOptionsRx) and Assigned(C) and (C.WordWrap) then
WriteTextHeader(Canvas, aRect, S, C.Alignment) WriteTextHeader(Canvas, aRect, S, C.Alignment)