Merge with stable

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

diff --git a/Src/MainFrm.h b/Src/MainFrm.h
index 08473db..1a6884d 100644 (file)
--- a/Src/MainFrm.h
+++ b/Src/MainFrm.h
@@ -306,9 +306,6 @@ private:
        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);
        void UpdateFont(FRAMETYPE frame);
        BOOL CreateToolbar();
        BOOL CreateComboBoxOnToolbar();