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

fix error in rxDbGrid - tnx .wOvAN and ronin from freepascal.ru

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2319 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2012-02-28 20:01:51 +00:00
parent a69372cd07
commit 1d4fd99f98
3 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
components/rx/Demos/ToolPanel/project1.lpi
View File

@ -1,8 +1,8 @@
<?xml version="1.0"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
<PathDelim Value="\"/>
<Version Value="7"/>
<General>
<Flags>
<LRSInOutputDirectory Value="False"/>
@ -10,15 +10,17 @@
<SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/>
<AutoCreateForms Value="False"/>
<TargetFileExt Value=".exe"/>
<Title Value="Rx Toolbar test"/>
<UseAppBundle Value="False"/>
<Icon Value="0"/>
<UseXPManifest Value="True"/>
<Icon Value="0"/>
</General>
<VersionInfo>
<UseVersionInfo Value="True"/>
</VersionInfo>
<BuildModes Count="1">
<Item1 Name="default" Default="True"/>
</BuildModes>
<PublishOptions>
<Version Value="2"/>
<IgnoreBinaries Value="False"/>
@ -67,11 +69,16 @@
</Units>
</ProjectOptions>
<CompilerOptions>
<Version Value="8"/>
<Version Value="11"/>
<PathDelim Value="\"/>
<SearchPaths>
<SrcPath Value="$(LazarusDir)\lcl\;$(LazarusDir)\lcl\interfaces\$(LCLWidgetType)\"/>
<SrcPath Value="$(LazarusDir)\lcl;$(LazarusDir)\lcl\interfaces\$(LCLWidgetType)"/>
</SearchPaths>
<Parsing>
<SyntaxOptions>
<UseAnsiStrings Value="False"/>
</SyntaxOptions>
</Parsing>
<Linking>
<Options>
<Win32>

