Merge branch 'master' of https://github.com/winmerge/winmerge into jp

[winmerge-jp/winmerge-jp.git] / Src / LocationView.h

diff --git a/Src/LocationView.h b/Src/LocationView.h
index dcef13d..9f948c3 100644 (file)
--- a/Src/LocationView.h
+++ b/Src/LocationView.h
@@ -78,7 +78,7 @@ protected:
 protected:
        CMergeDoc* GetDocument();
        void DrawRect(CDC* pDC, const CRect& r, COLORREF cr, bool bSelected = false);
-       bool GotoLocation(const CPoint& point, bool bRealLine = true);
+       bool GotoLocation(const CPoint& point, bool bRealLine = true, bool bMoveAnchor = true);
        int GetLineFromYPos(int nYCoord, int bar, bool bRealLine = true);
        int IsInsideBar(const CRect& rc, const POINT& pt);
        void DrawVisibleAreaRect(CDC* pDC, int nTopLine = -1, int nBottomLine = -1);
@@ -114,6 +114,7 @@ protected:
        afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
        afx_msg void OnMouseMove(UINT nFlags, CPoint point);
        afx_msg int  OnMouseActivate(CWnd* pDesktopWnd, UINT nHitTest, UINT message);
+       afx_msg BOOL OnMouseWheel(UINT nFlags, short zDelta, CPoint pt);
        afx_msg void OnLButtonDblClk(UINT nFlags, CPoint point);
        afx_msg void OnContextMenu(CWnd* pWnd, CPoint point);
        afx_msg void OnClose();