From 3dc637963b46fc65a47cb0b10f5b78d164895073 Mon Sep 17 00:00:00 2001
From: Dennis Lim <dlkj@users.sourceforge.net>
Date: Tue, 8 May 2001 12:57:10 +0000
Subject: [PATCH] Add OnFileSave method Fix DoSave so that filename is update
 when 'save as'.

---
 Src/MergeDoc.cpp | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
 Src/MergeDoc.h   |  1 +
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index fbc9641d0..e758da286 100644
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -34,6 +34,7 @@
 #include "VssPrompt.h"
 #include "MergeEditView.h"
 #include "cs2cs.h"
+#include "childFrm.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -48,6 +49,7 @@ IMPLEMENT_DYNCREATE(CMergeDoc, CDocument)
 
 BEGIN_MESSAGE_MAP(CMergeDoc, CDocument)
 	//{{AFX_MSG_MAP(CMergeDoc)
+	ON_COMMAND(ID_FILE_SAVE, OnFileSave)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -619,9 +621,36 @@ BOOL CMergeDoc::DoSave(LPCTSTR szPath, CMergeEditView * /*pList*/, BOOL bLeft)
 	if (!mf->CreateBackup(strSavePath))
 		return FALSE;
 
+	BOOL result;
 	if(bLeft)
-		return m_ltBuf.SaveToFile(strSavePath);
-	return m_rtBuf.SaveToFile(strSavePath);
+	{
+		result = m_ltBuf.SaveToFile(strSavePath);
+		if(result)
+		{
+			m_strLeftFile = strSavePath;
+			CChildFrame *parent = dynamic_cast<CChildFrame*>(dynamic_cast<CMDIFrameWnd*>(AfxGetMainWnd())->MDIGetActive());
+			if(parent)
+			{
+				parent->SetHeaderText(0, m_strLeftFile);
+			}
+		}
+	}
+	else
+	{
+		result = m_rtBuf.SaveToFile(strSavePath);
+		if(result)
+		{
+			m_strRightFile = strSavePath;
+			CChildFrame *parent = dynamic_cast<CChildFrame*>(dynamic_cast<CMDIFrameWnd*>(AfxGetMainWnd())->MDIGetActive());
+			if(parent)
+			{
+				parent->SetHeaderText(1, m_strRightFile);
+			}
+		}
+	}
+	return result;
+
+
 }
 
 
@@ -972,3 +1001,18 @@ void CMergeDoc::FlushAndRescan()
 
 	mf->m_pLeft->UpdateStatusMessage();
 }
+
+void CMergeDoc::OnFileSave() 
+{
+	if (mf->m_pLeft && mf->m_pLeft->IsModified())
+	{
+		if (DoSave(m_strLeftFile, mf->m_pLeft, TRUE))
+			mf->m_pLeft->ResetMod();
+	}
+
+	if (mf->m_pRight && mf->m_pRight->IsModified())
+	{
+		if (DoSave(m_strRightFile, mf->m_pRight, FALSE))
+			mf->m_pRight->ResetMod();
+	}
+}
diff --git a/Src/MergeDoc.h b/Src/MergeDoc.h
index 183812f22..773d662db 100644
--- a/Src/MergeDoc.h
+++ b/Src/MergeDoc.h
@@ -170,6 +170,7 @@ protected:
 	CString m_strTempRightFile;
 	CString m_strTempLeftFile;
 	//{{AFX_MSG(CMergeDoc)
+	afx_msg void OnFileSave();
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 };
-- 
2.11.0