update scintilla to the latest development version (11162010)

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

3 files changed, 11 insertions, 27 deletions

diff --git a/scintilla/src/Catalogue.cxx b/scintilla/src/Catalogue.cxx
index 638d2fe..b9ac1c7 100644
--- a/scintilla/src/Catalogue.cxx
+++ b/scintilla/src/Catalogue.cxx
@@ -81,6 +81,7 @@ int Scintilla_LinkLexers() {
 

 //++Autogenerated -- run src/LexGen.py to regenerate

 //**\(\tLINK_LEXER(\*);\n\)

+//	LINK_LEXER(lmA68k);

 /* notepad2-mod custom code, comment out the unused lexers */

 //	LINK_LEXER(lmAbaqus);

 //	LINK_LEXER(lmAda);

diff --git a/scintilla/src/Document.cxx b/scintilla/src/Document.cxx
index 4423f5e..3ca95a5 100644
--- a/scintilla/src/Document.cxx
+++ b/scintilla/src/Document.cxx
@@ -14,14 +14,6 @@
 #include <string>

 #include <vector>

 

-// With Borland C++ 5.5, including <string> includes Windows.h leading to defining

-// FindText to FindTextA which makes calls here to Document::FindText fail.

-#ifdef __BORLANDC__

-#ifdef FindText

-#undef FindText

-#endif

-#endif

-

 #include "Platform.h"

 

 #include "ILexer.h"

@@ -552,7 +544,7 @@ int Document::NextPosition(int pos, int moveDir) const {
 				// See http://msdn.microsoft.com/en-us/library/cc194792%28v=MSDN.10%29.aspx

 				// http://msdn.microsoft.com/en-us/library/cc194790.aspx

 				if ((pos - 1) <= posStartLine) {

-					return posStartLine - 1;

+					return pos - 1;

 				} else if (IsDBCSLeadByte(cb.CharAt(pos - 1))) {

 					// Must actually be trail byte

 					return pos - 2;

diff --git a/scintilla/src/Editor.cxx b/scintilla/src/Editor.cxx
index f2c4868..5060066 100644
--- a/scintilla/src/Editor.cxx
+++ b/scintilla/src/Editor.cxx
@@ -16,14 +16,6 @@
 #include <algorithm>

 #include <memory>

 

-// With Borland C++ 5.5, including <string> includes Windows.h leading to defining

-// FindText to FindTextA which makes calls here to Document::FindText fail.

-#ifdef __BORLANDC__

-#ifdef FindText

-#undef FindText

-#endif

-#endif

-

 #include "Platform.h"

 

 #include "ILexer.h"

@@ -2042,7 +2034,7 @@ void Editor::LayoutLine(int line, Surface *surface, ViewStyle &vstyle, LineLayou
 			ll->edgeColumn = -1;

 		}

 

-		char styleByte = 0;

+		char styleByte;

 		const int styleMask = pdoc->stylingBitsMask;

 		ll->styleBitsSet = 0;

 		// Fill base line layout

@@ -3165,11 +3157,11 @@ void Editor::RefreshPixMaps(Surface *surfaceWindow) {
 		}

 

 		pixmapSelPattern->FillRectangle(rcPattern, colourFMFill);

-		pixmapSelPattern->PenColour(colourFMStripes);

-		for (int stripe = 0; stripe < patternSize; stripe++) {

-			// Alternating 1 pixel stripes is same as checkerboard.

-			pixmapSelPattern->MoveTo(0, stripe * 2);

-			pixmapSelPattern->LineTo(patternSize, stripe * 2 - patternSize);

+		for (int y = 0; y < patternSize; y++) {

+			for (int x = y % 2; x < patternSize; x+=2) {

+				PRectangle rcPixel(x, y, x+1, y+1);

+				pixmapSelPattern->FillRectangle(rcPixel, colourFMStripes);

+			}

 		}

 	}

 

@@ -3183,10 +3175,9 @@ void Editor::RefreshPixMaps(Surface *surfaceWindow) {
 		pixmapIndentGuideHighlight->FillRectangle(rcIG, vs.styles[STYLE_BRACELIGHT].back.allocated);

 		pixmapIndentGuideHighlight->PenColour(vs.styles[STYLE_BRACELIGHT].fore.allocated);

 		for (int stripe = 1; stripe < vs.lineHeight + 1; stripe += 2) {

-			pixmapIndentGuide->MoveTo(0, stripe);

-			pixmapIndentGuide->LineTo(2, stripe);

-			pixmapIndentGuideHighlight->MoveTo(0, stripe);

-			pixmapIndentGuideHighlight->LineTo(2, stripe);

+			PRectangle rcPixel(0, stripe, 1, stripe+1);

+			pixmapIndentGuide->FillRectangle(rcPixel, vs.styles[STYLE_INDENTGUIDE].fore.allocated);

+			pixmapIndentGuideHighlight->FillRectangle(rcPixel, vs.styles[STYLE_BRACELIGHT].fore.allocated);

 		}

 	}