//\r
#pragma once\r
#include "DiffData.h"\r
-//#include "SVNLineDiff.h"\r
+#include "SVNLineDiff.h"\r
#include "ScrollTool.h"\r
#include "Undo.h"\r
#include "LocatorBar.h"\r
afx_msg void OnLButtonDown(UINT nFlags, CPoint point);\r
afx_msg void OnEditCopy();\r
afx_msg void OnMouseMove(UINT nFlags, CPoint point);\r
+ afx_msg void OnTimer(UINT_PTR nIDEvent);\r
afx_msg void OnMouseLeave();\r
afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);\r
afx_msg void OnCaretDown();\r
void DrawText(CDC * pDC, const CRect &rc, LPCTSTR text, int textlength, int nLineIndex, POINT coords, bool bModified, bool bInlineDiff);\r
void ClearCurrentSelection();\r
void AdjustSelection();\r
- void SelectNextBlock(int nDirection, bool bConflict);\r
+ void SelectNextBlock(int nDirection, bool bConflict, bool bSkipEndOfCurrentBlock = true);\r
\r
void RemoveLine(int nLineIndex);\r
void RemoveSelectedText();\r
COLORREF m_WhiteSpaceFg;\r
UINT m_nStatusBarID; ///< The ID of the status bar pane used by this view. Must be set by the parent class.\r
\r
-// SVNLineDiff m_svnlinediff;\r
+ SVNLineDiff m_svnlinediff;\r
BOOL m_bOtherDiffChecked;\r
BOOL m_bModified;\r
BOOL m_bFocused;\r