1 files changed, 6 insertions, 3 deletions

diff --git a/scintilla/src/Editor.h b/scintilla/src/Editor.h
index 74fc46f..16e6aaa 100644
--- a/scintilla/src/Editor.h
+++ b/scintilla/src/Editor.h
@@ -285,8 +285,8 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	int LinesToScroll() const;

 	int MaxScrollPos() const;

 	SelectionPosition ClampPositionIntoDocument(SelectionPosition sp) const;

-	Point LocationFromPosition(SelectionPosition pos);

-	Point LocationFromPosition(int pos);

+	Point LocationFromPosition(SelectionPosition pos, PointEnd pe=peDefault);

+	Point LocationFromPosition(int pos, PointEnd pe=peDefault);

 	int XFromPosition(int pos);

 	int XFromPosition(SelectionPosition sp);

 	SelectionPosition SPositionFromLocation(Point pt, bool canReturnInvalid=false, bool charPosition=false, bool virtualSpace=true);

@@ -439,6 +439,7 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	void NotifyIndicatorClick(bool click, int position, bool shift, bool ctrl, bool alt);

 	bool NotifyMarginClick(Point pt, int modifiers);

 	bool NotifyMarginClick(Point pt, bool shift, bool ctrl, bool alt);

+	bool NotifyMarginRightClick(Point pt, int modifiers);

 	void NotifyNeedShown(int pos, int len);

 	void NotifyDwelling(Point pt, bool state);

 	void NotifyZoom();

@@ -465,6 +466,7 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	SelectionPosition PositionUpOrDown(SelectionPosition spStart, int direction, int lastX);

 	void CursorUpOrDown(int direction, Selection::selTypes selt);

 	void ParaUpOrDown(int direction, Selection::selTypes selt);

+	Range RangeDisplayLine(int lineVisible);

 	int StartEndDisplayLine(int pos, bool start);

 	int VCHomeDisplayPosition(int position);

 	int VCHomeWrapPosition(int position);

@@ -507,6 +509,7 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	void DwellEnd(bool mouseMoved);

 	void MouseLeave();

 	virtual void ButtonDownWithModifiers(Point pt, unsigned int curTime, int modifiers);

+	virtual void RightButtonDownWithModifiers(Point pt, unsigned int curTime, int modifiers);

 	virtual void ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt);

 	void ButtonMoveWithModifiers(Point pt, int modifiers);

 	void ButtonMove(Point pt);

@@ -571,7 +574,7 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	void AddStyledText(char *buffer, int appendLength);

 

 	virtual sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) = 0;

-	bool ValidMargin(uptr_t wParam);

+	bool ValidMargin(uptr_t wParam) const;

 	void StyleSetMessage(unsigned int iMessage, uptr_t wParam, sptr_t lParam);

 	sptr_t StyleGetMessage(unsigned int iMessage, uptr_t wParam, sptr_t lParam);