Merge with default

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

diff --git a/Src/MainFrm.h b/Src/MainFrm.h
index 1f5fab8..39851e8 100644 (file)
--- a/Src/MainFrm.h
+++ b/Src/MainFrm.h
@@ -42,6 +42,7 @@ class SyntaxColors;
 class LineFiltersList;
 class TempFile;
 struct FileLocation;
+class SourceControl;
 class DropHandler;
 
 typedef std::shared_ptr<TempFile> TempFilePtr;
@@ -112,8 +113,6 @@ public:
        CString SetStatus(LPCTSTR status);
        void ClearStatusbarItemCount();
        void ApplyDiffOptions();
-       void ApplyViewWhitespace();
-       void SetEOLMixed(BOOL bAllow);
        void SelectFilter();
        void StartFlashing();
        bool AskCloseConfirmation();
@@ -137,6 +136,7 @@ public:
 protected:
        virtual ~CMainFrame();
 
+
 // Public implementation data
 public:
        BOOL m_bFirstTime; /**< If first time frame activated, get  pos from reg */
@@ -212,18 +212,6 @@ protected:
        afx_msg void OnMeasureItem(int nIDCtl, LPMEASUREITEMSTRUCT lpMeasureItemStruct);
        afx_msg LRESULT OnMenuChar(UINT nChar, UINT nFlags, CMenu* pMenu) ;
        afx_msg void OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu);
-       afx_msg void OnOptionsShowDifferent();
-       afx_msg void OnOptionsShowIdentical();
-       afx_msg void OnOptionsShowUniqueLeft();
-       afx_msg void OnOptionsShowUniqueRight();
-       afx_msg void OnOptionsShowBinaries();
-       afx_msg void OnOptionsShowSkipped();
-       afx_msg void OnUpdateOptionsShowdifferent(CCmdUI* pCmdUI);
-       afx_msg void OnUpdateOptionsShowidentical(CCmdUI* pCmdUI);
-       afx_msg void OnUpdateOptionsShowuniqueleft(CCmdUI* pCmdUI);
-       afx_msg void OnUpdateOptionsShowuniqueright(CCmdUI* pCmdUI);
-       afx_msg void OnUpdateOptionsShowBinaries(CCmdUI* pCmdUI);
-       afx_msg void OnUpdateOptionsShowSkipped(CCmdUI* pCmdUI);
        afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
        afx_msg void OnFileOpen();
        afx_msg void OnHelpGnulicense();
@@ -235,11 +223,8 @@ protected:
        afx_msg void OnHelpContents();
        afx_msg void OnUpdateHelpContents(CCmdUI* pCmdUI);
        afx_msg void OnClose();
-       afx_msg void OnViewWhitespace();
-       afx_msg void OnUpdateViewWhitespace(CCmdUI* pCmdUI);
        afx_msg void OnToolsGeneratePatch();
        afx_msg void OnDropFiles(const std::vector<String>& files);
-       afx_msg BOOL OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message);
        afx_msg void OnUpdatePluginUnpackMode(CCmdUI* pCmdUI);
        afx_msg void OnPluginUnpackMode(UINT nID);
        afx_msg void OnUpdatePluginPrediffMode(CCmdUI* pCmdUI);
@@ -288,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);
@@ -299,14 +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();
-       void RedisplayAllDirDocs();
-       CMergeDoc * GetMergeDocToShow(int nFiles, CDirDoc * pDirDoc);
-       CHexMergeDoc * GetHexMergeDocToShow(int nDirs, CDirDoc * pDirDoc);
-       CDirDoc * GetDirDocToShow(int nDirs, BOOL * pNew);
+       OpenDocList &GetAllOpenDocs();
+       MergeDocList &GetAllMergeDocs();
+       DirDocList &GetAllDirDocs();
+       HexMergeDocList &GetAllHexMergeDocs();
        void UpdateFont(FRAMETYPE frame);
        BOOL CreateToolbar();
        BOOL CreateComboBoxOnToolbar();