Update Scintilla to v3.6.2.

1 files changed, 5 insertions, 1 deletions

diff --git a/scintilla/src/ViewStyle.h b/scintilla/src/ViewStyle.h
index df0e322..8244844 100644
--- a/scintilla/src/ViewStyle.h
+++ b/scintilla/src/ViewStyle.h
@@ -52,7 +52,7 @@ public:
 

 enum IndentView {ivNone, ivReal, ivLookForward, ivLookBoth};

 

-enum WhiteSpaceVisibility {wsInvisible=0, wsVisibleAlways=1, wsVisibleAfterIndent=2};

+enum WhiteSpaceVisibility {wsInvisible=0, wsVisibleAlways=1, wsVisibleAfterIndent=2, wsVisibleOnlyInIndent=3};

 

 typedef std::map<FontSpecification, FontRealised *> FontMap;

 

@@ -114,6 +114,7 @@ public:
 	int leftMarginWidth;	///< Spacing margin on left of text

 	int rightMarginWidth;	///< Spacing margin on right of text

 	int maskInLine;	///< Mask for markers to be put into text because there is nowhere for them to go in margin

+	int maskDrawInText;	///< Mask for markers that always draw in text

 	MarginStyle ms[SC_MAX_MARGIN+1];

 	int fixedColumnWidth;	///< Total width of margins

 	bool marginInside;	///< true: margin included in text view, false: separate views

@@ -160,6 +161,7 @@ public:
 	ViewStyle();

 	ViewStyle(const ViewStyle &source);

 	~ViewStyle();

+	void CalculateMarginWidthAndMask();

 	void Init(size_t stylesSize_=256);

 	void Refresh(Surface &surface, int tabInChars);

 	void ReleaseAllExtendedStyles();

@@ -183,6 +185,8 @@ public:
 	bool SetWrapVisualStartIndent(int wrapVisualStartIndent_);

 	bool SetWrapIndentMode(int wrapIndentMode_);

 

+	bool WhiteSpaceVisible(bool inIndent) const;

+

 private:

 	void AllocStyles(size_t sizeNew);

 	void CreateAndAddFont(const FontSpecification &fs);