From 94f7f9f8ce236df663afa39b6152a410da8c3d87 Mon Sep 17 00:00:00 2001
From: alexs75 <alexs75@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Thu, 14 Jul 2016 06:14:30 +0000
Subject: [PATCH] RxFPC: fix compile with latest lazarus - utf8

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4949 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/rx/trunk/exsortzeos.pas  | 11 +++++++++--
 components/rx/trunk/rxpopupunit.pas |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

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;