Merge with default

[winmerge-jp/winmerge-jp.git] / Src / MainFrm.h

diff --git a/Src/MainFrm.h b/Src/MainFrm.h
index 0d7fa7a..39851e8 100644 (file)
--- a/Src/MainFrm.h
+++ b/Src/MainFrm.h
@@ -273,6 +273,8 @@ protected:
        afx_msg void OnUpdateDiffCaseSensitive(CCmdUI* pCmdUI);
        afx_msg void OnDiffIgnoreEOL();
        afx_msg void OnUpdateDiffIgnoreEOL(CCmdUI* pCmdUI);
+       afx_msg void OnIncludeSubfolders();
+       afx_msg void OnUpdateIncludeSubfolders(CCmdUI* pCmdUI);
        afx_msg void OnCompareMethod(UINT nID);
        afx_msg void OnUpdateCompareMethod(CCmdUI* pCmdUI);
        afx_msg void OnMRUs(UINT nID);
@@ -284,10 +286,10 @@ protected:
 private:
        void addToMru(LPCTSTR szItem, LPCTSTR szRegSubKey, UINT nMaxItems = 20);
        void FileNew(int nPanes);
-       const OpenDocList &GetAllOpenDocs();
-       const MergeDocList &GetAllMergeDocs();
-       const DirDocList &GetAllDirDocs();
-       const HexMergeDocList &GetAllHexMergeDocs();
+       OpenDocList &GetAllOpenDocs();
+       MergeDocList &GetAllMergeDocs();
+       DirDocList &GetAllDirDocs();
+       HexMergeDocList &GetAllHexMergeDocs();
        void UpdateFont(FRAMETYPE frame);
        BOOL CreateToolbar();
        BOOL CreateComboBoxOnToolbar();