From: Flaviu <Flaviu@DESKTOP-HP>
Date: Thu, 2 Jan 2020 18:06:58 +0000 (+0200)
Subject: modifications
X-Git-Tag: 2.16.6~39^2~5
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3347ce19a5ee6af716745152f0e7f3d3e7fafd8a;p=winmerge-jp%2Fwinmerge-jp.git

modifications
---

diff --git a/Src/MergeEditFrm.cpp b/Src/MergeEditFrm.cpp
index 682c5e059..77b9b75ab 100644
--- a/Src/MergeEditFrm.cpp
+++ b/Src/MergeEditFrm.cpp
@@ -279,7 +279,7 @@ BOOL CMergeEditFrame::DestroyWindow()
 	SavePosition();
 	SaveActivePane();
 	SaveWindowState();
-	return CMDIChildWnd::DestroyWindow();
+	return CMergeFrameCommon::DestroyWindow();
 }
 
 /**
@@ -315,7 +315,7 @@ void CMergeEditFrame::SaveActivePane()
 void CMergeEditFrame::OnClose() 
 {
 	// clean up pointers.
-	CMDIChildWnd::OnClose();
+	CMergeFrameCommon::OnClose();
 
 	GetMainFrame()->ClearStatusbarItemCount();
 }
@@ -388,7 +388,7 @@ void CMergeEditFrame::UpdateSplitter()
 void CMergeEditFrame::OnIdleUpdateCmdUI()
 {
 	UpdateHeaderSizes();
-	CMDIChildWnd::OnIdleUpdateCmdUI();
+	CMergeFrameCommon::OnIdleUpdateCmdUI();
 }
 
 void CMergeEditFrame::OnTimer(UINT_PTR nIDEvent) 
@@ -402,12 +402,12 @@ void CMergeEditFrame::OnTimer(UINT_PTR nIDEvent)
 	{
 		UpdateHeaderSizes();
 	}
-	CMDIChildWnd::OnTimer(nIDEvent);
+	CMergeFrameCommon::OnTimer(nIDEvent);
 }
 
 void CMergeEditFrame::OnMDIActivate(BOOL bActivate, CWnd* pActivateWnd, CWnd* pDeactivateWnd)
 {
-	CMDIChildWnd::OnMDIActivate(bActivate, pActivateWnd, pDeactivateWnd);
+	CMergeFrameCommon::OnMDIActivate(bActivate, pActivateWnd, pDeactivateWnd);
 
 	CMergeDoc *pDoc = GetMergeDoc();
 	if (bActivate && pDoc != nullptr)