RxDBGrid - fix work lockupcombo cell editor

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2526 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75 2012-09-20 14:02:20 +00:00
parent 28e82d44ad
commit 49e82e3e66
4 changed files with 174 additions and 122 deletions

View File

@ -54,7 +54,7 @@
<MinVersion Major="1" Release="18" Build="56" Valid="True"/>
</Item4>
</RequiredPackages>
<Units Count="76">
<Units Count="77">
<Unit0>
<Filename Value="RxDBGridDemo.lpr"/>
<IsPartOfProject Value="True"/>
@ -62,7 +62,7 @@
<WindowIndex Value="0"/>
<TopLine Value="1"/>
<CursorPos X="9" Y="16"/>
<UsageCount Value="60"/>
<UsageCount Value="65"/>
</Unit0>
<Unit1>
<Filename Value="rxdbgridmainunit.pas"/>
@ -75,7 +75,7 @@
<WindowIndex Value="0"/>
<TopLine Value="1"/>
<CursorPos X="21" Y="18"/>
<UsageCount Value="60"/>
<UsageCount Value="65"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
</Unit1>
@ -84,27 +84,27 @@
<UnitName Value="db"/>
<TopLine Value="1112"/>
<CursorPos X="17" Y="1116"/>
<UsageCount Value="8"/>
<UsageCount Value="7"/>
</Unit2>
<Unit3>
<Filename Value="../../../fpcsrc/fcl/db/dataset.inc"/>
<TopLine Value="1134"/>
<CursorPos X="21" Y="1139"/>
<UsageCount Value="8"/>
<UsageCount Value="7"/>
</Unit3>
<Unit4>
<Filename Value="../../rxmemds.pas"/>
<UnitName Value="rxmemds"/>
<TopLine Value="337"/>
<CursorPos X="1" Y="356"/>
<UsageCount Value="8"/>
<UsageCount Value="7"/>
</Unit4>
<Unit5>
<Filename Value="../../rxdbgrid.pas"/>
<UnitName Value="rxdbgrid"/>
<TopLine Value="1007"/>
<CursorPos X="51" Y="1022"/>
<UsageCount Value="12"/>
<UsageCount Value="11"/>
<Bookmarks Count="2">
<Item0 X="1" Y="1089" ID="1"/>
<Item1 X="3" Y="1230" ID="2"/>
@ -115,73 +115,73 @@
<UnitName Value="LResources"/>
<TopLine Value="2626"/>
<CursorPos X="1" Y="2644"/>
<UsageCount Value="8"/>
<UsageCount Value="7"/>
</Unit6>
<Unit7>
<Filename Value="../../../lcl/grids.pas"/>
<UnitName Value="Grids"/>
<TopLine Value="385"/>
<CursorPos X="33" Y="394"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit7>
<Unit8>
<Filename Value="../../../lcl/dbgrids.pas"/>
<UnitName Value="DBGrids"/>
<TopLine Value="187"/>
<CursorPos X="30" Y="199"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit8>
<Unit9>
<Filename Value="../../rxpopupunit.pas"/>
<UnitName Value="rxpopupunit"/>
<TopLine Value="246"/>
<CursorPos X="15" Y="249"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit9>
<Unit10>
<Filename Value="../../../lcl/include/wincontrol.inc"/>
<TopLine Value="7217"/>
<CursorPos X="1" Y="7236"/>
<UsageCount Value="8"/>
<UsageCount Value="7"/>
</Unit10>
<Unit11>
<Filename Value="../../../lcl/include/control.inc"/>
<TopLine Value="1"/>
<CursorPos X="1" Y="1"/>
<UsageCount Value="8"/>
<UsageCount Value="7"/>
</Unit11>
<Unit12>
<Filename Value="../../../lcl/lclmessageglue.pas"/>
<UnitName Value="LCLMessageGlue"/>
<TopLine Value="92"/>
<CursorPos X="46" Y="96"/>
<UsageCount Value="8"/>
<UsageCount Value="7"/>
</Unit12>
<Unit13>
<Filename Value="../../../lcl/controls.pp"/>
<UnitName Value="Controls"/>
<TopLine Value="1779"/>
<CursorPos X="60" Y="1798"/>
<UsageCount Value="8"/>
<UsageCount Value="7"/>
</Unit13>
<Unit14>
<Filename Value="../../../install/2/rxdbgrid.diff"/>
<TopLine Value="1"/>
<CursorPos X="1" Y="21"/>
<UsageCount Value="8"/>
<UsageCount Value="7"/>
<DefaultSyntaxHighlighter Value="Diff"/>
</Unit14>
<Unit15>
<Filename Value="../../../lcl/interfaces/gtk/gtkdevicecontext.inc"/>
<TopLine Value="626"/>
<CursorPos X="1" Y="644"/>
<UsageCount Value="8"/>
<UsageCount Value="7"/>
</Unit15>
<Unit16>
<Filename Value="../../../lcl/interfaces/gtk2/gtk2winapi.inc"/>
<TopLine Value="559"/>
<CursorPos X="1" Y="577"/>
<UsageCount Value="8"/>
<UsageCount Value="7"/>
</Unit16>
<Unit17>
<Filename Value="../../rxdbgrid_columsunit.pas"/>
@ -191,75 +191,75 @@
<UnitName Value="rxdbgrid_columsunit"/>
<TopLine Value="26"/>
<CursorPos X="46" Y="45"/>
<UsageCount Value="8"/>
<UsageCount Value="7"/>
</Unit17>
<Unit18>
<Filename Value="../../rxdconst.pas"/>
<UnitName Value="rxdconst"/>
<TopLine Value="126"/>
<CursorPos X="15" Y="155"/>
<UsageCount Value="8"/>
<UsageCount Value="7"/>
</Unit18>
<Unit19>
<Filename Value="../../../lcl/include/winapih.inc"/>
<TopLine Value="211"/>
<CursorPos X="10" Y="223"/>
<UsageCount Value="8"/>
<UsageCount Value="7"/>
</Unit19>
<Unit20>
<Filename Value="../../backup/rxdbgrid.pas"/>
<UnitName Value="rxdbgrid"/>
<TopLine Value="1207"/>
<CursorPos X="1" Y="1227"/>
<UsageCount Value="8"/>
<UsageCount Value="7"/>
</Unit20>
<Unit21>
<Filename Value="../../rxaboutdialog.pas"/>
<UnitName Value="RxAboutDialog"/>
<TopLine Value="10"/>
<CursorPos X="73" Y="30"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit21>
<Unit22>
<Filename Value="../../registerrx.pas"/>
<UnitName Value="registerrx"/>
<TopLine Value="174"/>
<CursorPos X="18" Y="201"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit22>
<Unit23>
<Filename Value="../../../ideintf/idewindowintf.pas"/>
<UnitName Value="IDEWindowIntf"/>
<TopLine Value="31"/>
<CursorPos X="1" Y="1"/>
<UsageCount Value="8"/>
<UsageCount Value="7"/>
</Unit23>
<Unit24>
<Filename Value="../../../lcl/extdlgs.pas"/>
<UnitName Value="ExtDlgs"/>
<TopLine Value="105"/>
<CursorPos X="35" Y="122"/>
<UsageCount Value="8"/>
<UsageCount Value="7"/>
</Unit24>
<Unit25>
<Filename Value="../../../lcl/dialogs.pp"/>
<UnitName Value="Dialogs"/>
<TopLine Value="62"/>
<CursorPos X="21" Y="79"/>
<UsageCount Value="8"/>
<UsageCount Value="7"/>
</Unit25>
<Unit26>
<Filename Value="../../../lcl/include/commondialog.inc"/>
<TopLine Value="80"/>
<CursorPos X="17" Y="84"/>
<UsageCount Value="8"/>
<UsageCount Value="7"/>
</Unit26>
<Unit27>
<Filename Value="../../../lcl/widgetset/wsdialogs.pp"/>
<UnitName Value="WSDialogs"/>
<TopLine Value="132"/>
<CursorPos X="3" Y="136"/>
<UsageCount Value="8"/>
<UsageCount Value="7"/>
</Unit27>
<Unit28>
<Filename Value="../../rxaboutformunit.pas"/>
@ -268,41 +268,41 @@
<UnitName Value="rxAboutFormUnit"/>
<TopLine Value="41"/>
<CursorPos X="26" Y="55"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit28>
<Unit29>
<Filename Value="../../rxversinfo.pas"/>
<UnitName Value="RxVersInfo"/>
<TopLine Value="72"/>
<CursorPos X="49" Y="105"/>
<UsageCount Value="8"/>
<UsageCount Value="7"/>
</Unit29>
<Unit30>
<Filename Value="../../../lcl/buttonpanel.pas"/>
<UnitName Value="ButtonPanel"/>
<TopLine Value="11"/>
<CursorPos X="6" Y="15"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit30>
<Unit31>
<Filename Value="../../../lcl/extctrls.pp"/>
<UnitName Value="ExtCtrls"/>
<TopLine Value="604"/>
<CursorPos X="15" Y="607"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit31>
<Unit32>
<Filename Value="../../../lcl/include/customimage.inc"/>
<TopLine Value="67"/>
<CursorPos X="3" Y="69"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit32>
<Unit33>
<Filename Value="../../../install/fpcsrc/rtl/objpas/classes/classesh.inc"/>
<WindowIndex Value="0"/>
<TopLine Value="426"/>
<CursorPos X="17" Y="448"/>
<UsageCount Value="16"/>
<UsageCount Value="15"/>
</Unit33>
<Unit34>
<Filename Value="../../../smsprog/sms_send_deamon/smsSendGui/smssendaboutunit.pas"/>
@ -312,21 +312,21 @@
<UnitName Value="smsSendAboutUnit"/>
<TopLine Value="28"/>
<CursorPos X="1" Y="57"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit34>
<Unit35>
<Filename Value="../../../smsprog/sms_shared/smsabstarctconstunit.pas"/>
<UnitName Value="smsAbstarctConstUnit"/>
<TopLine Value="1"/>
<CursorPos X="42" Y="11"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit35>
<Unit36>
<Filename Value="../../rxconst.pas"/>
<UnitName Value="rxconst"/>
<TopLine Value="34"/>
<CursorPos X="3" Y="51"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit36>
<Unit37>
<Filename Value="../../../rxnet/demo/send_demo/smssendparamsunit.pas"/>
@ -336,7 +336,7 @@
<UnitName Value="smssendParamsUnit"/>
<TopLine Value="49"/>
<CursorPos X="34" Y="60"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit37>
<Unit38>
<Filename Value="../../../rxnet/demo/send_demo/smssenddemomainunit.pas"/>
@ -346,49 +346,49 @@
<UnitName Value="smsSendDemoMainUnit"/>
<TopLine Value="41"/>
<CursorPos X="105" Y="29"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit38>
<Unit39>
<Filename Value="../../../rxnet/demo/send_demo/send_demo.lpr"/>
<UnitName Value="send_demo"/>
<TopLine Value="1"/>
<CursorPos X="1" Y="1"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit39>
<Unit40>
<Filename Value="../../../doceditor/lazdeopts.pp"/>
<UnitName Value="LazDEOpts"/>
<TopLine Value="43"/>
<CursorPos X="1" Y="56"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit40>
<Unit41>
<Filename Value="../../rxfileutils.pas"/>
<UnitName Value="rxFileUtils"/>
<TopLine Value="18"/>
<CursorPos X="33" Y="42"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit41>
<Unit42>
<Filename Value="../../registerrxdb.pas"/>
<UnitName Value="RegisterRxDB"/>
<TopLine Value="2"/>
<CursorPos X="20" Y="17"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit42>
<Unit43>
<Filename Value="../../../ideintf/dbpropedits.pas"/>
<UnitName Value="DBPropEdits"/>
<TopLine Value="13"/>
<CursorPos X="6" Y="19"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit43>
<Unit44>
<Filename Value="../../../ideintf/propedits.pp"/>
<UnitName Value="PropEdits"/>
<TopLine Value="1"/>
<CursorPos X="6" Y="26"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit44>
<Unit45>
<Filename Value="../../rxdbgrid_findunit.pas"/>
@ -398,7 +398,7 @@
<UnitName Value="rxdbgrid_findunit"/>
<TopLine Value="78"/>
<CursorPos X="1" Y="94"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit45>
<Unit46>
<Filename Value="../../rxtoolbar.pas"/>
@ -406,7 +406,7 @@
<WindowIndex Value="0"/>
<TopLine Value="1"/>
<CursorPos X="52" Y="26"/>
<UsageCount Value="11"/>
<UsageCount Value="10"/>
</Unit46>
<Unit47>
<Filename Value="../../../synedit/synedit.pp"/>
@ -414,7 +414,7 @@
<WindowIndex Value="0"/>
<TopLine Value="5699"/>
<CursorPos X="1" Y="5702"/>
<UsageCount Value="16"/>
<UsageCount Value="15"/>
</Unit47>
<Unit48>
<Filename Value="../../../synedit/syneditkeycmds.pp"/>
@ -422,14 +422,14 @@
<WindowIndex Value="0"/>
<TopLine Value="750"/>
<CursorPos X="3" Y="752"/>
<UsageCount Value="12"/>
<UsageCount Value="11"/>
</Unit48>
<Unit49>
<Filename Value="../../../install/fpcsrc/rtl/objpas/classes/classes.inc"/>
<WindowIndex Value="0"/>
<TopLine Value="429"/>
<CursorPos X="33" Y="447"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit49>
<Unit50>
<Filename Value="../../../lcl/actnlist.pas"/>
@ -437,7 +437,7 @@
<WindowIndex Value="0"/>
<TopLine Value="206"/>
<CursorPos X="33" Y="224"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit50>
<Unit51>
<Filename Value="../../../lcl/lclproc.pas"/>
@ -445,14 +445,14 @@
<WindowIndex Value="0"/>
<TopLine Value="1154"/>
<CursorPos X="10" Y="1165"/>
<UsageCount Value="9"/>
<UsageCount Value="8"/>
</Unit51>
<Unit52>
<Filename Value="rxdbgridmainunit.lfm"/>
<WindowIndex Value="0"/>
<TopLine Value="133"/>
<CursorPos X="5" Y="103"/>
<UsageCount Value="10"/>
<UsageCount Value="9"/>
<DefaultSyntaxHighlighter Value="LFM"/>
</Unit52>
<Unit53>
@ -460,14 +460,14 @@
<WindowIndex Value="0"/>
<TopLine Value="286"/>
<CursorPos X="1" Y="288"/>
<UsageCount Value="15"/>
<UsageCount Value="14"/>
</Unit53>
<Unit54>
<Filename Value="../../../wine/1/1/rx.diff"/>
<WindowIndex Value="0"/>
<TopLine Value="1"/>
<CursorPos X="1" Y="9"/>
<UsageCount Value="10"/>
<UsageCount Value="9"/>
<DefaultSyntaxHighlighter Value="Diff"/>
</Unit54>
<Unit55>
@ -476,14 +476,14 @@
<WindowIndex Value="0"/>
<TopLine Value="541"/>
<CursorPos X="1" Y="569"/>
<UsageCount Value="10"/>
<UsageCount Value="9"/>
</Unit55>
<Unit56>
<Filename Value="../../../lcl/include/canvas.inc"/>
<WindowIndex Value="0"/>
<TopLine Value="1116"/>
<CursorPos X="1" Y="1132"/>
<UsageCount Value="11"/>
<UsageCount Value="10"/>
</Unit56>
<Unit57>
<Filename Value="../../exsortsql.pas"/>
@ -491,7 +491,7 @@
<WindowIndex Value="0"/>
<TopLine Value="69"/>
<CursorPos X="49" Y="3"/>
<UsageCount Value="10"/>
<UsageCount Value="9"/>
</Unit57>
<Unit58>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
@ -499,9 +499,9 @@
<IsVisibleTab Value="True"/>
<EditorIndex Value="1"/>
<WindowIndex Value="0"/>
<TopLine Value="1242"/>
<CursorPos X="1" Y="1274"/>
<UsageCount Value="13"/>
<TopLine Value="1276"/>
<CursorPos X="47" Y="1288"/>
<UsageCount Value="16"/>
<Bookmarks Count="3">
<Item0 X="3" Y="73" ID="1"/>
<Item1 X="13" Y="328" ID="2"/>
@ -512,10 +512,12 @@
<Unit59>
<Filename Value="/usr/local/share/lazarus/lcl/dbgrids.pas"/>
<UnitName Value="DBGrids"/>
<EditorIndex Value="2"/>
<WindowIndex Value="0"/>
<TopLine Value="199"/>
<CursorPos X="3" Y="220"/>
<UsageCount Value="11"/>
<TopLine Value="2414"/>
<CursorPos X="1" Y="2437"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit59>
<Unit60>
<Filename Value="/usr/local/share/lazarus/lcl/grids.pas"/>
@ -523,14 +525,14 @@
<WindowIndex Value="0"/>
<TopLine Value="7494"/>
<CursorPos X="34" Y="7503"/>
<UsageCount Value="11"/>
<UsageCount Value="10"/>
</Unit60>
<Unit61>
<Filename Value="../../../../../../install/fpcsrc/rtl/objpas/classes/classesh.inc"/>
<WindowIndex Value="0"/>
<TopLine Value="1554"/>
<CursorPos X="38" Y="1569"/>
<UsageCount Value="10"/>
<UsageCount Value="9"/>
</Unit61>
<Unit62>
<Filename Value="/usr/local/share/lazarus/lcl/buttons.pp"/>
@ -538,7 +540,7 @@
<WindowIndex Value="0"/>
<TopLine Value="333"/>
<CursorPos X="3" Y="360"/>
<UsageCount Value="10"/>
<UsageCount Value="9"/>
</Unit62>
<Unit63>
<Filename Value="../../../../../../install/fpcsrc/packages/fcl-db/src/base/db.pas"/>
@ -546,7 +548,7 @@
<WindowIndex Value="0"/>
<TopLine Value="1588"/>
<CursorPos X="15" Y="1609"/>
<UsageCount Value="10"/>
<UsageCount Value="9"/>
</Unit63>
<Unit64>
<Filename Value="/usr/local/share/lazarus/components/rxnew/vclutils.pas"/>
@ -554,14 +556,14 @@
<WindowIndex Value="0"/>
<TopLine Value="1"/>
<CursorPos X="1" Y="35"/>
<UsageCount Value="12"/>
<UsageCount Value="11"/>
</Unit64>
<Unit65>
<Filename Value="/usr/local/share/lazarus/lcl/include/canvas.inc"/>
<WindowIndex Value="0"/>
<TopLine Value="1317"/>
<CursorPos X="1" Y="1338"/>
<UsageCount Value="10"/>
<UsageCount Value="9"/>
</Unit65>
<Unit66>
<Filename Value="/usr/local/share/lazarus/lcl/graphics.pp"/>
@ -569,21 +571,21 @@
<WindowIndex Value="0"/>
<TopLine Value="93"/>
<CursorPos X="3" Y="99"/>
<UsageCount Value="11"/>
<UsageCount Value="10"/>
</Unit66>
<Unit67>
<Filename Value="/usr/local/share/lazarus/lcl/include/lclintf.inc"/>
<WindowIndex Value="0"/>
<TopLine Value="132"/>
<CursorPos X="1" Y="155"/>
<UsageCount Value="10"/>
<UsageCount Value="9"/>
</Unit67>
<Unit68>
<Filename Value="/usr/local/share/lazarus/lcl/interfaces/gtk2/gtk2lclintf.inc"/>
<WindowIndex Value="0"/>
<TopLine Value="167"/>
<CursorPos X="1" Y="190"/>
<UsageCount Value="10"/>
<UsageCount Value="9"/>
</Unit68>
<Unit69>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxsortby.pas"/>
@ -594,7 +596,7 @@
<WindowIndex Value="0"/>
<TopLine Value="50"/>
<CursorPos X="14" Y="65"/>
<UsageCount Value="12"/>
<UsageCount Value="11"/>
</Unit69>
<Unit70>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxfilterby.pas"/>
@ -605,21 +607,21 @@
<WindowIndex Value="0"/>
<TopLine Value="315"/>
<CursorPos X="1" Y="350"/>
<UsageCount Value="10"/>
<UsageCount Value="9"/>
</Unit70>
<Unit71>
<Filename Value="../../../../../../install/source/fpcsrc/rtl/objpas/classes/classesh.inc"/>
<WindowIndex Value="0"/>
<TopLine Value="645"/>
<CursorPos X="15" Y="666"/>
<UsageCount Value="10"/>
<UsageCount Value="9"/>
</Unit71>
<Unit72>
<Filename Value="../../../../../../install/source/fpcsrc/rtl/objpas/classes/stringl.inc"/>
<WindowIndex Value="0"/>
<TopLine Value="593"/>
<CursorPos X="3" Y="598"/>
<UsageCount Value="10"/>
<UsageCount Value="9"/>
</Unit72>
<Unit73>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxstrutils.pas"/>
@ -627,149 +629,159 @@
<WindowIndex Value="0"/>
<TopLine Value="140"/>
<CursorPos X="23" Y="168"/>
<UsageCount Value="10"/>
<UsageCount Value="9"/>
</Unit73>
<Unit74>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxlookup.pas"/>
<UnitName Value="rxlookup"/>
<EditorIndex Value="3"/>
<EditorIndex Value="4"/>
<WindowIndex Value="0"/>
<TopLine Value="797"/>
<CursorPos X="17" Y="805"/>
<UsageCount Value="10"/>
<TopLine Value="1176"/>
<CursorPos X="3" Y="1196"/>
<UsageCount Value="13"/>
<Loaded Value="True"/>
</Unit74>
<Unit75>
<Filename Value="../../../../../../install/source/fpcsrc/packages/fcl-db/src/base/db.pas"/>
<UnitName Value="db"/>
<EditorIndex Value="2"/>
<EditorIndex Value="3"/>
<WindowIndex Value="0"/>
<TopLine Value="1776"/>
<CursorPos X="14" Y="1796"/>
<UsageCount Value="10"/>
<UsageCount Value="13"/>
<Loaded Value="True"/>
</Unit75>
<Unit76>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxpopupunit.pas"/>
<UnitName Value="rxpopupunit"/>
<EditorIndex Value="5"/>
<WindowIndex Value="0"/>
<TopLine Value="275"/>
<CursorPos X="1" Y="298"/>
<UsageCount Value="13"/>
<Loaded Value="True"/>
</Unit76>
</Units>
<JumpHistory Count="30" HistoryIndex="28">
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="1172" Column="29" TopLine="1136"/>
<Caret Line="1302" Column="1" TopLine="1281"/>
</Position1>
<Position2>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="1175" Column="37" TopLine="1138"/>
<Caret Line="1297" Column="1" TopLine="1281"/>
</Position2>
<Position3>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="1190" Column="37" TopLine="1153"/>
<Caret Line="1298" Column="1" TopLine="1281"/>
</Position3>
<Position4>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="1258" Column="37" TopLine="1220"/>
<Caret Line="3040" Column="1" TopLine="3019"/>
</Position4>
<Position5>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="1261" Column="37" TopLine="1225"/>
<Caret Line="3041" Column="1" TopLine="3019"/>
</Position5>
<Position6>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="1268" Column="39" TopLine="1231"/>
<Caret Line="1297" Column="1" TopLine="1276"/>
</Position6>
<Position7>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="1275" Column="38" TopLine="1239"/>
<Caret Line="1298" Column="1" TopLine="1276"/>
</Position7>
<Position8>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="3660" Column="29" TopLine="3626"/>
<Caret Line="3040" Column="1" TopLine="3019"/>
</Position8>
<Position9>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="3676" Column="40" TopLine="3640"/>
<Caret Line="3041" Column="1" TopLine="3019"/>
</Position9>
<Position10>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
<Caret Line="1297" Column="1" TopLine="1276"/>
</Position10>
<Position11>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="469" Column="31" TopLine="436"/>
<Caret Line="1298" Column="1" TopLine="1276"/>
</Position11>
<Position12>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="3189" Column="45" TopLine="3154"/>
<Caret Line="3040" Column="1" TopLine="3019"/>
</Position12>
<Position13>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="3600" Column="46" TopLine="3565"/>
<Caret Line="3041" Column="1" TopLine="3019"/>
</Position13>
<Position14>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="3606" Column="47" TopLine="3571"/>
<Caret Line="1297" Column="1" TopLine="1276"/>
</Position14>
<Position15>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="3658" Column="59" TopLine="3624"/>
<Caret Line="3041" Column="1" TopLine="3020"/>
</Position15>
<Position16>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
<Caret Line="1297" Column="1" TopLine="1276"/>
</Position16>
<Position17>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="781" Column="31" TopLine="743"/>
<Caret Line="3041" Column="1" TopLine="3020"/>
</Position17>
<Position18>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="1274" Column="29" TopLine="1239"/>
<Caret Line="1297" Column="1" TopLine="1276"/>
</Position18>
<Position19>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxlookup.pas"/>
<Caret Line="1049" Column="3" TopLine="1042"/>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="3041" Column="1" TopLine="3020"/>
</Position19>
<Position20>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxlookup.pas"/>
<Caret Line="1210" Column="3" TopLine="1172"/>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="1297" Column="1" TopLine="1276"/>
</Position20>
<Position21>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="791" Column="62" TopLine="772"/>
<Caret Line="3041" Column="1" TopLine="3020"/>
</Position21>
<Position22>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="1246" Column="3" TopLine="1242"/>
<Caret Line="1297" Column="1" TopLine="1276"/>
</Position22>
<Position23>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="1271" Column="19" TopLine="1242"/>
<Caret Line="3041" Column="1" TopLine="3020"/>
</Position23>
<Position24>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="1254" Column="15" TopLine="1251"/>
<Caret Line="1297" Column="1" TopLine="1276"/>
</Position24>
<Position25>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxlookup.pas"/>
<Caret Line="289" Column="14" TopLine="268"/>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="3041" Column="1" TopLine="3020"/>
</Position25>
<Position26>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="1269" Column="4" TopLine="1250"/>
<Caret Line="1297" Column="1" TopLine="1276"/>
</Position26>
<Position27>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="1256" Column="8" TopLine="1250"/>
<Caret Line="3041" Column="1" TopLine="3020"/>
</Position27>
<Position28>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="1276" Column="3" TopLine="1250"/>
<Caret Line="1297" Column="1" TopLine="1276"/>
</Position28>
<Position29>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="1272" Column="75" TopLine="1242"/>
<Caret Line="3041" Column="1" TopLine="3020"/>
</Position29>
<Position30>
<Filename Value="/usr/local/share/lazarus/components/rxnew/rxdbgrid.pas"/>
<Caret Line="1282" Column="3" TopLine="1280"/>
<Caret Line="3042" Column="1" TopLine="3020"/>
</Position30>
</JumpHistory>
</ProjectOptions>

