paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-03 15:39:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

LCL, fix DatasetActions, issue #17575

Browse Source 
git-svn-id: trunk@27956 -
This commit is contained in:
jesus 2010-10-29 20:25:39 +00:00
parent 77ced8537a
commit 0629c5baf0
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lcl/dbactns.pp
View File

@ -157,7 +157,7 @@ function TDataSetAction.HandlesTarget(Target: TObject): Boolean;
begin
Result:=(DataSource<>Nil);
if Result then
if Result and (DataSource=Target) then
Result:=(DataSource.DataSet<>Nil)
else
Result:=(Target is TDataSource) and (TDataSource(Target).DataSet<>Nil);
@ -352,4 +352,4 @@ begin
end;
end.
end.

21
lcl/include/customform.inc
View File

@ -1531,23 +1531,28 @@ end;
function TCustomForm.DoUpdateAction(TheAction: TBasicAction): boolean;
function ProcessUpdate(Control: TControl): Boolean;
function ProcessUpdate(Component: TComponent): Boolean;
begin
Result := (Control <> nil) and
Control.UpdateAction(TheAction);
Result := (Component <> nil) and
Component.UpdateAction(TheAction);
end;
function ComponentAllowed(Component: TComponent): Boolean;
begin
result := not (Component is TControl) or TControl(Component).Visible;
end;
function TraverseClients(Container: TWinControl): Boolean;
var
I: Integer;
Control: TControl;
Component: TComponent;
begin
if Container.Showing then
for I := 0 to Container.ControlCount - 1 do
for I := 0 to Container.ComponentCount - 1 do
begin
Control := Container.Controls[I];
if Control.Visible and ProcessUpdate(Control)
or (Control is TWinControl) and TraverseClients(TWinControl(Control))
Component := Container.Components[I];
if ComponentAllowed(Component) and ProcessUpdate(Component)
or (Component is TWinControl) and TraverseClients(TWinControl(Component))
then begin
Result := True;
exit;