Don't edit file filters through FileFilterHelper. Removes CMainFrame dependency from...

diff --git a/Src/FileFilterHelper.cpp b/Src/FileFilterHelper.cpp
index bb66e3f..f324e0a 100644 (file)
--- a/Src/FileFilterHelper.cpp
+++ b/Src/FileFilterHelper.cpp
@@ -25,7 +25,6 @@
 #include "stdafx.h"
 #include "Ucs2Utf8.h"
 #include "UnicodeString.h"
-#include "MainFrm.h"
 #include "FilterList.h"
 #include "DirItem.h"
 #include "FileFilterMgr.h"
@@ -297,15 +296,6 @@ BOOL FileFilterHelper::includeDir(LPCTSTR szDirName)
 }
 
 /**
- * @brief Open filter file to external editor for modifying.
- * @param [in] szFileFilterterPath Path of filter file to edit.
- */
-void FileFilterHelper::EditFileFilter(LPCTSTR szFileFilterPath)
-{
-       CMainFrame::OpenFileToExternalEditor(szFileFilterPath);
-}
-
-/**
  * @brief Load in all filter patterns in a directory (unless already in map).
  * @param [in] sPattern Directory wildcard defining files to add to map as filter files.
  * It is directoryname + filemask, for example, for a filter for all users:

diff --git a/Src/FileFilterHelper.h b/Src/FileFilterHelper.h
index a61a707..79188b9 100644 (file)
--- a/Src/FileFilterHelper.h
+++ b/Src/FileFilterHelper.h
@@ -104,7 +104,6 @@ public:
 
        FileFilterMgr * GetManager() const;
        void SetFileFilterPath(LPCTSTR szFileFilterPath);
-       void EditFileFilter(LPCTSTR szFileFilterPath);
        void GetFileFilters(std::vector<FileFilterInfo> * filters, String & selected) const;
        String GetFileFilterName(LPCTSTR filterPath) const;
        String GetFileFilterPath(LPCTSTR filterName) const;

diff --git a/Src/FileFiltersDlg.cpp b/Src/FileFiltersDlg.cpp
index 88274ac..219e1fa 100644 (file)
--- a/Src/FileFiltersDlg.cpp
+++ b/Src/FileFiltersDlg.cpp
@@ -245,11 +245,20 @@ void FileFiltersDlg::OnFiltersEditbtn()
        if (sel > 0)
        {
                CString path = m_listFilters.GetItemText(sel, 2);
-               theApp.m_globalFileFilter.EditFileFilter(path);
+               EditFileFilter(path);
        }
 }
 
 /**
+ * @brief Edit file filter in external editor.
+ * @param [in] path Full path to file filter to edit.
+ */
+void FileFiltersDlg::EditFileFilter(LPCTSTR path)
+{
+       CMainFrame::OpenFileToExternalEditor(path);
+}
+
+/**
  * @brief Edit selected filter when its double-clicked.
  * @param [in] pNMHDR List control item data.
  * @param [out] pResult Result of the action is returned in here.
@@ -465,7 +474,7 @@ void FileFiltersDlg::OnBnClickedFilterfileNewbutton()
                        ResMsgBox1(IDS_FILEFILTER_TMPL_COPY, templatePath.c_str(), MB_ICONERROR);
                        return;
                }
-               theApp.m_globalFileFilter.EditFileFilter(s);
+               EditFileFilter(s);
                FileFilterMgr *pMgr = theApp.m_globalFileFilter.GetManager();
                int retval = pMgr->AddFilter(s);
                if (retval == FILTER_OK)

diff --git a/Src/FileFiltersDlg.h b/Src/FileFiltersDlg.h
index 859e2e8..3754cb9 100644 (file)
--- a/Src/FileFiltersDlg.h
+++ b/Src/FileFiltersDlg.h
@@ -59,12 +59,13 @@ private:
        //}}AFX_DATA
 
 // Implementation methods
-private:
+protected:
        void InitList();
        void SelectFilterByIndex(int index);
        void AddToGrid(int filterIndex);
        bool IsFilterItemNone(int item) const;
        void UpdateFiltersList();
+       void EditFileFilter(LPCTSTR path);
 
 // Overrides
        // ClassWizard generated virtual function overrides