From 77c38e67886833cf2d9dee868310151accd262c8 Mon Sep 17 00:00:00 2001
From: alexs75 <alexs75@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Wed, 17 Jun 2015 08:09:34 +0000
Subject: [PATCH] RxFPC: TRxColumnEditButton add new property - Enabled.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4192 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/rx/trunk/rxdbgrid.pas | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/components/rx/trunk/rxdbgrid.pas b/components/rx/trunk/rxdbgrid.pas
index 4eab863ac..90a3ab963 100644
--- a/components/rx/trunk/rxdbgrid.pas
+++ b/components/rx/trunk/rxdbgrid.pas
@@ -365,6 +365,7 @@ type
 
   TRxColumnEditButton = class(TCollectionItem)
   private
+    FEnabled: Boolean;
     FShortCut: TShortCut;
     FStyle: TRxColumnEditButtonStyle;
     FButton:TSpeedButton;
@@ -393,6 +394,7 @@ type
     destructor Destroy; override;
   published
     //property DropdownMenu: TPopupMenu read FDropdownMenu write FDropdownMenu; :TODO:
+    property Enabled: Boolean read FEnabled write FEnabled default true;
     property Glyph: TBitmap read GetGlyph write SetGlyph;
     property Hint: String read GetHint write SetHint;
     property NumGlyphs: Integer read GetNumGlyphs write SetNumGlyphs default 1;
@@ -566,8 +568,6 @@ type
     FOldPosition: Integer;
     FVersion: integer;
     FPropertyStorageLink: TPropertyStorageLink;
-    FRxDbGridLookupComboEditor: TCustomControl;
-    FRxDbGridDateEditor: TWinControl;
 
     FAfterQuickSearch: TRxQuickSearchNotifyEvent;
     FBeforeQuickSearch: TRxQuickSearchNotifyEvent;
@@ -642,6 +642,8 @@ type
     procedure AddTools(ATools:TRxDBGridAbstractTools);
     procedure RemoveTools(ATools:TRxDBGridAbstractTools);
   protected
+    FRxDbGridLookupComboEditor: TCustomControl;
+    FRxDbGridDateEditor: TWinControl;
     //procedure UpdateHorzScrollBar(const aVisible: boolean; const aRange,aPage,aPos: Integer); override;
     //procedure UpdateVertScrollbar(const aVisible: boolean; const aRange,aPage,aPos: Integer); override;
 
@@ -1316,6 +1318,7 @@ begin
   FSpinBtn.OnTopClick:=@DoTopClick;
 
   FVisible:=true;
+  FEnabled:=true;
   Width:=15;
 end;
 
@@ -1559,8 +1562,16 @@ begin
 end;
 
 procedure TRxDBGridDateEditor.msg_SetValue(var Msg: TGridMessage);
+var
+  D: TDateTime;
 begin
-  Self.Date := FGrid.SelectedField.AsDateTime;
+  if FGrid.SelectedField.DataType in [ftDate, ftDateTime] then
+    Self.Date := FGrid.SelectedField.AsDateTime
+  else
+  if TryStrToDateTime(FGrid.SelectedField.AsString, D) then
+    Self.Date := D
+  else
+    Self.Clear;
 end;
 
 procedure TRxDBGridDateEditor.msg_GetValue(var Msg: TGridMessage);
@@ -1583,14 +1594,6 @@ begin
   UpdateMask;
 end;
 
-                    {
-procedure TRxDBGridDateEditor.SetBounds(aLeft, aTop, aWidth, aHeight: integer);
-begin
-  Dec(aWidth, 25); //ButtonWidth);
-  inherited SetBounds(aLeft, aTop, aWidth, aHeight);
-end;               }
-
-
 procedure TRxDBGridDateEditor.EditingDone;
 begin
   inherited EditingDone;
@@ -2865,7 +2868,7 @@ begin
     W:=0;
     for i:=0 to R.EditButtons.Count-1 do
     begin
-      if R.EditButtons[i].Visible then
+      if R.EditButtons[i].Visible and R.EditButtons[i].Enabled then
         W:=W+R.EditButtons[i].Width;
     end;
 
@@ -2883,7 +2886,7 @@ begin
       end;
 
       for i:=0 to R.EditButtons.Count-1 do
-      if R.EditButtons[i].Visible then
+      if R.EditButtons[i].Visible and R.EditButtons[i].Enabled then
       begin
         if R.EditButtons[i].Style = ebsUpDownRx then
         begin