4
components/rx/Demos/ToolPanel/toolbardemo.cfg
View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="utf-8"?>
<CONFIG>
<TApplication>
<Form1 Form1_Top="255" Form1_Left="310" Form1_Width="592" Form1_Height="289" Form1.ToolPanel1.Count="7" Form1.ToolPanel1.Options="tpFlatBtns,tpCustomizable,tpGlyphPopup,tpCaptionPopup" Form1.ToolPanel1.Version="1" Form1.ToolPanel1.ShowHint="1" Form1.ToolPanel1.Item0.Top="4" Form1.ToolPanel1.Item1.Top="4" Form1.ToolPanel1.Item2.Top="4" Form1.ToolPanel1.Item3.Top="4" Form1.ToolPanel1.Item4.Top="4" Form1.ToolPanel1.Item5.Top="4" Form1.ToolPanel1.Item6.Top="4" Form1.ToolPanel1.Item0.Left="8" Form1.ToolPanel1.Item1.Left="328" Form1.ToolPanel1.Item2.Left="152" Form1.ToolPanel1.Item3.Left="96" Form1.ToolPanel1.Item4.Left="504" Form1.ToolPanel1.Item5.Left="216" Form1.ToolPanel1.Item6.Left="328" Form1.ToolPanel1.Item0.Width="49" Form1.ToolPanel1.Item1.Width="64" Form1.ToolPanel1.Item2.Width="24" Form1.ToolPanel1.Item3.Width="50" Form1.ToolPanel1.Item4.Width="46" Form1.ToolPanel1.Item5.Width="85" Form1.ToolPanel1.Item6.Width="64" Form1.ToolPanel1.Item0.Action="actNew" Form1.ToolPanel1.Item1.Action="actCustom" Form1.ToolPanel1.Item2.Action="actNext" Form1.ToolPanel1.Item3.Action="actPrior" Form1.ToolPanel1.Item4.Action="actExit" Form1.ToolPanel1.Item5.Action="actDemo" Form1.ToolPanel1.Item6.Action="actCustom" Form1.ToolPanel1.ToolBarStyle="tbsStandart" Form1.ToolPanel1.Item0.Visible="1" Form1.ToolPanel1.Item1.Visible="1" Form1.ToolPanel1.Item2.Visible="1" Form1.ToolPanel1.Item3.Visible="1" Form1.ToolPanel1.Item4.Visible="1" Form1.ToolPanel1.Item5.Visible="1" Form1.ToolPanel1.Item6.Visible="1" Form1.ToolPanel1.Item0.ShowCaption="1" Form1.ToolPanel1.Item1.ShowCaption="1" Form1.ToolPanel1.Item2.ShowCaption="0" Form1.ToolPanel1.Item3.ShowCaption="1" Form1.ToolPanel1.Item4.ShowCaption="1" Form1.ToolPanel1.Item5.ShowCaption="1" Form1.ToolPanel1.Item6.ShowCaption="1"/>
<MainForm MainForm_Top="42" MainForm_Left="182" MainForm_Width="766" MainForm_Height="77" MainForm.ToolPanel1.Count="7" MainForm.ToolPanel1.Options="tpFlatBtns,tpCustomizable,tpGlyphPopup,tpCaptionPopup" MainForm.ToolPanel1.Version="4" MainForm.ToolPanel1.ShowHint="1" MainForm.ToolPanel1.Item0.Top="4" MainForm.ToolPanel1.Item1.Top="4" MainForm.ToolPanel1.Item2.Top="4" MainForm.ToolPanel1.Item3.Top="4" MainForm.ToolPanel1.Item4.Top="4" MainForm.ToolPanel1.Item5.Top="4" MainForm.ToolPanel1.Item6.Top="4" MainForm.ToolPanel1.Item0.Left="4" MainForm.ToolPanel1.Item1.Left="31" MainForm.ToolPanel1.Item2.Left="81" MainForm.ToolPanel1.Item3.Left="111" MainForm.ToolPanel1.Item4.Left="140" MainForm.ToolPanel1.Item5.Left="163" MainForm.ToolPanel1.Item6.Left="212" MainForm.ToolPanel1.Item0.Width="55" MainForm.ToolPanel1.Item1.Width="78" MainForm.ToolPanel1.Item2.Width="39" MainForm.ToolPanel1.Item3.Width="57" MainForm.ToolPanel1.Item4.Width="51" MainForm.ToolPanel1.Item5.Width="77" MainForm.ToolPanel1.Item6.Width="66" MainForm.ToolPanel1.ButtonAllign="tbaLeft" MainForm.ToolPanel1.Item0.Action="actNew" MainForm.ToolPanel1.Item1.Action="actCustom" MainForm.ToolPanel1.Item2.Action="actNext" MainForm.ToolPanel1.Item3.Action="actPrior" MainForm.ToolPanel1.Item4.Action="actExit" MainForm.ToolPanel1.Item5.Action="actSysMenu" MainForm.ToolPanel1.Item6.Action="sysAbout" MainForm.ToolPanel1.ToolBarStyle="tbsWindowsXP" MainForm.ToolPanel1.Item0.Visible="1" MainForm.ToolPanel1.Item1.Visible="1" MainForm.ToolPanel1.Item2.Visible="1" MainForm.ToolPanel1.Item3.Visible="1" MainForm.ToolPanel1.Item4.Visible="1" MainForm.ToolPanel1.Item5.Visible="1" MainForm.ToolPanel1.Item6.Visible="1" MainForm.ToolPanel1.Item0.ShowCaption="1" MainForm.ToolPanel1.Item1.ShowCaption="1" MainForm.ToolPanel1.Item2.ShowCaption="0" MainForm.ToolPanel1.Item3.ShowCaption="1" MainForm.ToolPanel1.Item4.ShowCaption="1" MainForm.ToolPanel1.Item5.ShowCaption="1" MainForm.ToolPanel1.Item6.ShowCaption="1"/>
<MainForm MainForm_Top="411" MainForm_Left="417" MainForm_Width="766" MainForm_Height="77" MainForm.ToolPanel1.Count="7" MainForm.ToolPanel1.Options="tpFlatBtns,tpCustomizable,tpGlyphPopup,tpCaptionPopup" MainForm.ToolPanel1.Version="4" MainForm.ToolPanel1.ShowHint="1" MainForm.ToolPanel1.Item0.Top="5" MainForm.ToolPanel1.Item1.Top="5" MainForm.ToolPanel1.Item2.Top="5" MainForm.ToolPanel1.Item3.Top="5" MainForm.ToolPanel1.Item4.Top="5" MainForm.ToolPanel1.Item5.Top="5" MainForm.ToolPanel1.Item6.Top="5" MainForm.ToolPanel1.Item0.Left="5" MainForm.ToolPanel1.Item1.Left="62" MainForm.ToolPanel1.Item2.Left="140" MainForm.ToolPanel1.Item3.Left="179" MainForm.ToolPanel1.Item4.Left="237" MainForm.ToolPanel1.Item5.Left="290" MainForm.ToolPanel1.Item6.Left="367" MainForm.ToolPanel1.Item0.Width="57" MainForm.ToolPanel1.Item1.Width="78" MainForm.ToolPanel1.Item2.Width="39" MainForm.ToolPanel1.Item3.Width="58" MainForm.ToolPanel1.Item4.Width="53" MainForm.ToolPanel1.Item5.Width="77" MainForm.ToolPanel1.Item6.Width="66" MainForm.ToolPanel1.ButtonAllign="tbaLeft" MainForm.ToolPanel1.Item0.Action="actNew" MainForm.ToolPanel1.Item1.Action="actCustom" MainForm.ToolPanel1.Item2.Action="actNext" MainForm.ToolPanel1.Item3.Action="actPrior" MainForm.ToolPanel1.Item4.Action="actExit" MainForm.ToolPanel1.Item5.Action="actSysMenu" MainForm.ToolPanel1.Item6.Action="sysAbout" MainForm.ToolPanel1.ToolBarStyle="tbsWindowsXP" MainForm.ToolPanel1.Item0.Visible="1" MainForm.ToolPanel1.Item1.Visible="1" MainForm.ToolPanel1.Item2.Visible="1" MainForm.ToolPanel1.Item3.Visible="1" MainForm.ToolPanel1.Item4.Visible="1" MainForm.ToolPanel1.Item5.Visible="1" MainForm.ToolPanel1.Item6.Visible="1" MainForm.ToolPanel1.Item0.ShowCaption="1" MainForm.ToolPanel1.Item1.ShowCaption="1" MainForm.ToolPanel1.Item2.ShowCaption="0" MainForm.ToolPanel1.Item3.ShowCaption="1" MainForm.ToolPanel1.Item4.ShowCaption="1" MainForm.ToolPanel1.Item5.ShowCaption="1" MainForm.ToolPanel1.Item6.ShowCaption="1"/>
</TApplication>
</CONFIG>

