Fix compilation errors on Test solution configuration

diff --git a/Src/Test.cpp b/Src/Test.cpp
index 681579b..b05e5cc 100644 (file)
--- a/Src/Test.cpp
+++ b/Src/Test.cpp
@@ -51,7 +51,7 @@ TEST(CodepageTest, UCS2)
                paths::ConcatPath(projectRoot, L"Testing/Data/Unicode/UCS-2BE/DiffItem.h"),\r
                paths::ConcatPath(projectRoot, L"Testing/Data/Unicode/UCS-2LE/DiffItem.h")\r
        };\r
-       EXPECT_TRUE(GetMainFrame()->DoFileOpen(&tFiles));\r
+       EXPECT_TRUE(GetMainFrame()->DoFileOrFolderOpen(&tFiles));\r
        CFrameWnd *pFrame = GetMainFrame()->GetActiveFrame();\r
        CMergeDoc *pDoc = dynamic_cast<CMergeDoc *>(pFrame->GetActiveDocument());\r
        ASSERT_NE(nullptr, pDoc);\r
@@ -69,7 +69,7 @@ TEST(CodepageTest, UTF8)
                paths::ConcatPath(projectRoot, L"Testing/Data/Unicode/UTF-8/DiffItem.h"),\r
                paths::ConcatPath(projectRoot, L"Testing/Data/Unicode/UTF-8-NOBOM/DiffItem.h")\r
        };\r
-       EXPECT_TRUE(GetMainFrame()->DoFileOpen(&tFiles));\r
+       EXPECT_TRUE(GetMainFrame()->DoFileOrFolderOpen(&tFiles));\r
        CFrameWnd *pFrame = GetMainFrame()->GetActiveFrame();\r
        CMergeDoc *pDoc = dynamic_cast<CMergeDoc *>(pFrame->GetActiveDocument());\r
        EXPECT_NE(nullptr, pDoc);\r
@@ -91,7 +91,7 @@ TEST(SyntaxHighlight, Verilog)
        };\r
        CMessageBoxDialog dlg(nullptr, IDS_FILE_TO_ITSELF, 0U, 0U, IDS_FILE_TO_ITSELF);\r
        const int nPrevFormerResult = dlg.SetFormerResult(IDOK);\r
-       EXPECT_TRUE(GetMainFrame()->DoFileOpen(&tFiles));\r
+       EXPECT_TRUE(GetMainFrame()->DoFileOrFolderOpen(&tFiles));\r
        CFrameWnd *pFrame = GetMainFrame()->GetActiveFrame();\r
        CMergeDoc *pDoc = dynamic_cast<CMergeDoc *>(pFrame->GetActiveDocument());\r
        EXPECT_NE(nullptr, pDoc);\r
@@ -124,7 +124,7 @@ TEST(FileCompare, FindText)
                paths::ConcatPath(projectRoot, _T("Testing/Data/FindText/test1.txt")),\r
                paths::ConcatPath(projectRoot, _T("Testing/Data/FindText/test1.txt")),\r
        };\r
-       EXPECT_TRUE(GetMainFrame()->DoFileOpen(&tFiles));\r
+       EXPECT_TRUE(GetMainFrame()->DoFileOrFolderOpen(&tFiles));\r
        pFrame = GetMainFrame()->GetActiveFrame();\r
        pDoc = dynamic_cast<CMergeDoc *>(pFrame->GetActiveDocument());\r
        EXPECT_NE(nullptr, pDoc);\r
@@ -230,7 +230,7 @@ TEST(FileCompare, LastLineEOL)
                                        };\r
                                        if (!pFrame)\r
                                        {\r
-                                               EXPECT_TRUE(GetMainFrame()->DoFileOpen(&tFiles));\r
+                                               EXPECT_TRUE(GetMainFrame()->DoFileOrFolderOpen(&tFiles));\r
                                                pFrame = GetMainFrame()->GetActiveFrame();\r
                                                pDoc = dynamic_cast<CMergeDoc *>(pFrame->GetActiveDocument());\r
                                                EXPECT_NE(nullptr, pDoc);\r
@@ -312,7 +312,7 @@ TEST(FolderCompare, IgnoreEOL)
        {\r
                GetOptionsMgr()->Set(OPT_CMP_METHOD, 0/* Full Contents*/);\r
                GetOptionsMgr()->Set(OPT_CMP_IGNORE_EOL, true);\r
-               EXPECT_TRUE(GetMainFrame()->DoFileOpen(&dirs));\r
+               EXPECT_TRUE(GetMainFrame()->DoFileOrFolderOpen(&dirs));\r
                CFrameWnd *pFrame = GetMainFrame()->GetActiveFrame();\r
                CDirDoc *pDoc = dynamic_cast<CDirDoc *>(pFrame->GetActiveDocument());\r
                EXPECT_NE(nullptr, pDoc);\r
@@ -509,7 +509,7 @@ TEST(ImageCompareTest, Open)
        };\r
        CMessageBoxDialog dlg(nullptr, IDS_FILESSAME, 0U, 0U, IDS_FILESSAME);\r
        const int nPrevFormerResult = dlg.SetFormerResult(IDOK);\r
-       EXPECT_TRUE(GetMainFrame()->DoFileOpen(&tFiles));\r
+       EXPECT_TRUE(GetMainFrame()->DoFileOrFolderOpen(&tFiles));\r
        CFrameWnd *pFrame = GetMainFrame()->GetActiveFrame();\r
        CImgMergeFrame *pDoc = dynamic_cast<CImgMergeFrame *>(pFrame);\r
        EXPECT_NE(nullptr, pDoc);\r
@@ -521,10 +521,10 @@ TEST(ImageCompareTest, Open)
 TEST(FileMenu, New)\r
 {\r
        CFrameWnd *pFrame;\r
-       GetMainFrame()->FileNew(2, CMainFrame::FRAMETYPE::FRAME_FILE, false);\r
+       GetMainFrame()->DoFileNew(ID_MERGE_COMPARE_TEXT, 2);\r
        pFrame = GetMainFrame()->GetActiveFrame();\r
        pFrame->PostMessage(WM_CLOSE);\r
-       GetMainFrame()->FileNew(3, CMainFrame::FRAMETYPE::FRAME_FILE, false);\r
+       GetMainFrame()->DoFileNew(ID_MERGE_COMPARE_TEXT, 3);\r
        pFrame = GetMainFrame()->GetActiveFrame();\r
        pFrame->PostMessage(WM_CLOSE);\r
 }\r

diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index 7eb499c..88c20d1 100644 (file)
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -1,11 +1,11 @@
 # This file is part from WinMerge <https://winmerge.org/>
 # Released under the "GNU General Public License"
-# 
+#
 # Translators:
 # * Ronald Schaap <ronald at schaap.demon.nl>
 # * Michel Coene
 # Thomas De Rocker, 2021
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: WinMerge\n"