From 38ac510e852f88d0fa21e9f6416b45c6c949c6ae Mon Sep 17 00:00:00 2001
From: alexs75 <alexs75@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sat, 12 May 2012 17:51:20 +0000
Subject: [PATCH] improved draw TRCloockupCombobox, new propertys for RxDbGrid
 - SortField and SortOrder

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2431 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/rx/rxdbgrid.pas | 28 ++++++++++++++++++++--------
 components/rx/rxlookup.pas |  2 +-
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/components/rx/rxdbgrid.pas b/components/rx/rxdbgrid.pas
index 5c7eab640..313546bed 100644
--- a/components/rx/rxdbgrid.pas
+++ b/components/rx/rxdbgrid.pas
@@ -416,6 +416,7 @@ type
     function GetFooterColor: TColor;
     function GetFooterRowCount: integer;
     function GetPropertyStorage: TCustomPropertyStorage;
+    function GetSortField: string;
     function GetTitleButtons: boolean;
     function IsColumnsStored: boolean;
     procedure SetAutoSort(const AValue: boolean);
@@ -508,16 +509,23 @@ type
     procedure Loaded; override;
     procedure UpdateFooterRowOnUpdateActive;
   public
-    procedure FilterRec(DataSet: TDataSet; var Accept: boolean);
-
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
+
+    procedure FilterRec(DataSet: TDataSet; var Accept: boolean);
     function EditorByStyle(Style: TColumnButtonStyle): TWinControl; override;
     procedure LayoutChanged; override;
     procedure ShowFindDialog;
     procedure ShowColumnsDialog;
     function ColumnByFieldName(AFieldName: string): TRxColumn;
     function ColumnByCaption(ACaption: string): TRxColumn;
+    procedure CalcStatTotals;
+    procedure OptimizeColumnsWidth(AColList: string);
+    procedure OptimizeColumnsWidthAll;
+    procedure UpdateTitleHight;
+    procedure GetOnCreateLookup;
+    procedure GetOnDisplayLookup;
+
     property Canvas;
     property DefaultTextStyle;
     property EditorBorderStyle;
@@ -526,14 +534,10 @@ type
     property FastEditing;
     property FocusRectVisible;
     property SelectedRows;
-    procedure CalcStatTotals;
-    procedure OptimizeColumnsWidth(AColList: string);
-    procedure OptimizeColumnsWidthAll;
-    procedure UpdateTitleHight;
     property QuickUTF8Search: string read FQuickUTF8Search write SetQuickUTF8Search;
+    property SortField:string read GetSortField;
+    property SortOrder:TSortMarker read FSortOrder;
 
-    procedure GetOnCreateLookup;
-    procedure GetOnDisplayLookup;
   published
     property AfterQuickSearch: TRxQuickSearchNotifyEvent
       read FAfterQuickSearch write FAfterQuickSearch;
@@ -1304,6 +1308,14 @@ begin
   Result := FPropertyStorageLink.Storage;
 end;
 
+function TRxDBGrid.GetSortField: string;
+begin
+  if Assigned(FSortField) then
+    Result:=FSortField.FieldName
+  else
+    Result:='';
+end;
+
 function TRxDBGrid.GetTitleButtons: boolean;
 begin
   Result := dgHeaderPushedLook in Options;
diff --git a/components/rx/rxlookup.pas b/components/rx/rxlookup.pas
index f7d872036..c516193f3 100644
--- a/components/rx/rxlookup.pas
+++ b/components/rx/rxlookup.pas
@@ -913,7 +913,7 @@ begin
     F:=LookupSource.DataSet.FieldByName(FFieldList[i]);
     S := FValuesList[i];
 
-    if FPopUpFormOptions.Columns.Count>i then
+    if (FPopUpFormOptions.Columns.Count>i) and (I<LastIndex) then
       W := FPopUpFormOptions.Columns[i].Width
     else
     begin