diff --git a/components/rx/trunk/exsortzeos.pas b/components/rx/trunk/exsortzeos.pas index 1c138998a..eaf357d8a 100644 --- a/components/rx/trunk/exsortzeos.pas +++ b/components/rx/trunk/exsortzeos.pas @@ -67,11 +67,18 @@ begin if ADataSet is TZAbstractRODataset then 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 TZAbstractRODataset(ADataSet).SortType:=stAscending else - TZAbstractRODataset(ADataSet).SortType:=stDescending; + TZAbstractRODataset(ADataSet).SortType:=stDescending;} end; end; diff --git a/components/rx/trunk/rxpopupunit.pas b/components/rx/trunk/rxpopupunit.pas index 4dbf3715f..c5e27144c 100644 --- a/components/rx/trunk/rxpopupunit.pas +++ b/components/rx/trunk/rxpopupunit.pas @@ -247,7 +247,7 @@ function ShowRxDBPopUpForm(AControl:TWinControl; ADataSet:TDataSet; procedure FillPopupWidth(APopUpFormOptions:TPopUpFormOptions; ARxPopUpForm:TPopUpForm); implementation -uses dbutils, math, LCLProc; +uses dbutils, math, LCLProc, LazUTF8; function ShowRxDBPopUpForm(AControl:TWinControl; ADataSet:TDataSet; AOnPopUpCloseEvent:TPopUpCloseEvent; APopUpFormOptions:TPopUpFormOptions;