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

RxDBGrid - fix compile with fpc 2.6.2

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2927 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2014-04-02 11:44:09 +00:00
parent fff0dd470f
commit c9266bbd58
5 changed files with 18 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/rx/trunk/languages/rxdconst.es.po
View File

@ -75,8 +75,8 @@ msgstr "Campo '%s' no usado en expresión de filtro"
#: rxdconst.sexprbadnulltest
#, fuzzy
#| msgid "NULL-values enabled in '=' и '<>'"
msgid "NULL-values enabled in '=' и '<>'"
#| msgid "NULL-values enabled in '=' и '<>'"
msgid "NULL-values enabled in '=' и '<>'"
msgstr "Valor nulo habilitado en '=' y '<>'"
#: rxdconst.sexprexpected

2
components/rx/trunk/languages/rxdconst.po
View File

@ -74,7 +74,7 @@ msgid "Field '%s' not used in filter expression"
msgstr ""
#: rxdconst.sexprbadnulltest
msgid "NULL-values enabled in '=' и '<>'"
msgid "NULL-values enabled in '=' и '<>'"
msgstr ""
#: rxdconst.sexprexpected

4
components/rx/trunk/languages/rxdconst.ru.po
View File

@ -75,8 +75,8 @@ msgstr "Поле '%s' не может быть использовано в вы
#: rxdconst.sexprbadnulltest
#, fuzzy
#| msgid "NULL-values enabled in '=' и '<>'"
msgid "NULL-values enabled in '=' и '<>'"
#| msgid "NULL-values enabled in '=' и '<>'"
msgid "NULL-values enabled in '=' и '<>'"
msgstr "NULL-значения разрешены только в выражениях '=' и '<>'"
#: rxdconst.sexprexpected

4
components/rx/trunk/languages/rxdconst.uk.po
View File

@ -84,8 +84,8 @@ msgstr "Поле '%s' не може бути використане в вира
#: rxdconst.sexprbadnulltest
#, fuzzy
#| msgid "NULL-values enabled in '=' и '<>'"
msgid "NULL-values enabled in '=' и '<>'"
#| msgid "NULL-values enabled in '=' и '<>'"
msgid "NULL-values enabled in '=' и '<>'"
msgstr "NULL-значення дозволені тільки у виразах '=' і '<>'"
#: rxdconst.sexprexpected

55
components/rx/trunk/rxdbgrid.pas
View File

@ -4044,11 +4044,12 @@ end;
procedure TRxDBGrid.CalcStatTotals;
var
{$IFDEF NoAutomatedBookmark}
P_26: TBookmark;
{$ENDIF}
P: TBookmark;
//DS: TDataSet;
i, cnt: integer;
APresent: boolean;
//SEA, SEB:TDataSetNotifyEvent;
DHL:THackDataLink;
DHS:THackDataSet;
@ -4079,45 +4080,6 @@ begin
Inc(FInProcessCalc);
(*
if Assigned(FSortEngine) and (FSortEngine.EnabledFooterRowsCalc) then
begin
for i := 0 to Columns.Count - 1 do
TRxColumn(Columns[i]).Footer.ResetTestValue;
FSortEngine.UpdateFooterRows(DataSource.DataSet, Self);
exit;
end;
DS := DataSource.DataSet;
;
P := Ds.GetBookMark;
DS.DisableControls;
SEB:=DS.BeforeScroll;
SEA:=DS.AfterScroll;
DS.BeforeScroll:=nil;
DS.AfterScroll:=nil;
try
DS.First;
for i := 0 to Columns.Count - 1 do
TRxColumn(Columns[i]).Footer.ResetTestValue;
while not DS.EOF do
begin
for i := 0 to Columns.Count - 1 do
TRxColumn(Columns[i]).Footer.UpdateTestValue;
DS.Next;
end;
finally
DS.GotoBookmark(P);
DS.FreeBookmark(P);
DS.BeforeScroll:=SEB;
DS.AfterScroll:=SEA;
DS.EnableControls;
end;
*)
cnt:=0;
for i := 0 to Columns.Count - 1 do
TRxColumn(Columns[i]).Footer.ResetTestValue;
@ -4184,18 +4146,17 @@ begin
DHS.AfterScroll := SaveAfterScroll;
DHS.BeforeScroll := SaveBeforeScroll;
if DHS.CompareBookmarks(DHS.Bookmark, P)<>0 then
begin
{$IFDEF NoAutomatedBookmark}
P_26:=DHS.GetBookmark;
if DHS.CompareBookmarks(P_26, P)<>0 then
DHS.GotoBookmark(P); //workaround for fix navigation problem
DHS.FreeBookmark(P);
DHS.FreeBookmark(P_26);
{$ELSE}
if DHS.CompareBookmarks(DHS.Bookmark, P)<>0 then
DHS.Bookmark:=P; //workaround for fix navigation problem
{$ENDIF}
end;
{$IFDEF NoAutomatedBookmark}
DHS.FreeBookmark(P);
{$ENDIF}
Dec(FInProcessCalc);
if FInProcessCalc < 0 then