Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-06-20 Kimmo
+ BUG: [ 1505763 ] Crash after closing file compare window
+ Src: MergeEditView.cpp
+
2006-06-19 Gal
RFE: [ 1499245 ] Ruby Syntax Highlighting
Src: Merge.dsp
BUG: [ 1486434 ] Copy Pathnames for right-only dir copies parent dir only
Src: DirView.cpp
-2006-05-31
+2006-05-31 Kimmo
PATCH: [ 1483544 ] New compare method: by date and size
Src: DiffWrapper.h DirScan.cpp Merge.rc PropCompare.cpp resource.h
Src/Languages/*: Merge*.rc
}
/**
- * @brief Called when user selects Window/Close, allows user to save files.
+ * @brief Called when user selects Window/Close.
+ * Route closing to CMainFrame::OnClose().
+ * @todo We probably should just remove this OnClose() handling for
+ * CMergeEditView and handle it in CMainFrame.
*/
void CMergeEditView::OnWindowClose()
{
- CMergeDoc *pDoc = GetDocument();
-
- // Allow user to cancel closing
- if (!pDoc->PromptAndSaveIfNeeded(TRUE))
- {
- return;
- }
- else
- {
- // Set modified to false so we don't ask again about saving
- pDoc->m_ptBuf[0]->SetModified(FALSE);
- pDoc->m_ptBuf[1]->SetModified(FALSE);
- GetParentFrame()->PostMessage(WM_CLOSE, 0, 0);
- }
- m_pLocationView = NULL;
+ GetParentFrame()->PostMessage(WM_CLOSE, 0, 0);
}
/**
void CMergeEditView::UpdateLocationViewPosition(int nTopLine /*=-1*/,
int nBottomLine /*= -1*/)
{
+ if (m_pDocument == NULL)
+ return;
+
if (m_hLocationview != NULL && IsWindow(m_hLocationview))
{
m_pLocationView->UpdateVisiblePos(nTopLine, nBottomLine);