Don't iterate over files in wxFileSystemWatcherBase.

We ignore the files anyhow when recursively adding watches for the entire
tree, so don't include them in the iteration.

See #14543.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/fswatchercmn.cpp b/src/common/fswatchercmn.cpp
index 9891bb7f3c3ce854a2d7fdeffb0598ad1f5cebff..14c16bb5434994cbd4d71421d90f6b6b4c9987e5 100644 (file)
--- a/src/common/fswatchercmn.cpp
+++ b/src/common/fswatchercmn.cpp
@@ -199,7 +199,7 @@ bool wxFileSystemWatcherBase::AddTree(const wxFileName& path, int events,
 
     wxDir dir(path.GetFullPath());
     // Prevent asserts or infinite loops in trees containing symlinks
 
     wxDir dir(path.GetFullPath());
     // Prevent asserts or infinite loops in trees containing symlinks

-    int flags = wxDIR_DEFAULT; // TODO: we ignore files, so why use wxDIR_FILES?
+    int flags = wxDIR_DIRS;

     if ( !path.ShouldFollowLink() )
     {
         flags |= wxDIR_NO_FOLLOW;
     if ( !path.ShouldFollowLink() )
     {
         flags |= wxDIR_NO_FOLLOW;


@@ -270,7 +270,7 @@ bool wxFileSystemWatcherBase::RemoveTree(const wxFileName& path)
     // infinite loops in trees containing symlinks. We need to do the same
     // or we'll try to remove unwatched items. Let's hope the caller used
     // the same ShouldFollowLink() setting as in AddTree()...
     // infinite loops in trees containing symlinks. We need to do the same
     // or we'll try to remove unwatched items. Let's hope the caller used
     // the same ShouldFollowLink() setting as in AddTree()...

-    int flags = wxDIR_DEFAULT;  // See the TODO in AddTree()
+    int flags = wxDIR_DIRS;

     if ( !path.ShouldFollowLink() )
     {
         flags |= wxDIR_NO_FOLLOW;
     if ( !path.ShouldFollowLink() )
     {
         flags |= wxDIR_NO_FOLLOW;