update scintilla to v2.22

git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@196 28bd50df-7adb-d945-0439-6e466c6a13cc

1 files changed, 6 insertions, 0 deletions

diff --git a/scintilla/src/ViewStyle.cxx b/scintilla/src/ViewStyle.cxx
index bdeac90..055f6ee 100644
--- a/scintilla/src/ViewStyle.cxx
+++ b/scintilla/src/ViewStyle.cxx
@@ -129,6 +129,7 @@ ViewStyle::ViewStyle(const ViewStyle &source) {
 	caretStyle = source.caretStyle;

 	caretWidth = source.caretWidth;

 	someStylesProtected = false;

+	someStylesForceCase = false;

 	leftMarginWidth = source.leftMarginWidth;

 	rightMarginWidth = source.rightMarginWidth;

 	for (int i=0; i < margins; i++) {

@@ -213,6 +214,7 @@ void ViewStyle::Init(size_t stylesSize_) {
 	caretStyle = CARETSTYLE_LINE;

 	caretWidth = 1;

 	someStylesProtected = false;

+	someStylesForceCase = false;

 

 	hotspotForegroundSet = false;

 	hotspotForeground.desired = ColourDesired(0, 0, 0xff);

@@ -295,6 +297,7 @@ void ViewStyle::Refresh(Surface &surface) {
 	maxAscent = styles[STYLE_DEFAULT].ascent;

 	maxDescent = styles[STYLE_DEFAULT].descent;

 	someStylesProtected = false;

+	someStylesForceCase = false;

 	for (unsigned int i=0; i<stylesSize; i++) {

 		if (i != STYLE_DEFAULT) {

 			styles[i].Realise(surface, zoomLevel, &styles[STYLE_DEFAULT], extraFontFlag);

@@ -306,6 +309,9 @@ void ViewStyle::Refresh(Surface &surface) {
 		if (styles[i].IsProtected()) {

 			someStylesProtected = true;

 		}

+		if (styles[i].caseForce != Style::caseMixed) {

+			someStylesForceCase = true;

+		}

 	}

 	maxAscent += extraAscent;

 	maxDescent += extraDescent;