diff --git a/include/wx/fswatcher.h b/include/wx/fswatcher.h index 959bcf8a8a..9792bce12b 100644 --- a/include/wx/fswatcher.h +++ b/include/wx/fswatcher.h @@ -305,6 +305,13 @@ public: m_owner = handler; } + + // This is a semi-private function used by wxWidgets itself only. + // + // Delegates the real work of adding the path to wxFSWatcherImpl::Add() and + // updates m_watches if the new path was successfully added. + bool AddAny(const wxFileName& path, int events, wxFSWPathType type); + protected: static wxString GetCanonicalPath(const wxFileName& path) @@ -320,10 +327,6 @@ protected: return path_copy.GetFullPath(); } - // Delegates the real work of adding the path to wxFSWatcherImpl::Add() and - // updates m_watches if the new path was successfully added. - bool DoAdd(const wxFileName& path, int events, wxFSWPathType type); - wxFSWatchInfoMap m_watches; // path=>wxFSWatchInfo map wxFSWatcherImpl* m_service; // file system events service diff --git a/src/common/fswatchercmn.cpp b/src/common/fswatchercmn.cpp index 9983369c41..7382c2f6fb 100644 --- a/src/common/fswatchercmn.cpp +++ b/src/common/fswatchercmn.cpp @@ -95,13 +95,13 @@ bool wxFileSystemWatcherBase::Add(const wxFileName& path, int events) return false; } - return DoAdd(path, events, type); + return AddAny(path, events, type); } bool -wxFileSystemWatcherBase::DoAdd(const wxFileName& path, - int events, - wxFSWPathType type) +wxFileSystemWatcherBase::AddAny(const wxFileName& path, + int events, + wxFSWPathType type) { wxString canonical = GetCanonicalPath(path); if (canonical.IsEmpty()) @@ -163,7 +163,7 @@ bool wxFileSystemWatcherBase::AddTree(const wxFileName& path, int events, { wxLogTrace(wxTRACE_FSWATCHER, "--- AddTree adding file '%s' ---", filename); - m_watcher->DoAdd(wxFileName::FileName(filename), + m_watcher->AddAny(wxFileName::FileName(filename), m_events, wxFSWPath_File); return wxDIR_CONTINUE; } @@ -173,7 +173,7 @@ bool wxFileSystemWatcherBase::AddTree(const wxFileName& path, int events, wxLogTrace(wxTRACE_FSWATCHER, "--- AddTree adding directory '%s' ---", dirname); // we add as much as possible and ignore errors - m_watcher->DoAdd(wxFileName::DirName(dirname), + m_watcher->AddAny(wxFileName::DirName(dirname), m_events, wxFSWPath_Dir); return wxDIR_CONTINUE; } diff --git a/src/msw/fswatcher.cpp b/src/msw/fswatcher.cpp index a186acd2ca..69c19e19b7 100644 --- a/src/msw/fswatcher.cpp +++ b/src/msw/fswatcher.cpp @@ -431,7 +431,7 @@ wxMSWFileSystemWatcher::AddTree(const wxFileName& path, return false; } - return DoAdd(path, events, wxFSWPath_Tree); + return AddAny(path, events, wxFSWPath_Tree); } #endif // wxUSE_FSWATCHER