paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-18 04:49:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: remove default param from FilterEdit.ForceFilter(). Add method Reset().

Browse Source 
git-svn-id: trunk@45068 -
This commit is contained in:
juha 2014-05-18 08:57:17 +00:00
parent 8bf7b2db6e
commit c4cfaaa5d5
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lcl/editbtn.pas
View File

@ -418,7 +418,8 @@ type
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
procedure InvalidateFilter;
function ForceFilter(AFilter : String = '') : String;
procedure Reset;
function ForceFilter(AFilter: String) : String;
procedure StoreSelection; virtual; abstract;
procedure RestoreSelection; virtual; abstract;
public
@ -1891,10 +1892,8 @@ begin
fSelectedPart:=Nil;
RestoreSelection;
end
else begin
if [csDestroying,csDesigning]*ComponentState=[] then
InvalidateFilter;
end;
else if [csDestroying,csDesigning]*ComponentState=[] then
InvalidateFilter;
end;
procedure TCustomControlFilterEdit.InvalidateFilter;
@ -1903,7 +1902,13 @@ begin
IdleConnected:=true;
end;
procedure TCustomControlFilterEdit.Reset;
begin
Filter := '';
end;
function TCustomControlFilterEdit.ForceFilter(AFilter: String): String;
// Apply a new filter immediately without waiting for idle. Returns the previous filter.
begin
Result := FFilter;
FFilter := AFilter;

6
packager/packageeditor.pas
View File

@ -1796,7 +1796,7 @@ var
OldFilter : String;
begin
if LazPackage=nil then exit;
OldFilter := FilterEdit.ForceFilter;
OldFilter := FilterEdit.ForceFilter('');
// files belonging to package
FilesBranch:=FilterEdit.GetBranch(FFilesNode);
@ -1849,7 +1849,7 @@ var
NodeData: TPENodeData;
begin
if LazPackage=nil then exit;
OldFilter := FilterEdit.ForceFilter;
OldFilter := FilterEdit.ForceFilter('');
// required packages
RequiredBranch:=FilterEdit.GetBranch(FRequiredPackagesNode);
@ -2437,7 +2437,7 @@ var
begin
EnvironmentOptions.PackageEditorSortAlphabetically := SortAlphabetically;
EnvironmentOptions.PackageEditorShowDirHierarchy := ShowDirectoryHierarchy;
FilterEdit.ForceFilter;
FilterEdit.ForceFilter('');
for nt:=Low(TPENodeType) to High(TPENodeType) do
FreeNodeData(nt);
if PackageEditorMenuRoot.MenuItem=FilesPopupMenu.Items then