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

RxFPC: fix compile with latest lazarus - utf8

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4949 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2016-07-14 06:14:30 +00:00
parent 6eb49b9233
commit 94f7f9f8ce
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/rx/trunk/exsortzeos.pas
View File

@ -67,11 +67,18 @@ begin
if ADataSet is TZAbstractRODataset then if ADataSet is TZAbstractRODataset then
begin begin
TZAbstractRODataset(ADataSet).SortedFields:=FixFieldName(FieldName); if Asc then
FieldName := FixFieldName(FieldName) + ' Asc'
else
FieldName := FixFieldName(FieldName) + ' Desc';
TZAbstractRODataset(ADataSet).SortedFields:=FieldName;
{
if Asc then if Asc then
TZAbstractRODataset(ADataSet).SortType:=stAscending TZAbstractRODataset(ADataSet).SortType:=stAscending
else else
TZAbstractRODataset(ADataSet).SortType:=stDescending; TZAbstractRODataset(ADataSet).SortType:=stDescending;}
end; end;
end; end;

2
components/rx/trunk/rxpopupunit.pas
View File

@ -247,7 +247,7 @@ function ShowRxDBPopUpForm(AControl:TWinControl; ADataSet:TDataSet;
procedure FillPopupWidth(APopUpFormOptions:TPopUpFormOptions; ARxPopUpForm:TPopUpForm); procedure FillPopupWidth(APopUpFormOptions:TPopUpFormOptions; ARxPopUpForm:TPopUpForm);
implementation implementation
uses dbutils, math, LCLProc; uses dbutils, math, LCLProc, LazUTF8;
function ShowRxDBPopUpForm(AControl:TWinControl; ADataSet:TDataSet; function ShowRxDBPopUpForm(AControl:TWinControl; ADataSet:TDataSet;
AOnPopUpCloseEvent:TPopUpCloseEvent; APopUpFormOptions:TPopUpFormOptions; AOnPopUpCloseEvent:TPopUpCloseEvent; APopUpFormOptions:TPopUpFormOptions;