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

Bug 23898 - responding to Abort in OnChange handler

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2691 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
zoran-vucenovic
2013-02-22 10:28:34 +00:00
parent 0cb50e0d02
commit aee597f739
1 changed files with 50 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
components/ZVDateTimeCtrls/trunk/zvdatetimepicker.pas
View File

@ -583,39 +583,38 @@ end;
procedure TDTCalendarForm.CloseCalendarForm(const AndSetTheDate: Boolean);
begin
if not FClosing then begin
SetClosingCalendarForm;
if Assigned(DTPicker) and DTPicker.IsVisible then begin
if AndSetTheDate then begin
Inc(DTPicker.FUserChanging);
try
if DTPicker.DateIsNull then begin
// we'll set the time to 0.0 (midnight):
DTPicker.SetDateTime(Int(Cal.DateTime));
end else if not EqualDateTime(Int(DTPicker.DateTime),
Int(Cal.DateTime)) then begin
// we'll change the date, but keep the time:
DTPicker.SetDateTime(ComposeDateTime(Cal.DateTime, DTPicker.DateTime));
end;
finally
Dec(DTPicker.FUserChanging);
end;
end;
if Screen.ActiveCustomForm = Self then
DTPicker.SetFocusIfPossible;
if not FClosing then
try
SetClosingCalendarForm;
Visible := False;
Close;
DTPicker.DoCloseUp;
if Assigned(DTPicker) and DTPicker.IsVisible then begin
end else
Close;
if AndSetTheDate then begin
Inc(DTPicker.FUserChanging);
try
if DTPicker.DateIsNull then begin
// we'll set the time to 0.0 (midnight):
DTPicker.SetDateTime(Int(Cal.DateTime));
end else if not EqualDateTime(Int(DTPicker.DateTime),
Int(Cal.DateTime)) then begin
// we'll change the date, but keep the time:
DTPicker.SetDateTime(ComposeDateTime(Cal.DateTime, DTPicker.DateTime));
end;
finally
Dec(DTPicker.FUserChanging);
end;
end;
end;
if Screen.ActiveCustomForm = Self then
DTPicker.SetFocusIfPossible;
DTPicker.DoCloseUp;
end;
finally
Release;
end;
end;
@ -2343,11 +2342,15 @@ begin
end;
procedure TCustomZVDateTimePicker.UpdateDate;
const
InRecursiveCall: Boolean = False;
var
W: Array[1..3] of Word;
WT: Array[TTimeTextPart] of Word;
YearPos, I: Integer;
TTP, TTPEnd: TTimeTextPart;
begin
FUserChangedText := False;
@ -2359,6 +2362,24 @@ begin
FDateTime := ComposeDateTime(FMinDate, FDateTime);
end;
if not InRecursiveCall then begin // we'll skip the next part in
// recursive calls which could be made through Change or UndoChanges
InRecursiveCall := True;
try
if FUserChanging > 0 then begin // this means that the change is caused by user interaction
try
Change;
except
UndoChanges;
raise;
end
end else
FConfirmedDateTime := FDateTime;
finally
InRecursiveCall := False;
end;
end;
if FKind in [dtkTime, dtkDateTime] then begin
if DateIsNull then begin
FTimeText[ttpHour] := '99';
@ -2460,11 +2481,6 @@ begin
for I := Low(FTextPart) to High(FTextPart) do
FTextPart[I] := '';
if FUserChanging > 0 then // this means that the change is caused by user interaction
Change
else
FConfirmedDateTime := FDateTime;
Invalidate;
end;