diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-01-12 13:07:12 +0000 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-01-12 13:07:12 +0000 |
| commit | 3cb3f530afb0672185bbb879ab4caf367f15ede6 (patch) | |
| tree | 13bb145ad9a21da0f1c51e12de2c300640bc2296 | |
| parent | 4913f03f6e6fae6d9b75a32d5d02930c1624dd80 (diff) | |
| download | notepad2-mod-3cb3f530afb0672185bbb879ab4caf367f15ede6.zip notepad2-mod-3cb3f530afb0672185bbb879ab4caf367f15ede6.tar.gz notepad2-mod-3cb3f530afb0672185bbb879ab4caf367f15ede6.tar.bz2 | |
cosmetics in makefile.mak, update scintilla
git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@696 28bd50df-7adb-d945-0439-6e466c6a13cc
| -rw-r--r-- | build/makefile.mak | 13 | ||||
| -rw-r--r-- | scintilla/src/Editor.cxx | 4 | ||||
| -rw-r--r-- | scintilla/src/Editor.h | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/build/makefile.mak b/build/makefile.mak index 449dd95..fbdabd9 100644 --- a/build/makefile.mak +++ b/build/makefile.mak @@ -7,7 +7,7 @@ #*
#* See License.txt for details about distribution and modification.
#*
-#* (c) XhmikosR 2010-2011
+#* (c) XhmikosR 2010-2012
#* http://code.google.com/p/notepad2-mod/
#*
#* Use build_wdk.bat and set there your WDK directory.
@@ -49,8 +49,9 @@ NP2_SRC = ..\src NP2_RES = ..\res
-DEFINES = /D "BOOKMARK_EDITION" /D "_WINDOWS" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" \
- /D "_CRT_SECURE_NO_WARNINGS" /D "_STL70_" /D "_STATIC_CPPLIB" /D "WDK_BUILD"
+DEFINES = /D "_WINDOWS" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "_STL70_" \
+ /D "_STATIC_CPPLIB" /D "_CRT_SECURE_NO_WARNINGS" /D "BOOKMARK_EDITION" \
+ /D "WDK_BUILD"
INCLUDEDIRS = /I "$(SCI_INC)" /I "$(SCI_LEX)" /I "$(SCI_LIB)" /I "$(SCI_SRC)" \
/I "$(SCI_WIN)"
CXXFLAGS = /nologo /c /W3 /WX /EHsc /MD /O2 /GL /MP $(DEFINES) $(INCLUDEDIRS)
@@ -210,12 +211,12 @@ OBJECTS = \ {$(SCI_WIN)}.cxx{$(SCI_WIN_OBJDIR)}.obj::
$(CC) $(SCI_CXXFLAGS) /Fo"$(SCI_WIN_OBJDIR)/" /Tp $<
-{$(NP2_SRC)}.cpp{$(NP2_SRC_OBJDIR)}.obj::
- $(CC) $(CXXFLAGS) /Fo"$(NP2_SRC_OBJDIR)/" /Tp $<
-
{$(NP2_SRC)}.c{$(NP2_SRC_OBJDIR)}.obj::
$(CC) $(CXXFLAGS) /Fo"$(NP2_SRC_OBJDIR)/" /Tc $<
+{$(NP2_SRC)}.cpp{$(NP2_SRC_OBJDIR)}.obj::
+ $(CC) $(CXXFLAGS) /Fo"$(NP2_SRC_OBJDIR)/" /Tp $<
+
################
## Commands ##
diff --git a/scintilla/src/Editor.cxx b/scintilla/src/Editor.cxx index 8207cc0..88751e6 100644 --- a/scintilla/src/Editor.cxx +++ b/scintilla/src/Editor.cxx @@ -2517,7 +2517,7 @@ void DrawTextBlob(Surface *surface, ViewStyle &vsDraw, PRectangle rcSegment, }
void Editor::DrawEOL(Surface *surface, ViewStyle &vsDraw, PRectangle rcLine, LineLayout *ll,
- int line, int lineEnd, int xStart, int subLine, int subLineStart,
+ int line, int lineEnd, int xStart, int subLine, XYACCUMULATOR subLineStart,
bool overrideBackground, ColourDesired background,
bool drawWrapMarkEnd, ColourDesired wrapColour) {
@@ -2847,7 +2847,7 @@ void Editor::DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVis int posLineStart = pdoc->LineStart(line);
int startseg = ll->LineStart(subLine);
- int subLineStart = ll->positions[startseg];
+ XYACCUMULATOR subLineStart = ll->positions[startseg];
if (subLine >= ll->lines) {
DrawAnnotation(surface, vsDraw, line, xStart, rcLine, ll, subLine);
return; // No further drawing
diff --git a/scintilla/src/Editor.h b/scintilla/src/Editor.h index c876868..d159278 100644 --- a/scintilla/src/Editor.h +++ b/scintilla/src/Editor.h @@ -373,7 +373,7 @@ protected: // ScintillaBase subclass needs access to much of Editor void DrawIndentGuide(Surface *surface, int lineVisible, int lineHeight, int start, PRectangle rcSegment, bool highlight);
void DrawWrapMarker(Surface *surface, PRectangle rcPlace, bool isEndMarker, ColourDesired wrapColour);
void DrawEOL(Surface *surface, ViewStyle &vsDraw, PRectangle rcLine, LineLayout *ll,
- int line, int lineEnd, int xStart, int subLine, int subLineStart,
+ int line, int lineEnd, int xStart, int subLine, XYACCUMULATOR subLineStart,
bool overrideBackground, ColourDesired background,
bool drawWrapMark, ColourDesired wrapColour);
void DrawIndicator(int indicNum, int startPos, int endPos, Surface *surface, ViewStyle &vsDraw,
|