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

RxFPC:patch for RXDBTimeEdit and RXDBSpinEdit from linux-man (0033751, 0033752)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6428 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2018-05-17 11:42:29 +00:00
parent b8c566bd76
commit 238d0aaa15
3 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/rx/trunk/docs/readmy.txt
View File

@ -2,6 +2,7 @@
brick08 - from freepascal.ru brick08 - from freepascal.ru
rtn - from freepascal.ru rtn - from freepascal.ru
kit - from freepascal.ru kit - from freepascal.ru
linux-man
Component icon images: Component icon images:
zoltanleo aka Док zoltanleo aka Док

11
components/rx/trunk/rxdb/rxdbspinedit.pas
View File

@ -61,6 +61,8 @@ type
procedure CMGetDataLink(var Message: TLMessage); message CM_GETDATALINK; procedure CMGetDataLink(var Message: TLMessage); message CM_GETDATALINK;
function IsReadOnly: boolean; function IsReadOnly: boolean;
protected protected
FUpdating:Boolean;
procedure SetValue(const AValue: Double); override;
function GetReadOnly: Boolean;override; function GetReadOnly: Boolean;override;
procedure SetReadOnly(AValue: Boolean);override; procedure SetReadOnly(AValue: Boolean);override;
property DataField: string read GetDataField write SetDataField; property DataField: string read GetDataField write SetDataField;
@ -251,6 +253,7 @@ end;
procedure TCustomRxDBSpinEdit.Change; procedure TCustomRxDBSpinEdit.Change;
begin begin
IF FUpdating then exit;
FDatalink.Edit; FDatalink.Edit;
FDataLink.Modified; FDataLink.Modified;
inherited Change; inherited Change;
@ -263,6 +266,14 @@ begin
Result := (Field = nil) or Field.ReadOnly; Result := (Field = nil) or Field.ReadOnly;
end; end;
procedure TCustomRxDBSpinEdit.SetValue(const AValue: Double);
begin
FUpdating:=true;
inherited SetValue(AValue);
Modified:=false;
FUpdating:=false;
end;
procedure TCustomRxDBSpinEdit.Loaded; procedure TCustomRxDBSpinEdit.Loaded;
begin begin
inherited Loaded; inherited Loaded;

25
components/rx/trunk/rxdb/rxdbtimeedit.pas
View File

@ -65,6 +65,8 @@ type
protected protected
function GetReadOnly: Boolean;override; function GetReadOnly: Boolean;override;
procedure SetReadOnly(AValue: Boolean);override; procedure SetReadOnly(AValue: Boolean);override;
procedure UpClick(Sender: TObject); override;
procedure DownClick(Sender: TObject); override;
property DataField: string read GetDataField write SetDataField; property DataField: string read GetDataField write SetDataField;
property DataSource: TDataSource read GetDataSource write SetDataSource; property DataSource: TDataSource read GetDataSource write SetDataSource;
procedure KeyDown(var Key: Word; Shift: TShiftState); override; procedure KeyDown(var Key: Word; Shift: TShiftState); override;
@ -131,6 +133,7 @@ type
property PasswordChar; property PasswordChar;
property PopupMenu; property PopupMenu;
property ShowHint; property ShowHint;
property ShowSecond;
property TabOrder; property TabOrder;
property TabStop; property TabStop;
property Visible; property Visible;
@ -253,6 +256,8 @@ end;
procedure TCustomRxDBTimeEdit.KeyDown(var Key: Word; Shift: TShiftState); procedure TCustomRxDBTimeEdit.KeyDown(var Key: Word; Shift: TShiftState);
begin begin
inherited KeyDown(Key, Shift); inherited KeyDown(Key, Shift);
if not IsReadOnly then
FDatalink.Edit;
if Key=VK_ESCAPE then if Key=VK_ESCAPE then
begin begin
//cancel out of editing by reset on esc //cancel out of editing by reset on esc
@ -261,12 +266,6 @@ begin
Key := VK_UNKNOWN; Key := VK_UNKNOWN;
end end
else else
if Key=VK_DELETE then
begin
if not IsReadOnly then
FDatalink.Edit;
end
else
if Key=VK_TAB then if Key=VK_TAB then
begin begin
if FDataLink.CanModify and FDatalink.Editing then if FDataLink.CanModify and FDatalink.Editing then
@ -274,6 +273,20 @@ begin
end; end;
end; end;
procedure TCustomRxDBTimeEdit.UpClick(Sender: TObject);
begin
if not IsReadOnly then
FDatalink.Edit;
inherited;
end;
procedure TCustomRxDBTimeEdit.DownClick(Sender: TObject);
begin
if not IsReadOnly then
FDatalink.Edit;
inherited;
end;
procedure TCustomRxDBTimeEdit.Change; procedure TCustomRxDBTimeEdit.Change;
begin begin
if Assigned(FDatalink) then if Assigned(FDatalink) then