View File

@ -257,7 +257,7 @@ object RxDBGridMainForm: TRxDBGridMainForm
SelectedColor = clHighlight
GridLineStyle = psSolid
DataSource = Datasource1
Options = [dgEditing, dgTitles, dgIndicator, dgColumnResize, dgColumnMove, dgColLines, dgRowLines, dgTabs, dgAlwaysShowSelection, dgConfirmDelete, dgCancelOnExit, dgMultiselect, dgHeaderPushedLook]
Options = [dgEditing, dgTitles, dgIndicator, dgColumnResize, dgColumnMove, dgColLines, dgRowLines, dgTabs, dgAlwaysShowSelection, dgConfirmDelete, dgMultiselect, dgHeaderPushedLook]
ParentColor = False
PopupMenu = PopupMenu1
Scrollbars = ssVertical

View File

@ -787,8 +787,9 @@ type
procedure KeyDown(var Key: word; Shift: TShiftState); override;
procedure msg_SetGrid(var Msg: TGridMessage); message GM_SETGRID;
procedure msg_SetValue(var Msg: TGridMessage); message GM_SETVALUE;
procedure ShowList; override;
procedure msg_GetValue(var Msg: TGridMessage); message GM_GETVALUE;
procedure OnInternalClosePopup(AResult:boolean);override;
procedure ShowList; override;
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
@ -1191,6 +1192,7 @@ procedure TRxDBGridLookupComboEditor.KeyDown(var Key: word; Shift: TShiftState);
procedure doGridKeyDown;
begin
if Assigned(FGrid) then
// FGrid.EditorkeyDown(Self, key, shift);
FGrid.KeyDown(Key, shift);
end;
@ -1207,14 +1209,21 @@ procedure TRxDBGridLookupComboEditor.KeyDown(var Key: word; Shift: TShiftState);
else
Result := False;
end;
procedure CheckEditingKey;
begin
if (FGrid=nil) or FGrid.EditorIsReadOnly then
Key := 0;
end;
begin
CheckEditingKey;
case Key of
VK_UP,
VK_DOWN:
if (not PopupVisible) and (not (ssAlt in Shift)) then
begin
doGridKeyDown;
Key:=0;
exit;
end;
VK_LEFT, VK_RIGHT:
@ -1231,6 +1240,8 @@ begin
end;
end;
inherited KeyDown(Key, Shift);
{ if FGrid<>nil then
FGrid.EditingDone;}
end;
procedure TRxDBGridLookupComboEditor.msg_SetGrid(var Msg: TGridMessage);
@ -1258,6 +1269,22 @@ begin
end;
end;
procedure TRxDBGridLookupComboEditor.msg_GetValue(var Msg: TGridMessage);
var
sText: string;
F:TField;
begin
if Assigned(FGrid.SelectedField) and Assigned(FLDS.DataSet) then
begin
F:=FLDS.DataSet.FieldByName(LookupDisplay);
if Assigned(F) then
begin
sText := F.DisplayText;
Msg.Value := sText;
end;
end;
end;
procedure TRxDBGridLookupComboEditor.ShowList;
begin
FGrid.GetOnDisplayLookup;
@ -1265,15 +1292,26 @@ begin
end;
procedure TRxDBGridLookupComboEditor.OnInternalClosePopup(AResult: boolean);
procedure CheckEditingKey;
begin
if (FGrid=nil) or FGrid.EditorIsReadOnly then
// Key := 0;
end;
var
F:TField;
begin
inherited OnInternalClosePopup(AResult);
CheckEditingKey;
if (AResult) and Assigned(FGrid.SelectedField) and Assigned(FLDS.DataSet) then
begin
F:=FLDS.DataSet.FieldByName(LookupDisplay);
if Assigned(F) then
FGrid.SelectedField.Assign(F);
begin
//FGrid.SelectedField.Assign(F);
if (FGrid<>nil) and Visible then begin
FGrid.SetEditText(FCol, FRow, F.DisplayText);
end;
end;
end;
end;

View File

@ -326,6 +326,8 @@ begin
case Key of
VK_ESCAPE:Deactivate;
VK_RETURN:begin
Key:=0;
Shift:=[];
CloseOk;
exit;{In that case we need to exit away.}
end;