24
components/rx/rxdbgrid.pas
View File

@ -1192,13 +1192,7 @@ var
end;
begin
if not DataSource.DataSet.Active then exit;
{$ifdef dbgDBGrid}
DebugLn('VSCROLL: Code=',SbCodeToStr(Message.ScrollCode),
' Position=', dbgs(Message.Pos),' OldPos=',Dbgs(FOldPosition));
{$endif}
if not DatalinkActive then exit;
IsSeq := DataSource.DataSet.IsSequenced;
case Message.ScrollCode of
SB_TOP:
@ -3894,29 +3888,35 @@ begin
begin
F := TRxDBGrid(FOwner.Grid).DataSource.DataSet.FieldByName(FFieldName);
if Assigned(F) then
begin
if F.DataType in [ftDate, ftTime, ftDateTime, ftTimeStamp] then
begin
if FValueType in [fvtMax, fvtMin] then
begin
if not (F.IsNull) and (FTestValue = F.AsDateTime) then
Result := False
else
if (F.DataSet.RecordCount <> 0) and (F.OldValue <> null) then
begin
case FValueType of
fvtMax: FTestValue := Max(FTestValue, TDateTime(F.OldValue));
fvtMin: FTestValue := Min(FTestValue, TDateTime(F.OldValue));
end;
end;
end;
end
else
if (FValueType in [fvtMax, fvtMin]) and not (F.IsNull) and
(FTestValue = F.AsFloat) then
if (FValueType in [fvtMax, fvtMin]) and not (F.IsNull) and (FTestValue = F.AsFloat) then
Result := False
else
begin
case FValueType of
fvtSum:
if F.DataSet.RecordCount = 0 then
begin
if not F.IsNull then
FTestValue := FTestValue - F.AsFloat;
{ if not F.IsNull then
FTestValue := FTestValue - F.AsFloat;}
{ TODO -oalexs : need rewrite this code - where difficult! }
end
else
begin
@ -3932,6 +3932,8 @@ begin
if (F.DataSet.RecordCount <> 0) and (F.OldValue <> null) then
FTestValue := Min(FTestValue, Float(F.OldValue));
end;
end;
end;
end;
end;
///!