Test solution configuration: Reduce test time (77s -> 68s)

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index e2f9c66..5b0b2e8 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -172,6 +172,7 @@ BEGIN_MESSAGE_MAP(CMainFrame, CMDIFrameWnd)
        ON_COMMAND(ID_HELP_CONTENTS, OnHelpContents)
        ON_WM_CLOSE()
        ON_COMMAND(ID_TOOLS_GENERATEPATCH, OnToolsGeneratePatch)
+       ON_WM_TIMER()
        ON_WM_DESTROY()
        ON_COMMAND_RANGE(ID_UNPACK_MANUAL, ID_UNPACK_AUTO, OnPluginUnpackMode)
        ON_UPDATE_COMMAND_UI_RANGE(ID_UNPACK_MANUAL, ID_UNPACK_AUTO, OnUpdatePluginUnpackMode)
@@ -355,6 +356,26 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
        return 0;
 }
 
+void CMainFrame::OnTimer(UINT_PTR nIDEvent)
+{
+       CMDIFrameWnd::OnTimer(nIDEvent);
+
+       if (nIDEvent == IDT_UPDATEMAINMENU)
+       {
+               KillTimer(nIDEvent);
+
+               BOOL bMaximized;
+               MDIGetActive(&bMaximized);
+
+               // When MDI maximized the window icon is drawn on the menu bar, so we
+               // need to notify it that our icon has changed.
+               if (bMaximized)
+                       DrawMenuBar();
+
+               OnUpdateFrameTitle(FALSE);
+       }
+}
+
 void CMainFrame::OnDestroy(void)
 {
        if (m_pDropHandler != nullptr)

diff --git a/Src/MainFrm.h b/Src/MainFrm.h
index 8b85822..16abd90 100644 (file)
--- a/Src/MainFrm.h
+++ b/Src/MainFrm.h
@@ -290,6 +290,7 @@ protected:
        afx_msg void OnUpdateCompareMethod(CCmdUI* pCmdUI);
        afx_msg void OnMRUs(UINT nID);
        afx_msg void OnUpdateNoMRUs(CCmdUI* pCmdUI);
+    afx_msg void OnTimer(UINT_PTR nIDEvent);
        afx_msg void OnDestroy();
        afx_msg void OnAccelQuit();
        //}}AFX_MSG

diff --git a/Src/Merge.h b/Src/Merge.h
index 34e2c7f..b5d27c6 100644 (file)
--- a/Src/Merge.h
+++ b/Src/Merge.h
@@ -15,6 +15,7 @@
 #define WMU_CHILDFRAMEREMOVED                                  (WM_APP + 11)
 #define WMU_CHILDFRAMEACTIVATE                                 (WM_APP + 12)
 #define WMU_CHILDFRAMEACTIVATED                                        (WM_APP + 13)
+#define IDT_UPDATEMAINMENU 1
 
 #ifndef __AFXWIN_H__
        #error include 'stdafx.h' before including this file for PCH

diff --git a/Src/MergeFrameCommon.cpp b/Src/MergeFrameCommon.cpp
index 905510f..4e98613 100644 (file)
--- a/Src/MergeFrameCommon.cpp
+++ b/Src/MergeFrameCommon.cpp
@@ -93,16 +93,7 @@ void CMergeFrameCommon::SetLastCompareResult(int nResult)
        {\r
                SetIcon(hReplace, TRUE);\r
 \r
-               BOOL bMaximized;\r
-               GetMDIFrame()->MDIGetActive(&bMaximized);\r
-\r
-               // When MDI maximized the window icon is drawn on the menu bar, so we\r
-               // need to notify it that our icon has changed.\r
-               if (bMaximized)\r
-               {\r
-                       GetMDIFrame()->DrawMenuBar();\r
-               }\r
-               GetMDIFrame()->OnUpdateFrameTitle(FALSE);\r
+               AfxGetMainWnd()->SetTimer(IDT_UPDATEMAINMENU, 500, nullptr);\r
        }\r
 \r
        theApp.SetLastCompareResult(nResult);\r