diff options
-rw-r--r-- | gtk/ScintillaGTK.cxx | 2 | ||||
-rw-r--r-- | gtk/deps.mak | 380 | ||||
-rw-r--r-- | gtk/makefile | 4 | ||||
-rw-r--r-- | gtk/scintilla.mak | 187 | ||||
-rw-r--r-- | include/Scintilla.h | 14 | ||||
-rw-r--r-- | include/Scintilla.iface | 34 | ||||
-rw-r--r-- | src/Document.cxx | 2 | ||||
-rw-r--r-- | src/Document.h | 2 | ||||
-rw-r--r-- | src/DocumentAccessor.cxx | 2 | ||||
-rw-r--r-- | src/Editor.cxx | 157 | ||||
-rw-r--r-- | src/Editor.h | 3 | ||||
-rw-r--r-- | src/Partitioning.h | 2 | ||||
-rw-r--r-- | src/ScintillaBase.cxx | 2 | ||||
-rw-r--r-- | src/SplitVector.h | 4 | ||||
-rw-r--r-- | src/ViewStyle.cxx | 3 | ||||
-rw-r--r-- | vcbuild/SciLexer.dsp | 22 | ||||
-rw-r--r-- | win32/ScintillaWin.cxx | 4 | ||||
-rw-r--r-- | win32/deps.mak | 123 | ||||
-rw-r--r-- | win32/makefile | 12 | ||||
-rw-r--r-- | win32/scintilla.mak | 153 | ||||
-rw-r--r-- | win32/scintilla_vc6.mak | 148 |
21 files changed, 851 insertions, 409 deletions
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 5fcfd22a6..2e0291eeb 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -39,6 +39,8 @@ #include "Style.h" #include "AutoComplete.h" #include "ViewStyle.h" +#include "RunStyles.h" +#include "Decoration.h" #include "CharClassify.h" #include "Document.h" #include "Editor.h" diff --git a/gtk/deps.mak b/gtk/deps.mak index 288404d5b..f8fa285fd 100644 --- a/gtk/deps.mak +++ b/gtk/deps.mak @@ -1,82 +1,123 @@ -PlatGTK.o: PlatGTK.cxx Converter.h \ - ../include/Platform.h \ +PlatGTK.o: PlatGTK.cxx \ + ../include/Platform.h \ ../include/Scintilla.h ../include/ScintillaWidget.h \ - ../src/UniConversion.h ../src/XPM.h -ScintillaGTK.o: ScintillaGTK.cxx Converter.h \ - ../include/Platform.h \ + ../src/UniConversion.h ../src/XPM.h Converter.h +ScintillaGTK.o: ScintillaGTK.cxx \ + ../include/Platform.h \ ../include/Scintilla.h ../include/ScintillaWidget.h \ - ../include/SciLexer.h ../include/PropSet.h ../include/SString.h \
- ../include/Accessor.h ../include/KeyWords.h ../src/ContractionState.h \
- ../src/SVector.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \
- ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \
- ../src/AutoComplete.h ../src/ViewStyle.h ../src/CharClassify.h ../src/Document.h \
- ../src/Editor.h ../src/ScintillaBase.h ../src/UniConversion.h \ - ../src/ExternalLexer.h -AutoComplete.o: ../src/AutoComplete.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h
-CallTip.o: ../src/CallTip.cxx ../include/Platform.h \
- ../include/Scintilla.h ../src/CallTip.h
-CellBuffer.o: ../src/CellBuffer.cxx ../include/Platform.h \
- ../include/Scintilla.h ../src/SVector.h ../src/CellBuffer.h
-CharClassify.o: ../src/CharClassify.cxx ../src/CharClassify.h
-ContractionState.o: ../src/ContractionState.cxx ../include/Platform.h \
- ../src/ContractionState.h
-DocumentAccessor.o: ../src/DocumentAccessor.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/SString.h ../src/SVector.h \
- ../include/Accessor.h ../src/DocumentAccessor.h ../src/CellBuffer.h \
- ../include/Scintilla.h ../src/CharClassify.h ../src/Document.h
-Document.o: ../src/Document.cxx ../include/Platform.h \
- ../include/Scintilla.h ../src/SVector.h ../src/CellBuffer.h \
- ../src/CharClassify.h ../src/Document.h ../src/RESearch.h
-Editor.o: ../src/Editor.cxx ../include/Platform.h ../include/Scintilla.h \
- ../src/ContractionState.h ../src/SVector.h ../src/CellBuffer.h \
- ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \
- ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h ../src/Document.h ../src/Editor.h
-ExternalLexer.o: ../src/ExternalLexer.cxx ../include/Platform.h \
../include/SciLexer.h ../include/PropSet.h ../include/SString.h \ - ../include/Accessor.h ../src/DocumentAccessor.h ../include/KeyWords.h \ - ../src/ExternalLexer.h -Indicator.o: ../src/Indicator.cxx ../include/Platform.h \
- ../include/Scintilla.h ../src/Indicator.h
-KeyMap.o: ../src/KeyMap.cxx ../include/Platform.h ../include/Scintilla.h \
- ../src/KeyMap.h
-KeyWords.o: ../src/KeyWords.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexAda.o: ../src/LexAda.cxx ../include/Platform.h ../include/Accessor.h \
- ../src/StyleContext.h ../include/PropSet.h ../include/SString.h \
- ../include/KeyWords.h ../include/SciLexer.h
-LexAsm.o: ../src/LexAsm.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexAVE.o: ../src/LexAVE.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexBaan.o: ../src/LexBaan.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexBullant.o: ../src/LexBullant.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
+ ../include/Accessor.h ../include/KeyWords.h ../src/ContractionState.h \ + ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h \ + ../src/XPM.h ../src/LineMarker.h ../src/Style.h ../src/AutoComplete.h \ + ../src/ViewStyle.h ../src/RunStyles.h ../src/Decoration.h \ + ../src/CharClassify.h ../src/Document.h ../src/Editor.h \ + ../include/SString.h ../src/ScintillaBase.h ../src/UniConversion.h \ + scintilla-marshal.h ../src/ExternalLexer.h Converter.h +AutoComplete.o: ../src/AutoComplete.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h +CallTip.o: ../src/CallTip.cxx ../include/Platform.h \ + ../include/Scintilla.h ../src/CallTip.h +CellBuffer.o: ../src/CellBuffer.cxx ../include/Platform.h \ + ../include/Scintilla.h ../src/SVector.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/CellBuffer.h +CharClassify.o: ../src/CharClassify.cxx ../src/CharClassify.h +ContractionState.o: ../src/ContractionState.cxx ../include/Platform.h \ + ../src/ContractionState.h +Decoration.o: ../src/Decoration.cxx ../include/Platform.h \ + ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h ../src/Decoration.h +DocumentAccessor.o: ../src/DocumentAccessor.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../src/SVector.h \ + ../include/Accessor.h ../src/DocumentAccessor.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ + ../include/Scintilla.h ../src/CharClassify.h ../src/Decoration.h \ + ../src/Document.h +Document.o: ../src/Document.cxx ../include/Platform.h \ + ../include/Scintilla.h ../src/SVector.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ + ../src/CharClassify.h ../src/Decoration.h ../src/Document.h \ + ../src/RESearch.h +Editor.o: ../src/Editor.cxx ../include/Platform.h ../include/Scintilla.h \ + ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/CellBuffer.h ../src/KeyMap.h \ + ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ + ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \ + ../src/Decoration.h ../src/Document.h ../src/Editor.h +ExternalLexer.o: ../src/ExternalLexer.cxx ../include/Platform.h \ + ../include/Scintilla.h ../include/SciLexer.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/DocumentAccessor.h \ + ../include/KeyWords.h ../src/ExternalLexer.h +Indicator.o: ../src/Indicator.cxx ../include/Platform.h \ + ../include/Scintilla.h ../src/Indicator.h +KeyMap.o: ../src/KeyMap.cxx ../include/Platform.h ../include/Scintilla.h \ + ../src/KeyMap.h +KeyWords.o: ../src/KeyWords.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexAda.o: ../src/LexAda.cxx ../include/Platform.h ../include/Accessor.h \ + ../src/StyleContext.h ../include/PropSet.h ../include/SString.h \ + ../include/KeyWords.h ../include/SciLexer.h ../include/SString.h +LexAPDL.o: ../src/LexAPDL.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexAsm.o: ../src/LexAsm.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexAsn1.o: ../src/LexAsn1.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexAU3.o: ../src/LexAU3.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexAVE.o: ../src/LexAVE.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexBaan.o: ../src/LexBaan.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexBash.o: ../src/LexBash.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Scintilla.h ../include/SciLexer.h +LexBasic.o: ../src/LexBasic.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ + ../include/SciLexer.h +LexBullant.o: ../src/LexBullant.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexCaml.o: ../src/LexCaml.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCLW.o: ../src/LexCLW.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h -LexConf.o: ../src/LexConf.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
-LexCPP.o: ../src/LexCPP.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexCrontab.o: ../src/LexCrontab.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexCSS.o: ../src/LexCSS.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexEiffel.o: ../src/LexEiffel.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
- ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
- ../include/SciLexer.h
+LexCmake.o: ../src/LexCmake.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexConf.o: ../src/LexConf.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Scintilla.h ../include/SciLexer.h +LexCPP.o: ../src/LexCPP.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexCrontab.o: ../src/LexCrontab.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexCsound.o: ../src/LexCsound.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ + ../include/SciLexer.h +LexCSS.o: ../src/LexCSS.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexD.o: ../src/LexD.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexEiffel.o: ../src/LexEiffel.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ + ../include/SciLexer.h LexErlang.o: ../src/LexErlang.cxx ../include/Platform.h \ ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ @@ -85,29 +126,47 @@ LexEScript.o: ../src/LexEScript.cxx ../include/Platform.h \ ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h +LexFlagship.o: ../src/LexFlagship.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ + ../include/SciLexer.h LexForth.o: ../src/LexForth.cxx ../include/Platform.h \ ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h -LexFortran.o: ../src/LexFortran.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
- ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
- ../include/SciLexer.h
-LexHTML.o: ../src/LexHTML.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexLisp.o: ../src/LexLisp.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
+LexFortran.o: ../src/LexFortran.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ + ../include/SciLexer.h +LexGui4Cli.o: ../src/LexGui4Cli.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ + ../include/SciLexer.h +LexHaskell.o: ../src/LexHaskell.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ + ../include/SciLexer.h +LexHTML.o: ../src/LexHTML.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexInno.o: ../src/LexInno.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexKix.o: ../src/LexKix.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexLisp.o: ../src/LexLisp.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h LexLout.o: ../src/LexLout.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h -LexLua.o: ../src/LexLua.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexMatlab.o: ../src/LexMatlab.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
- ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
- ../include/SciLexer.h
+LexLua.o: ../src/LexLua.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexMatlab.o: ../src/LexMatlab.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ + ../include/SciLexer.h LexMetapost.o: ../src/LexMetapost.cxx ../include/Platform.h \ ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ @@ -118,74 +177,115 @@ LexMMIXAL.o: ../src/LexMMIXAL.cxx ../include/Platform.h \ ../include/SciLexer.h LexMPT.o: ../src/LexMPT.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ - ../include/Scintilla.h ../include/SciLexer.h + ../include/Scintilla.h ../include/SciLexer.h ../include/SString.h +LexMSSQL.o: ../src/LexMSSQL.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexNsis.o: ../src/LexNsis.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h -LexOthers.o: ../src/LexOthers.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
-LexPascal.o: ../src/LexPascal.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \
- ../src/StyleContext.h
+LexOpal.o: ../src/LexOpal.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h +LexOthers.o: ../src/LexOthers.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexPascal.o: ../src/LexPascal.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ + ../src/StyleContext.h LexPB.o: ../src/LexPB.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h -LexPerl.o: ../src/LexPerl.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
+LexPerl.o: ../src/LexPerl.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Scintilla.h ../include/SciLexer.h LexPOV.o: ../src/LexPOV.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexPS.o: ../src/LexPS.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h -LexPython.o: ../src/LexPython.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
- ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
- ../include/SciLexer.h
-LexRuby.o: ../src/LexRuby.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
+LexPython.o: ../src/LexPython.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ + ../include/SciLexer.h +LexRebol.o: ../src/LexRebol.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ + ../src/StyleContext.h +LexRuby.o: ../src/LexRuby.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Scintilla.h ../include/SciLexer.h LexScriptol.o: ../src/LexScriptol.cxx ../include/Platform.h \ ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h -LexSQL.o: ../src/LexSQL.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
- ../include/Scintilla.h ../include/SciLexer.h
+LexSmalltalk.o: ../src/LexSmalltalk.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ + ../include/SciLexer.h +LexSpecman.o: ../src/LexSpecman.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ + ../include/SciLexer.h +LexSpice.o: ../src/LexSpice.cxx ../include/Platform.h \ + ../include/Accessor.h ../src/StyleContext.h ../include/PropSet.h \ + ../include/SString.h ../include/KeyWords.h ../include/SciLexer.h \ + ../include/SString.h +LexSQL.o: ../src/LexSQL.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexTADS3.o: ../src/LexTADS3.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ + ../include/SciLexer.h +LexTCL.o: ../src/LexTCL.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexTeX.o: ../src/LexTeX.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h -LexVB.o: ../src/LexVB.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
- ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
+LexVB.o: ../src/LexVB.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexVerilog.o: ../src/LexVerilog.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ + ../include/SciLexer.h +LexVHDL.o: ../src/LexVHDL.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexYAML.o: ../src/LexYAML.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h -LineMarker.o: ../src/LineMarker.cxx ../include/Platform.h \
- ../include/Scintilla.h ../src/XPM.h ../src/LineMarker.h
-PropSet.o: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h \
- ../include/SString.h
-RESearch.o: ../src/RESearch.cxx ../src/RESearch.h
-ScintillaBase.o: ../src/ScintillaBase.cxx ../include/Platform.h \
- ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \
- ../include/SciLexer.h ../include/Accessor.h ../src/DocumentAccessor.h \
- ../include/KeyWords.h ../src/ContractionState.h ../src/SVector.h \
- ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h \
- ../src/XPM.h ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \
- ../src/AutoComplete.h ../src/CharClassify.h ../src/Document.h ../src/Editor.h \
- ../src/ScintillaBase.h
-StyleContext.o: ../src/StyleContext.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
- ../src/StyleContext.h
-Style.o: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \
- ../src/Style.h
-UniConversion.o: ../src/UniConversion.cxx ../src/UniConversion.h
-ViewStyle.o: ../src/ViewStyle.cxx ../include/Platform.h \
- ../include/Scintilla.h ../src/Indicator.h ../src/XPM.h \
- ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h
-WindowAccessor.o: ../src/WindowAccessor.cxx ../include/Platform.h \
- ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
- ../include/WindowAccessor.h ../include/Scintilla.h
-XPM.o: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h
+LineMarker.o: ../src/LineMarker.cxx ../include/Platform.h \ + ../include/Scintilla.h ../src/XPM.h ../src/LineMarker.h +PropSet.o: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h +RESearch.o: ../src/RESearch.cxx ../src/CharClassify.h ../src/RESearch.h +RunStyles.o: ../src/RunStyles.cxx ../include/Platform.h \ + ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h +ScintillaBase.o: ../src/ScintillaBase.cxx ../include/Platform.h \ + ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ + ../include/SciLexer.h ../include/Accessor.h ../src/DocumentAccessor.h \ + ../include/KeyWords.h ../src/ContractionState.h ../src/SVector.h \ + ../src/SplitVector.h ../src/Partitioning.h ../src/RunStyles.h \ + ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h \ + ../src/XPM.h ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \ + ../src/AutoComplete.h ../src/CharClassify.h ../src/Decoration.h \ + ../src/Document.h ../src/Editor.h ../src/ScintillaBase.h +StyleContext.o: ../src/StyleContext.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../src/StyleContext.h +Style.o: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \ + ../src/Style.h +UniConversion.o: ../src/UniConversion.cxx ../src/UniConversion.h +ViewStyle.o: ../src/ViewStyle.cxx ../include/Platform.h \ + ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ + ../src/Style.h ../src/ViewStyle.h +WindowAccessor.o: ../src/WindowAccessor.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/WindowAccessor.h ../include/Scintilla.h +XPM.o: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h diff --git a/gtk/makefile b/gtk/makefile index e48a8470e..673f11dff 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -83,10 +83,10 @@ deps: $(CC) -MM `$(CONFIGFLAGS)` $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak $(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o \ - CharClassify.o Document.o CallTip.o \ + CharClassify.o Decoration.o Document.o CallTip.o \ ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \ KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \ - RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \ + RESearch.o RunStyles.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \ $(MARSHALLER) $(LEXOBJS) $(AR) rc $@ $^ $(RANLIB) $@ diff --git a/gtk/scintilla.mak b/gtk/scintilla.mak index c8cb51370..3bb9db766 100644 --- a/gtk/scintilla.mak +++ b/gtk/scintilla.mak @@ -120,6 +120,7 @@ SOBJS=\ $(DIR_O)\CellBuffer.obj \ $(DIR_O)\ContractionState.obj \ $(DIR_O)\CharClassify.obj \ + $(DIR_O)\Decoration.obj \ $(DIR_O)\Document.obj \ $(DIR_O)\Editor.obj \ $(DIR_O)\ExternalLexer.obj \ @@ -129,6 +130,7 @@ SOBJS=\ $(DIR_O)\PlatGTK.obj \ $(MARSHALLER) \ $(DIR_O)\RESearch.obj \ + $(DIR_O)\RunStyles.obj \ $(DIR_O)\PropSet.obj \ $(DIR_O)\ScintillaBase.obj \ $(DIR_O)\ScintillaGTK.obj \ @@ -210,6 +212,7 @@ LOBJS=\ $(DIR_O)\CellBuffer.obj \ $(DIR_O)\ContractionState.obj \ $(DIR_O)\CharClassify.obj \ + $(DIR_O)\Decoration.obj \ $(DIR_O)\Document.obj \ $(DIR_O)\DocumentAccessor.obj \ $(DIR_O)\Editor.obj \ @@ -220,6 +223,7 @@ LOBJS=\ $(DIR_O)\PlatGTK.obj \ $(MARSHALLER) \ $(DIR_O)\RESearch.obj \ + $(DIR_O)\RunStyles.obj \ $(DIR_O)\PropSet.obj \ $(DIR_O)\ScintillaBaseL.obj \ $(DIR_O)\ScintillaGTKL.obj \ @@ -288,35 +292,54 @@ LEX_HEADERS=..\include\Platform.h ..\include\PropSet.h \ ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ ..\include\Scintilla.h ..\include\SciLexer.h ..\src\StyleContext.h -$(DIR_O)\AutoComplete.obj: ..\src\AutoComplete.cxx ..\include\Platform.h ..\src\AutoComplete.h +$(DIR_O)\AutoComplete.obj: ../src/AutoComplete.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h -$(DIR_O)\CallTip.obj: ..\src\CallTip.cxx ..\include\Platform.h ..\src\CallTip.h +$(DIR_O)\CallTip.obj: ../src/CallTip.cxx ../include/Platform.h \ + ../include/Scintilla.h ../src/CallTip.h -$(DIR_O)\CellBuffer.obj: ..\src\CellBuffer.cxx ..\include\Platform.h ..\include\Scintilla.h ..\src\CellBuffer.h +$(DIR_O)\CellBuffer.obj: ../src/CellBuffer.cxx ../include/Platform.h \ + ../include/Scintilla.h ../src/SVector.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/CellBuffer.h -$(DIR_O)\CharClassify.obj: ..\src\CharClassify.cxx ..\src\CharClassify.h +$(DIR_O)\CharClassify.obj: ../src/CharClassify.cxx ../src/CharClassify.h -$(DIR_O)\ContractionState.obj: ..\src\ContractionState.cxx ..\include\Platform.h ..\src\ContractionState.h +$(DIR_O)\ContractionState.obj: ../src/ContractionState.cxx ../include/Platform.h \ + ../src/ContractionState.h -$(DIR_O)\Document.obj: ..\src\Document.cxx ..\include\Platform.h ..\include\Scintilla.h ..\src\RESearch.h \ - ..\src\CellBuffer.h ..\src\CharClassify.h ..\src\Document.h +$(DIR_O)\Document.obj: ../src/Document.cxx ../include/Platform.h \ + ../include/Scintilla.h ../src/SVector.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/CellBuffer.h ../src/CharClassify.h \ + ../src/Document.h ../src/RESearch.h -$(DIR_O)\DocumentAccessor.obj: ..\src\DocumentAccessor.cxx ..\include\Platform.h ..\include\PropSet.h \ - ..\include\Accessor.h ..\src\DocumentAccessor.h ..\src\CharClassify.h ..\include\Scintilla.h +$(DIR_O)\DocumentAccessor.obj: ../src/DocumentAccessor.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../src/SVector.h \ + ../include/Accessor.h ../src/DocumentAccessor.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/CellBuffer.h ../include/Scintilla.h \ + ../src/CharClassify.h ../src/Document.h -$(DIR_O)\Editor.obj: ..\src\Editor.cxx ..\include\Platform.h ..\include\Scintilla.h ..\src\ContractionState.h \ - ..\src\CellBuffer.h ..\src\KeyMap.h ..\src\Indicator.h ..\src\LineMarker.h ..\src\Style.h ..\src\ViewStyle.h \ - ..\src\CharClassify.h ..\src\Document.h ..\src\Editor.h +$(DIR_O)\Editor.obj: ../src/Editor.cxx ../include/Platform.h ../include/Scintilla.h \ + ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/CellBuffer.h ../src/KeyMap.h \ + ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ + ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \ + ../src/Document.h ../src/Editor.h -$(DIR_O)\ExternalLexer.obj: ..\src\ExternalLexer.cxx ..\include\Platform.h ..\include\Scintilla.h ..\include\SciLexer.h \ - ..\include\PropSet.h ..\include\Accessor.h ..\src\DocumentAccessor.h ..\include\Keywords.h ..\src\ExternalLexer.h +$(DIR_O)\ExternalLexer.obj: ../src/ExternalLexer.cxx ../include/Platform.h \ + ../include/Scintilla.h ../include/SciLexer.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/DocumentAccessor.h \ + ../include/KeyWords.h ../src/ExternalLexer.h -$(DIR_O)\Indicator.obj: ..\src\Indicator.cxx ..\include\Platform.h ..\include\Scintilla.h ..\src\Indicator.h +$(DIR_O)\Indicator.obj: ../src/Indicator.cxx ../include/Platform.h \ + ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h ../src/Indicator.h -$(DIR_O)\KeyMap.obj: ..\src\KeyMap.cxx ..\include\Platform.h ..\include\Scintilla.h ..\src\KeyMap.h +$(DIR_O)\KeyMap.obj: ../src/KeyMap.cxx ../include/Platform.h ../include/Scintilla.h \ + ../src/KeyMap.h -$(DIR_O)\KeyWords.obj: ..\src\KeyWords.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\include\KeyWords.h \ - ..\include\Scintilla.h ..\include\SciLexer.h +$(DIR_O)\KeyWords.obj: ../src/KeyWords.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h #++Autogenerated -- run src/LexGen.py to regenerate #**\n\($(DIR_O)\\\*.obj: ..\\src\\\*.cxx $(LEX_HEADERS)\n\n\) @@ -446,52 +469,82 @@ $(DIR_O)\LexYAML.obj: ..\src\LexYAML.cxx $(LEX_HEADERS) #--Autogenerated -- end of automatically generated section -$(DIR_O)\LineMarker.obj: ..\src\LineMarker.cxx ..\include\Platform.h ..\include\Scintilla.h ..\src\LineMarker.h - -$(DIR_O)\PlatWin.obj: PlatWin.cxx ..\include\Platform.h PlatformRes.h ..\src\UniConversion.h - -$(DIR_O)\PropSet.obj: ..\src\PropSet.cxx ..\include\Platform.h ..\include\PropSet.h \ - ..\include\SString.h - -$(DIR_O)\RESearch.obj: ..\src\RESearch.cxx ..\src\RESearch.h - -$(DIR_O)\ScintillaBase.obj: ..\src\ScintillaBase.cxx ..\include\Platform.h ..\include\Scintilla.h \ - ..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \ - ..\src\LineMarker.h ..\src\Style.h ..\src\ViewStyle.h ..\src\AutoComplete.h ..\src\CharClassify.h \ - ..\src\Document.h ..\src\Editor.h ..\src\ScintillaBase.h - -$(DIR_O)\ScintillaBaseL.obj: ..\src\ScintillaBase.cxx ..\include\Platform.h ..\include\Scintilla.h ..\include\SciLexer.h \ - ..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \ - ..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ..\src\CharClassify.h \ - ..\src\Document.h ..\src\Editor.h \ - ..\src\ScintillaBase.h ..\include\PropSet.h ..\include\Accessor.h ..\src\DocumentAccessor.h ..\include\KeyWords.h - -$(DIR_O)\ScintillaWin.obj: ScintillaWin.cxx ..\include\Platform.h ..\include\Scintilla.h \ - ..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \ - ..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ..\src\CharClassify.h \ - ..\src\Document.h ..\src\Editor.h \ - ..\src\ScintillaBase.h ..\src\UniConversion.h - -$(DIR_O)\ScintillaWinL.obj: ScintillaWin.cxx ..\include\Platform.h ..\include\Scintilla.h ..\include\SciLexer.h \ - ..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \ - ..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ..\src\CharClassify.h \ - ..\src\Document.h ..\src\Editor.h \ - ..\src\ScintillaBase.h ..\include\PropSet.h ..\include\Accessor.h ..\include\KeyWords.h ..\src\UniConversion.h - -$(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx ..\include\Platform.h ..\include\Scintilla.h \ - ..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \ - ..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ..\src\CharClassify.h \ - ..\src\Document.h ..\src\Editor.h \ - ..\src\ScintillaBase.h ..\src\UniConversion.h - -$(DIR_O)\Style.obj: ..\src\Style.cxx ..\include\Platform.h ..\src\Style.h - -$(DIR_O)\StyleContext.obj: ..\src\StyleContext.cxx ..\include\Platform.h ..\include\Accessor.h ..\include\PropSet.h ..\src\StyleContext.h - -$(DIR_O)\ViewStyle.obj: ..\src\ViewStyle.cxx ..\include\Platform.h ..\include\Scintilla.h ..\src\Indicator.h \ - ..\src\LineMarker.h ..\src\Style.h ..\src\ViewStyle.h - -$(DIR_O)\UniConversion.obj: ..\src\UniConversion.cxx ..\src\UniConversion.h - -$(DIR_O)\WindowAccessor.obj: ..\src\WindowAccessor.cxx ..\include\Platform.h ..\include\PropSet.h \ - ..\include\Accessor.h ..\include\WindowAccessor.h ..\include\Scintilla.h +$(DIR_O)\LineMarker.obj: ../src/LineMarker.cxx ../include/Platform.h \ + ../include/Scintilla.h ../src/XPM.h ../src/LineMarker.h + +$(DIR_O)\PlatGTK.obj: PlatGTK.cxx ../include/Platform.h \ + ../src/UniConversion.h ../src/XPM.h + +$(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h + +$(DIR_O)\RESearch.obj: ../src/RESearch.cxx ../src/CharClassify.h ../src/RESearch.h + +$(DIR_O)\RunStyles.obj: ../src/RunStyles.cxx ../include/Platform.h \ + ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h + +$(DIR_O)\ScintillaBase.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ + ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ + ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ + ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \ + ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \ + ../src/AutoComplete.h ../src/CharClassify.h ../src/Document.h \ + ../src/Editor.h ../src/ScintillaBase.h + +$(DIR_O)\ScintillaBaseL.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ + ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ + ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ + ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \ + ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \ + ../src/AutoComplete.h ../src/CharClassify.h ../src/Document.h \ + ../src/Editor.h ../src/ScintillaBase.h + +$(DIR_O)\ScintillaGTK.obj: ScintillaGTK.cxx ../include/Platform.h \ + ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ + ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ + ../src/AutoComplete.h ../src/ViewStyle.h ../src/CharClassify.h \ + ../src/Document.h ../src/Editor.h ../src/ScintillaBase.h \ + ../src/UniConversion.h + +$(DIR_O)\ScintillaGTKL.obj: ScintillaGTK.cxx ../include/Platform.h \ + ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ + ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ + ../src/AutoComplete.h ../src/ViewStyle.h ../src/CharClassify.h \ + ../src/Document.h ../src/Editor.h ../src/ScintillaBase.h \ + ../src/UniConversion.h + +$(DIR_O)\ScintillaGTKS.obj: ScintillaGTK.cxx ../include/Platform.h \ + ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ + ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ + ../src/AutoComplete.h ../src/ViewStyle.h ../src/CharClassify.h \ + ../src/Document.h ../src/Editor.h ../src/ScintillaBase.h \ + ../src/UniConversion.h + +$(DIR_O)\Style.obj: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \ + ../src/Style.h + +$(DIR_O)\StyleContext.obj: ../src/StyleContext.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../src/StyleContext.h + +$(DIR_O)\UniConversion.obj: ../src/UniConversion.cxx ../src/UniConversion.h + +$(DIR_O)\ViewStyle.obj: ../src/ViewStyle.cxx ../include/Platform.h \ + ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ + ../src/Style.h ../src/ViewStyle.h + +$(DIR_O)\WindowAccessor.obj: ../src/WindowAccessor.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/WindowAccessor.h ../include/Scintilla.h + +$(DIR_O)\XPM.obj: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h diff --git a/include/Scintilla.h b/include/Scintilla.h index 2282e26a1..153a5123c 100644 --- a/include/Scintilla.h +++ b/include/Scintilla.h @@ -227,7 +227,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define SCI_SETWORDCHARS 2077 #define SCI_BEGINUNDOACTION 2078 #define SCI_ENDUNDOACTION 2079 -#define INDIC_MAX 7 +#define INDIC_MAX 31 #define INDIC_PLAIN 0 #define INDIC_SQUIGGLE 1 #define INDIC_TT 2 @@ -639,6 +639,16 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define SC_ALPHA_NOALPHA 256 #define SCI_SETCARETLINEBACKALPHA 2470 #define SCI_GETCARETLINEBACKALPHA 2471 +#define SCI_SETINDICATORCURRENT 2500 +#define SCI_GETINDICATORCURRENT 2501 +#define SCI_SETINDICATORVALUE 2502 +#define SCI_GETINDICATORVALUE 2503 +#define SCI_INDICATORFILLRANGE 2504 +#define SCI_INDICATORCLEARRANGE 2505 +#define SCI_INDICATORALLONFOR 2506 +#define SCI_INDICATORVALUEAT 2507 +#define SCI_INDICATORSTART 2508 +#define SCI_INDICATOREND 2509 #define SCI_STARTRECORD 3001 #define SCI_STOPRECORD 3002 #define SCI_SETLEXER 4001 @@ -717,6 +727,8 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define SCN_HOTSPOTDOUBLECLICK 2020 #define SCN_CALLTIPCLICK 2021 #define SCN_AUTOCSELECTION 2022 +#define SCN_INDICATORCLICK 2023 +#define SCN_INDICATORRELEASE 2024 //--Autogenerated -- end of section automatically generated from Scintilla.iface // These structures are defined to be exactly the same shape as the Win32 diff --git a/include/Scintilla.iface b/include/Scintilla.iface index 8da0d9577..d0a9566da 100644 --- a/include/Scintilla.iface +++ b/include/Scintilla.iface @@ -526,7 +526,7 @@ fun void BeginUndoAction=2078(,) fun void EndUndoAction=2079(,) enu IndicatorStyle=INDIC_ -val INDIC_MAX=7 +val INDIC_MAX=31 val INDIC_PLAIN=0 val INDIC_SQUIGGLE=1 val INDIC_TT=2 @@ -1726,6 +1726,36 @@ set void SetCaretLineBackAlpha=2470(int alpha,) # Get the background alpha of the caret line. get int GetCaretLineBackAlpha=2471(,) +# Set the indicator used for IndicatorFillRange and IndicatorClearRange +set void SetIndicatorCurrent=2500(int indicator,) + +# Get the current indicator +get int GetIndicatorCurrent=2501(,) + +# Set the value used for IndicatorFillRange +set void SetIndicatorValue=2502(int value,) + +# Get the current indicator vaue +get int GetIndicatorValue=2503(,) + +# Turn a indicator on over a range. +fun void IndicatorFillRange=2504(int position, int fillLength) + +# Turn a indicator off over a range. +fun void IndicatorClearRange=2505(int position, int clearLength) + +# Are any indicators present at position? +fun int IndicatorAllOnFor=2506(int position,) + +# What value does a particular indicator have at at a position? +fun int IndicatorValueAt=2507(int indicator, int position) + +# Where does a particular indicator start? +fun int IndicatorStart=2508(int indicator, int position) + +# Where does a particular indicator end? +fun int IndicatorEnd=2509(int indicator, int position) + # Start notifying the container of all key presses and commands. fun void StartRecord=3001(,) @@ -3098,6 +3128,8 @@ evt void HotSpotClick=2019(int modifiers, int position) evt void HotSpotDoubleClick=2020(int modifiers, int position) evt void CallTipClick=2021(int position) evt void AutoCSelection=2022(string text) +evt void IndicatorClick=2023(int modifiers, int position) +evt void IndicatorRelease=2024(int modifiers, int position) cat Deprecated diff --git a/src/Document.cxx b/src/Document.cxx index 8bc1a70b0..964d4808b 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -16,8 +16,10 @@ #include "SVector.h" #include "SplitVector.h" #include "Partitioning.h" +#include "RunStyles.h" #include "CellBuffer.h" #include "CharClassify.h" +#include "Decoration.h" #include "Document.h" #include "RESearch.h" diff --git a/src/Document.h b/src/Document.h index 829ecbd81..90b4fe1b5 100644 --- a/src/Document.h +++ b/src/Document.h @@ -122,6 +122,8 @@ public: bool tabIndents; bool backspaceUnindents; + DecorationList decorations; + Document(); virtual ~Document(); diff --git a/src/DocumentAccessor.cxx b/src/DocumentAccessor.cxx index e764bfeac..afe4670a4 100644 --- a/src/DocumentAccessor.cxx +++ b/src/DocumentAccessor.cxx @@ -18,9 +18,11 @@ #include "DocumentAccessor.h" #include "SplitVector.h" #include "Partitioning.h" +#include "RunStyles.h" #include "CellBuffer.h" #include "Scintilla.h" #include "CharClassify.h" +#include "Decoration.h" #include "Document.h" DocumentAccessor::~DocumentAccessor() { diff --git a/src/Editor.cxx b/src/Editor.cxx index 06ed59144..cdbd81474 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -23,12 +23,14 @@ #include "Partitioning.h" #include "CellBuffer.h" #include "KeyMap.h" +#include "RunStyles.h" #include "Indicator.h" #include "XPM.h" #include "LineMarker.h" #include "Style.h" #include "ViewStyle.h" #include "CharClassify.h" +#include "Decoration.h" #include "Document.h" #include "Editor.h" @@ -2308,6 +2310,73 @@ void Editor::DrawEOL(Surface *surface, ViewStyle &vsDraw, PRectangle rcLine, Lin } } +void Editor::DrawIndicators(Surface *surface, ViewStyle &vsDraw, int line, int xStart, + PRectangle rcLine, LineLayout *ll, int subLine, int lineEnd, bool under) { + // Draw decorators + const int posLineStart = pdoc->LineStart(line); + const int lineStart = ll->LineStart(subLine); + const int subLineStart = ll->positions[lineStart]; + const int posLineEnd = posLineStart + lineEnd; + + if (!under) { + // Draw indicators + // foreach indicator... + for (int indicnum = 0, mask = 1 << pdoc->stylingBits; mask < 0x100; indicnum++) { + if (!(mask & ll->styleBitsSet)) { + mask <<= 1; + continue; + } + int startPos = -1; + // foreach style pos in line... + for (int indicPos = lineStart; indicPos <= lineEnd; indicPos++) { + // look for starts... + if (startPos < 0) { + // NOT in indicator run, looking for START + if (indicPos < lineEnd && (ll->indicators[indicPos] & mask)) + startPos = indicPos; + } + // ... or ends + if (startPos >= 0) { + // IN indicator run, looking for END + if (indicPos >= lineEnd || !(ll->indicators[indicPos] & mask)) { + // AT end of indicator run, DRAW it! + PRectangle rcIndic( + ll->positions[startPos] + xStart - subLineStart, + rcLine.top + vsDraw.maxAscent, + ll->positions[indicPos] + xStart - subLineStart, + rcLine.top + vsDraw.maxAscent + 3); + vsDraw.indicators[indicnum].Draw(surface, rcIndic, rcLine); + // RESET control var + startPos = -1; + } + } + } + mask <<= 1; + } + } + + for (Decoration *deco=pdoc->decorations.root; deco; deco = deco->next) { + if (under == (deco->indicator >= 16)) { + int startPos = posLineStart + subLineStart; + if (!deco->rs.ValueAt(startPos)) { + startPos = deco->rs.EndRun(startPos); + } + while ((startPos < posLineEnd) && (deco->rs.ValueAt(startPos))) { + int endPos = deco->rs.EndRun(startPos); + if (endPos > posLineEnd) + endPos = posLineEnd; + PRectangle rcIndic( + ll->positions[startPos - posLineStart] + xStart - subLineStart, + rcLine.top + vsDraw.maxAscent, + ll->positions[endPos - posLineStart] + xStart - subLineStart, + rcLine.top + vsDraw.maxAscent + 3); + vsDraw.indicators[deco->indicator].Draw(surface, rcIndic, rcLine); + startPos = deco->rs.EndRun(endPos); + } + } + } +} + void Editor::DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVisible, int xStart, PRectangle rcLine, LineLayout *ll, int subLine) { @@ -2486,6 +2555,8 @@ void Editor::DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVis drawWrapMarkEnd, wrapColour); } + DrawIndicators(surface, vsDraw, line, xStart, rcLine, ll, subLine, lineEnd, true); + if (vsDraw.edgeState == EDGE_LINE) { int edgeX = theEdge * vsDraw.spaceWidth; rcSegment.left = edgeX + xStart; @@ -2651,40 +2722,8 @@ void Editor::DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVis } } - // Draw indicators - // foreach indicator... - for (int indicnum = 0, mask = 1 << pdoc->stylingBits; mask < 0x100; indicnum++) { - if (!(mask & ll->styleBitsSet)) { - mask <<= 1; - continue; - } - int startPos = -1; - // foreach style pos in line... - for (int indicPos = lineStart; indicPos <= lineEnd; indicPos++) { - // look for starts... - if (startPos < 0) { - // NOT in indicator run, looking for START - if (indicPos < lineEnd && (ll->indicators[indicPos] & mask)) - startPos = indicPos; - } - // ... or ends - if (startPos >= 0) { - // IN indicator run, looking for END - if (indicPos >= lineEnd || !(ll->indicators[indicPos] & mask)) { - // AT end of indicator run, DRAW it! - PRectangle rcIndic( - ll->positions[startPos] + xStart - subLineStart, - rcLine.top + vsDraw.maxAscent, - ll->positions[indicPos] + xStart - subLineStart, - rcLine.top + vsDraw.maxAscent + 3); - vsDraw.indicators[indicnum].Draw(surface, rcIndic, rcLine); - // RESET control var - startPos = -1; - } - } - } - mask <<= 1; - } + DrawIndicators(surface, vsDraw, line, xStart, rcLine, ll, subLine, lineEnd, false); + // End of the drawing of the current line if (!twoPhaseDraw) { DrawEOL(surface, vsDraw, rcLine, ll, line, lineEnd, @@ -3678,6 +3717,18 @@ void Editor::NotifyPainted() { NotifyParent(scn); } +void Editor::NotifyIndicatorClick(bool click, int position, bool shift, bool ctrl, bool alt) { + int mask = pdoc->decorations.AllOnFor(position); + if ((click && mask) || pdoc->decorations.clickNotified) { + SCNotification scn = {0}; + pdoc->decorations.clickNotified = click; + scn.nmhdr.code = click ? SCN_INDICATORCLICK : SCN_INDICATORRELEASE; + scn.modifiers = (shift ? SCI_SHIFT : 0) | (ctrl ? SCI_CTRL : 0) | (alt ? SCI_ALT : 0); + scn.position = position; + NotifyParent(scn); + } +} + bool Editor::NotifyMarginClick(Point pt, bool shift, bool ctrl, bool alt) { int marginClicked = -1; int x = 0; @@ -3798,11 +3849,13 @@ void Editor::NotifyModified(Document*, DocModification mh, void *) { anchor = MovePositionForInsertion(anchor, mh.position, mh.length); braces[0] = MovePositionForInsertion(braces[0], mh.position, mh.length); braces[1] = MovePositionForInsertion(braces[1], mh.position, mh.length); + pdoc->decorations.InsertSpace(mh.position, mh.length); } else if (mh.modificationType & SC_MOD_DELETETEXT) { currentPos = MovePositionForDeletion(currentPos, mh.position, mh.length); anchor = MovePositionForDeletion(anchor, mh.position, mh.length); braces[0] = MovePositionForDeletion(braces[0], mh.position, mh.length); braces[1] = MovePositionForDeletion(braces[1], mh.position, mh.length); + pdoc->decorations.DeleteRange(mh.position, mh.length); } if (cs.LinesDisplayed() < cs.LinesInDoc()) { // Some lines are hidden so may need shown. @@ -5116,6 +5169,8 @@ void Editor::ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, b if (processed) return; + NotifyIndicatorClick(true, newPos, shift, ctrl, alt); + bool inSelMargin = PointInSelMargin(pt); if (shift & !inSelMargin) { SetSelection(newPos); @@ -5370,6 +5425,7 @@ void Editor::ButtonUp(Point pt, unsigned int curTime, bool ctrl) { SetMouseCapture(false); int newPos = PositionFromLocation(pt); newPos = MovePositionOutsideChar(newPos, currentPos - newPos); + NotifyIndicatorClick(false, newPos, false, false, false); if (inDragDrop) { int selStart = SelectionStart(); int selEnd = SelectionEnd(); @@ -7079,6 +7135,39 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { case SCI_INDICGETFORE: return (wParam <= INDIC_MAX) ? vs.indicators[wParam].fore.desired.AsLong() : 0; + case SCI_SETINDICATORCURRENT: + pdoc->decorations.SetCurrentIndicator(wParam); + break; + case SCI_GETINDICATORCURRENT: + return pdoc->decorations.GetCurrentIndicator(); + case SCI_SETINDICATORVALUE: + pdoc->decorations.SetCurrentValue(wParam); + break; + case SCI_GETINDICATORVALUE: + return pdoc->decorations.GetCurrentValue(); + + case SCI_INDICATORFILLRANGE: + pdoc->decorations.FillRange(wParam, pdoc->decorations.GetCurrentValue(), lParam); + InvalidateRange(wParam, wParam + lParam); + break; + + case SCI_INDICATORCLEARRANGE: + pdoc->decorations.FillRange(wParam, 0, lParam); + InvalidateRange(wParam, wParam + lParam); + break; + + case SCI_INDICATORALLONFOR: + return pdoc->decorations.AllOnFor(wParam); + + case SCI_INDICATORVALUEAT: + return pdoc->decorations.ValueAt(wParam, lParam); + + case SCI_INDICATORSTART: + return pdoc->decorations.Start(wParam, lParam); + + case SCI_INDICATOREND: + return pdoc->decorations.End(wParam, lParam); + case SCI_LINEDOWN: case SCI_LINEDOWNEXTEND: case SCI_PARADOWN: diff --git a/src/Editor.h b/src/Editor.h index 3399b70c7..04bf21958 100644 --- a/src/Editor.h +++ b/src/Editor.h @@ -395,6 +395,8 @@ protected: // ScintillaBase subclass needs access to much of Editor int line, int lineEnd, int xStart, int subLine, int subLineStart, bool overrideBackground, ColourAllocated background, bool drawWrapMark, ColourAllocated wrapColour); + void DrawIndicators(Surface *surface, ViewStyle &vsDraw, int line, int xStart, + PRectangle rcLine, LineLayout *ll, int subLine, int lineEnd, bool under); void DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVisible, int xStart, PRectangle rcLine, LineLayout *ll, int subLine=0); void RefreshPixMaps(Surface *surfaceWindow); @@ -441,6 +443,7 @@ protected: // ScintillaBase subclass needs access to much of Editor void NotifyHotSpotDoubleClicked(int position, bool shift, bool ctrl, bool alt); void NotifyUpdateUI(); void NotifyPainted(); + void NotifyIndicatorClick(bool click, int position, bool shift, bool ctrl, bool alt); bool NotifyMarginClick(Point pt, bool shift, bool ctrl, bool alt); void NotifyNeedShown(int pos, int len); void NotifyDwelling(Point pt, bool state); diff --git a/src/Partitioning.h b/src/Partitioning.h index e30189d75..175eba7b5 100644 --- a/src/Partitioning.h +++ b/src/Partitioning.h @@ -86,7 +86,7 @@ public: ~Partitioning() { delete body; - body = NULL; + body = 0; } int Partitions() { diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx index 0f3b3c093..52a0e2c2c 100644 --- a/src/ScintillaBase.cxx +++ b/src/ScintillaBase.cxx @@ -24,6 +24,7 @@ #include "SVector.h" #include "SplitVector.h" #include "Partitioning.h" +#include "RunStyles.h" #include "CellBuffer.h" #include "CallTip.h" #include "KeyMap.h" @@ -34,6 +35,7 @@ #include "ViewStyle.h" #include "AutoComplete.h" #include "CharClassify.h" +#include "Decoration.h" #include "Document.h" #include "Editor.h" #include "ScintillaBase.h" diff --git a/src/SplitVector.h b/src/SplitVector.h index 4b9875b4a..342be02ad 100644 --- a/src/SplitVector.h +++ b/src/SplitVector.h @@ -66,7 +66,7 @@ public: ~SplitVector() { delete []body; - body = NULL; + body = 0; } int GetGrowSize() const { @@ -85,7 +85,7 @@ public: // Move the gap to the end GapTo(lengthBody); T *newBody = new T[newSize]; - if ((size != 0) && (body != NULL)) { + if ((size != 0) && (body != 0)) { memmove(newBody, body, sizeof(T) * lengthBody); delete []body; } diff --git a/src/ViewStyle.cxx b/src/ViewStyle.cxx index b6b14da9b..403d17a3a 100644 --- a/src/ViewStyle.cxx +++ b/src/ViewStyle.cxx @@ -10,6 +10,9 @@ #include "Platform.h" #include "Scintilla.h" +#include "SplitVector.h" +#include "Partitioning.h" +#include "RunStyles.h" #include "Indicator.h" #include "XPM.h" #include "LineMarker.h" diff --git a/vcbuild/SciLexer.dsp b/vcbuild/SciLexer.dsp index 18aad2ed7..331d35a1f 100644 --- a/vcbuild/SciLexer.dsp +++ b/vcbuild/SciLexer.dsp @@ -7,19 +7,19 @@ CFG=SciLexer - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run -!MESSAGE +!MESSAGE !MESSAGE NMAKE /f "SciLexer.mak". -!MESSAGE +!MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE +!MESSAGE !MESSAGE NMAKE /f "SciLexer.mak" CFG="SciLexer - Win32 Debug" -!MESSAGE +!MESSAGE !MESSAGE Possible choices for configuration are: -!MESSAGE +!MESSAGE !MESSAGE "SciLexer - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "SciLexer - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE +!MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 @@ -83,7 +83,7 @@ LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib comctl32.lib /nologo /dll /debug /machine:I386 -!ENDIF +!ENDIF # Begin Target @@ -114,6 +114,10 @@ SOURCE=..\src\ContractionState.cxx # End Source File # Begin Source File +SOURCE=..\src\Decoration.cxx +# End Source File +# Begin Source File + SOURCE=..\src\Document.cxx # End Source File # Begin Source File @@ -402,6 +406,10 @@ SOURCE=..\src\RESearch.cxx # End Source File # Begin Source File +SOURCE=..\src\RunStyles.cxx +# End Source File +# Begin Source File + SOURCE=..\src\ScintillaBase.cxx # End Source File # Begin Source File diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index ae30b9a4d..046da18a6 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -32,6 +32,7 @@ #include "SVector.h" #include "SplitVector.h" #include "Partitioning.h" +#include "RunStyles.h" #include "CellBuffer.h" #include "CallTip.h" #include "KeyMap.h" @@ -42,6 +43,7 @@ #include "AutoComplete.h" #include "ViewStyle.h" #include "CharClassify.h" +#include "Decoration.h" #include "Document.h" #include "Editor.h" #include "ScintillaBase.h" @@ -740,7 +742,7 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam } else { if (IsUnicodeMode()) { char utfval[4]; - wchar_t wcs[2] = {wParam, 0}; + wchar_t wcs[2] = {static_cast<wchar_t>(wParam), 0}; unsigned int len = UTF8Length(wcs, 1); UTF8FromUCS2(wcs, 1, utfval, len); AddCharUTF(utfval, len); diff --git a/win32/deps.mak b/win32/deps.mak index 44723e267..d41c20a13 100644 --- a/win32/deps.mak +++ b/win32/deps.mak @@ -2,34 +2,46 @@ PlatWin.o: PlatWin.cxx ../include/Platform.h PlatformRes.h \ ../src/UniConversion.h ../src/XPM.h ScintillaWin.o: ScintillaWin.cxx ../include/Platform.h \ ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ - ../src/SVector.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ + ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ - ../src/AutoComplete.h ../src/ViewStyle.h ../src/CharClassify.h ../src/Document.h \ - ../src/Editor.h ../src/ScintillaBase.h ../src/UniConversion.h + ../src/AutoComplete.h ../src/ViewStyle.h ../src/CharClassify.h \ + ../src/Decoration.h ../src/Document.h ../src/Editor.h \ + ../src/ScintillaBase.h ../src/UniConversion.h AutoComplete.o: ../src/AutoComplete.cxx ../include/Platform.h \ ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h CallTip.o: ../src/CallTip.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/CallTip.h CellBuffer.o: ../src/CellBuffer.cxx ../include/Platform.h \ - ../include/Scintilla.h ../src/SVector.h ../src/CellBuffer.h + ../include/Scintilla.h ../src/SVector.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/CellBuffer.h CharClassify.o: ../src/CharClassify.cxx ../src/CharClassify.h ContractionState.o: ../src/ContractionState.cxx ../include/Platform.h \ ../src/ContractionState.h +Decoration.o: ../src/Decoration.cxx ../include/Platform.h \ + ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h ../src/Decoration.h Document.o: ../src/Document.cxx ../include/Platform.h \ - ../include/Scintilla.h ../src/SVector.h ../src/CellBuffer.h \ - ../src/CharClassify.h ../src/Document.h ../src/RESearch.h + ../include/Scintilla.h ../src/SVector.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ + ../src/CharClassify.h ../src/Decoration.h ../src/Document.h \ + ../src/RESearch.h DocumentAccessor.o: ../src/DocumentAccessor.cxx ../include/Platform.h \ ../include/PropSet.h ../include/SString.h ../src/SVector.h \ - ../include/Accessor.h ../src/DocumentAccessor.h ../src/CellBuffer.h \ - ../include/Scintilla.h ../src/CharClassify.h ../src/Document.h + ../include/Accessor.h ../src/DocumentAccessor.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ + ../include/Scintilla.h ../src/CharClassify.h ../src/Decoration.h \ + ../src/Document.h Editor.o: ../src/Editor.cxx ../include/Platform.h ../include/Scintilla.h \ - ../src/ContractionState.h ../src/SVector.h ../src/CellBuffer.h \ - ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ - ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h ../src/Document.h ../src/Editor.h + ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/CellBuffer.h ../src/KeyMap.h \ + ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ + ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \ + ../src/Decoration.h ../src/Document.h ../src/Editor.h ExternalLexer.o: ../src/ExternalLexer.cxx ../include/Platform.h \ - ../include/SciLexer.h ../include/PropSet.h ../include/SString.h \ - ../include/Accessor.h ../src/DocumentAccessor.h ../include/KeyWords.h \ - ../src/ExternalLexer.h + ../include/Scintilla.h ../include/SciLexer.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/DocumentAccessor.h \ + ../include/KeyWords.h ../src/ExternalLexer.h Indicator.o: ../src/Indicator.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/Indicator.h KeyMap.o: ../src/KeyMap.cxx ../include/Platform.h ../include/Scintilla.h \ @@ -39,13 +51,16 @@ KeyWords.o: ../src/KeyWords.cxx ../include/Platform.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexAda.o: ../src/LexAda.cxx ../include/Platform.h ../include/Accessor.h \ ../src/StyleContext.h ../include/PropSet.h ../include/SString.h \ - ../include/KeyWords.h ../include/SciLexer.h + ../include/KeyWords.h ../include/SciLexer.h ../include/SString.h LexAPDL.o: ../src/LexAPDL.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexAsm.o: ../src/LexAsm.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexAsn1.o: ../src/LexAsn1.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexAU3.o: ../src/LexAU3.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h @@ -58,12 +73,22 @@ LexBaan.o: ../src/LexBaan.cxx ../include/Platform.h ../include/PropSet.h \ LexBash.o: ../src/LexBash.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h +LexBasic.o: ../src/LexBasic.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ + ../include/SciLexer.h LexBullant.o: ../src/LexBullant.cxx ../include/Platform.h \ ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexCaml.o: ../src/LexCaml.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexCLW.o: ../src/LexCLW.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexCmake.o: ../src/LexCmake.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexConf.o: ../src/LexConf.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h @@ -73,9 +98,16 @@ LexCPP.o: ../src/LexCPP.cxx ../include/Platform.h ../include/PropSet.h \ LexCrontab.o: ../src/LexCrontab.cxx ../include/Platform.h \ ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexCsound.o: ../src/LexCsound.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ + ../include/SciLexer.h LexCSS.o: ../src/LexCSS.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexD.o: ../src/LexD.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexEiffel.o: ../src/LexEiffel.cxx ../include/Platform.h \ ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ @@ -88,6 +120,10 @@ LexEScript.o: ../src/LexEScript.cxx ../include/Platform.h \ ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h +LexFlagship.o: ../src/LexFlagship.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ + ../include/SciLexer.h LexForth.o: ../src/LexForth.cxx ../include/Platform.h \ ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h @@ -99,15 +135,22 @@ LexGui4Cli.o: ../src/LexGui4Cli.cxx ../include/Platform.h \ ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h +LexHaskell.o: ../src/LexHaskell.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ + ../include/SciLexer.h LexHTML.o: ../src/LexHTML.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexInno.o: ../src/LexInno.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexKix.o: ../src/LexKix.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexLisp.o: ../src/LexLisp.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ - ../include/Scintilla.h ../include/SciLexer.h + ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h LexLout.o: ../src/LexLout.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h @@ -128,13 +171,16 @@ LexMMIXAL.o: ../src/LexMMIXAL.cxx ../include/Platform.h \ ../include/SciLexer.h LexMPT.o: ../src/LexMPT.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ - ../include/Scintilla.h ../include/SciLexer.h + ../include/Scintilla.h ../include/SciLexer.h ../include/SString.h LexMSSQL.o: ../src/LexMSSQL.cxx ../include/Platform.h \ ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexNsis.o: ../src/LexNsis.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h +LexOpal.o: ../src/LexOpal.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ + ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h LexOthers.o: ../src/LexOthers.cxx ../include/Platform.h \ ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h @@ -158,19 +204,38 @@ LexPython.o: ../src/LexPython.cxx ../include/Platform.h \ ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h +LexRebol.o: ../src/LexRebol.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \ + ../src/StyleContext.h LexRuby.o: ../src/LexRuby.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h LexScriptol.o: ../src/LexScriptol.cxx ../include/Platform.h \ ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexSmalltalk.o: ../src/LexSmalltalk.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ + ../include/SciLexer.h LexSpecman.o: ../src/LexSpecman.cxx ../include/Platform.h \ ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h +LexSpice.o: ../src/LexSpice.cxx ../include/Platform.h \ + ../include/Accessor.h ../src/StyleContext.h ../include/PropSet.h \ + ../include/SString.h ../include/KeyWords.h ../include/SciLexer.h \ + ../include/SString.h LexSQL.o: ../src/LexSQL.cxx ../include/Platform.h ../include/PropSet.h \ - ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ - ../include/Scintilla.h ../include/SciLexer.h + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h +LexTADS3.o: ../src/LexTADS3.cxx ../include/Platform.h \ + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ + ../include/SciLexer.h +LexTCL.o: ../src/LexTCL.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexTeX.o: ../src/LexTeX.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \ ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h @@ -181,6 +246,9 @@ LexVerilog.o: ../src/LexVerilog.cxx ../include/Platform.h \ ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \ ../include/SciLexer.h +LexVHDL.o: ../src/LexVHDL.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h LexYAML.o: ../src/LexYAML.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \ ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h @@ -188,14 +256,18 @@ LineMarker.o: ../src/LineMarker.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/XPM.h ../src/LineMarker.h PropSet.o: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h \ ../include/SString.h -RESearch.o: ../src/RESearch.cxx ../src/RESearch.h +RESearch.o: ../src/RESearch.cxx ../src/CharClassify.h ../src/RESearch.h +RunStyles.o: ../src/RunStyles.cxx ../include/Platform.h \ + ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h ScintillaBase.o: ../src/ScintillaBase.cxx ../include/Platform.h \ ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ - ../src/ContractionState.h ../src/SVector.h ../src/CellBuffer.h \ + ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \ ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \ - ../src/AutoComplete.h ../src/CharClassify.h ../src/Document.h ../src/Editor.h \ - ../src/ScintillaBase.h + ../src/AutoComplete.h ../src/CharClassify.h ../src/Decoration.h \ + ../src/Document.h ../src/Editor.h ../src/ScintillaBase.h Style.o: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \ ../src/Style.h StyleContext.o: ../src/StyleContext.cxx ../include/Platform.h \ @@ -203,8 +275,9 @@ StyleContext.o: ../src/StyleContext.cxx ../include/Platform.h \ ../src/StyleContext.h UniConversion.o: ../src/UniConversion.cxx ../src/UniConversion.h ViewStyle.o: ../src/ViewStyle.cxx ../include/Platform.h \ - ../include/Scintilla.h ../src/Indicator.h ../src/XPM.h \ - ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h + ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ + ../src/Style.h ../src/ViewStyle.h WindowAccessor.o: ../src/WindowAccessor.cxx ../include/Platform.h \ ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ ../include/WindowAccessor.h ../include/Scintilla.h diff --git a/win32/makefile b/win32/makefile index ef18e0d7a..ce0d2c076 100644 --- a/win32/makefile +++ b/win32/makefile @@ -62,16 +62,16 @@ LexScriptol.o LexSmalltalk.o LexSpecman.o LexSpice.o LexSQL.o LexTADS3.o \ LexTCL.o LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o #--Autogenerated -- end of automatically generated section -SOBJS = ScintillaWin.o ScintillaBase.o Editor.o CharClassify.o Document.o \ - ContractionState.o CellBuffer.o CallTip.o \ - ScintRes.o PlatWin.o KeyMap.o Indicator.o LineMarker.o RESearch.o \ +SOBJS = ScintillaWin.o ScintillaBase.o Editor.o CharClassify.o Decoration.o \ + Document.o ContractionState.o CellBuffer.o CallTip.o \ + ScintRes.o PlatWin.o KeyMap.o Indicator.o LineMarker.o RESearch.o RunStyles.o \ Style.o ViewStyle.o AutoComplete.o UniConversion.o PropSet.o XPM.o $(COMPONENT): $(SOBJS) Scintilla.def $(DLLWRAP) --add-stdcall-alias --target i386-mingw32 -o $@ $(SOBJS) $(LDFLAGS) -s --relocatable -LOBJS = ScintillaWinL.o ScintillaBaseL.o Editor.o CharClassify.o Document.o \ - ContractionState.o CellBuffer.o CallTip.o \ - ScintRes.o PlatWin.o KeyMap.o Indicator.o LineMarker.o RESearch.o \ +LOBJS = ScintillaWinL.o ScintillaBaseL.o Editor.o CharClassify.o Decoration.o \ + Document.o ContractionState.o CellBuffer.o CallTip.o \ + ScintRes.o PlatWin.o KeyMap.o Indicator.o LineMarker.o RESearch.o RunStyles.o \ Style.o ViewStyle.o AutoComplete.o UniConversion.o KeyWords.o \ DocumentAccessor.o PropSet.o ExternalLexer.o StyleContext.o XPM.o $(LEXOBJS) $(LEXCOMPONENT): $(LOBJS) Scintilla.def diff --git a/win32/scintilla.mak b/win32/scintilla.mak index fafe6f335..0d60c4bea 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -92,6 +92,7 @@ SOBJS=\ $(DIR_O)\CellBuffer.obj \ $(DIR_O)\CharClassify.obj \ $(DIR_O)\ContractionState.obj \ + $(DIR_O)\Decoration.obj \ $(DIR_O)\Document.obj \ $(DIR_O)\Editor.obj \ $(DIR_O)\Indicator.obj \ @@ -100,6 +101,7 @@ SOBJS=\ $(DIR_O)\PlatWin.obj \ $(DIR_O)\PropSet.obj \ $(DIR_O)\RESearch.obj \ + $(DIR_O)\RunStyles.obj \ $(DIR_O)\ScintillaBase.obj \ $(DIR_O)\ScintillaWin.obj \ $(DIR_O)\Style.obj \ @@ -180,6 +182,7 @@ LOBJS=\ $(DIR_O)\CellBuffer.obj \ $(DIR_O)\CharClassify.obj \ $(DIR_O)\ContractionState.obj \ + $(DIR_O)\Decoration.obj \ $(DIR_O)\Document.obj \ $(DIR_O)\DocumentAccessor.obj \ $(DIR_O)\Editor.obj \ @@ -189,8 +192,9 @@ LOBJS=\ $(DIR_O)\KeyWords.obj \ $(DIR_O)\LineMarker.obj \ $(DIR_O)\PlatWin.obj \ - $(DIR_O)\RESearch.obj \ $(DIR_O)\PropSet.obj \ + $(DIR_O)\RESearch.obj \ + $(DIR_O)\RunStyles.obj \ $(DIR_O)\ScintillaBaseL.obj \ $(DIR_O)\ScintillaWinL.obj \ $(DIR_O)\Style.obj \ @@ -247,37 +251,46 @@ LEX_HEADERS=..\include\Platform.h ..\include\PropSet.h \ ..\include\Scintilla.h ..\include\SciLexer.h ..\src\StyleContext.h $(DIR_O)\AutoComplete.obj: ../src/AutoComplete.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h + ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h $(DIR_O)\CallTip.obj: ../src/CallTip.cxx ../include/Platform.h \ - ../include/Scintilla.h ../src/CallTip.h + ../include/Scintilla.h ../src/CallTip.h $(DIR_O)\CellBuffer.obj: ../src/CellBuffer.cxx ../include/Platform.h \ - ../include/Scintilla.h ../src/SVector.h ../src/CellBuffer.h + ../include/Scintilla.h ../src/SVector.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/CellBuffer.h $(DIR_O)\CharClassify.obj: ../src/CharClassify.cxx ../src/CharClassify.h $(DIR_O)\ContractionState.obj: ../src/ContractionState.cxx ../include/Platform.h \ - ../src/ContractionState.h + ../src/ContractionState.h +$(DIR_O)\Decoration.obj: ../src/Decoration.cxx ../include/Platform.h \ + ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h ../src/Decoration.h $(DIR_O)\Document.obj: ../src/Document.cxx ../include/Platform.h \ - ../include/Scintilla.h ../src/SVector.h ../src/CellBuffer.h \ - ../src/CharClassify.h ../src/Document.h ../src/RESearch.h + ../include/Scintilla.h ../src/SVector.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ + ../src/CharClassify.h ../src/Decoration.h ../src/Document.h \ + ../src/RESearch.h $(DIR_O)\DocumentAccessor.obj: ../src/DocumentAccessor.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../src/SVector.h \ - ../include/Accessor.h ../src/DocumentAccessor.h ../src/CellBuffer.h \ - ../include/Scintilla.h ../src/CharClassify.h ../src/Document.h -$(DIR_O)\Editor.obj: ../src/Editor.cxx ../include/Platform.h \ - ../include/Scintilla.h ../src/ContractionState.h ../src/SVector.h \ - ../src/CellBuffer.h ../src/KeyMap.h ../src/Indicator.h \ - ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \ - ../src/CharClassify.h ../src/Document.h ../src/Editor.h ../src/XPM.h + ../include/PropSet.h ../include/SString.h ../src/SVector.h \ + ../include/Accessor.h ../src/DocumentAccessor.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ + ../include/Scintilla.h ../src/CharClassify.h ../src/Decoration.h \ + ../src/Document.h +$(DIR_O)\Editor.obj: ../src/Editor.cxx ../include/Platform.h ../include/Scintilla.h \ + ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/CellBuffer.h ../src/KeyMap.h \ + ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ + ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \ + ../src/Decoration.h ../src/Document.h ../src/Editor.h $(DIR_O)\ExternalLexer.obj: ../src/ExternalLexer.cxx ../include/Platform.h \ - ../include/SciLexer.h ../include/PropSet.h ../include/SString.h \ - ../include/Accessor.h ../src/DocumentAccessor.h ../include/KeyWords.h \ - ../src/ExternalLexer.h + ../include/Scintilla.h ../include/SciLexer.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/DocumentAccessor.h \ + ../include/KeyWords.h ../src/ExternalLexer.h $(DIR_O)\Indicator.obj: ../src/Indicator.cxx ../include/Platform.h \ - ../include/Scintilla.h ../src/Indicator.h -$(DIR_O)\KeyMap.obj: ../src/KeyMap.cxx ../include/Platform.h \ - ../include/Scintilla.h ../src/KeyMap.h + ../include/Scintilla.h ../src/Indicator.h +$(DIR_O)\KeyMap.obj: ../src/KeyMap.cxx ../include/Platform.h ../include/Scintilla.h \ + ../src/KeyMap.h $(DIR_O)\KeyWords.obj: ../src/KeyWords.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ - ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h #++Autogenerated -- run src/LexGen.py to regenerate #**\n\($(DIR_O)\\\*.obj: ..\\src\\\*.cxx $(LEX_HEADERS)\n\n\) @@ -408,52 +421,66 @@ $(DIR_O)\LexYAML.obj: ..\src\LexYAML.cxx $(LEX_HEADERS) #--Autogenerated -- end of automatically generated section $(DIR_O)\LineMarker.obj: ../src/LineMarker.cxx ../include/Platform.h \ - ../include/Scintilla.h ../src/LineMarker.h ../src/XPM.h + ../include/Scintilla.h ../src/XPM.h ../src/LineMarker.h $(DIR_O)\PlatWin.obj: PlatWin.cxx ../include/Platform.h PlatformRes.h \ - ../src/UniConversion.h ../src/XPM.h -$(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h -$(DIR_O)\RESearch.obj: ../src/RESearch.cxx ../src/RESearch.h + ../src/UniConversion.h ../src/XPM.h +$(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h +$(DIR_O)\RESearch.obj: ../src/RESearch.cxx ../src/CharClassify.h ../src/RESearch.h +$(DIR_O)\RunStyles.obj: ../src/RunStyles.cxx ../include/Platform.h \ + ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h $(DIR_O)\ScintillaBase.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ - ../src/ContractionState.h ../src/SVector.h ../src/CellBuffer.h \ - ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h \ - ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \ - ../src/AutoComplete.h ../src/CharClassify.h ../src/Document.h ../src/Editor.h \ - ../src/ScintillaBase.h ../src/XPM.h -$(DIR_O)\ScintillaBaseL.obj: ..\src\ScintillaBase.cxx ..\include\Platform.h ..\include\Scintilla.h ..\include\SciLexer.h \ - ..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \ - ..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ../src/CharClassify.h \ - ..\src\Document.h ..\src\Editor.h \ - ..\src\ScintillaBase.h ..\include\PropSet.h ..\include\SString.h ..\include\Accessor.h \ - ..\src\DocumentAccessor.h ..\include\KeyWords.h ../src/XPM.h + ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ + ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ + ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \ + ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \ + ../src/AutoComplete.h ../src/CharClassify.h ../src/Decoration.h \ + ../src/Document.h ../src/Editor.h ../src/ScintillaBase.h +$(DIR_O)\ScintillaBaseL.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ + ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ + ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ + ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \ + ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \ + ../src/AutoComplete.h ../src/CharClassify.h ../src/Decoration.h \ + ../src/Document.h ../src/Editor.h ../src/ScintillaBase.h $(DIR_O)\ScintillaWin.obj: ScintillaWin.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ - ../src/SVector.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ - ../src/Indicator.h ../src/LineMarker.h ../src/Style.h \ - ../src/AutoComplete.h ../src/ViewStyle.h ../src/CharClassify.h ../src/Document.h \ - ../src/Editor.h ../src/ScintillaBase.h ../src/UniConversion.h ../src/XPM.h -$(DIR_O)\ScintillaWinL.obj: ScintillaWin.cxx ..\include\Platform.h ..\include\Scintilla.h ..\include\SciLexer.h \ - ..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \ - ..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ../src/CharClassify.h \ - ..\src\Document.h ..\src\Editor.h \ - ..\src\ScintillaBase.h ..\include\PropSet.h \ - ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h ..\src\UniConversion.h ../src/XPM.h -$(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx ..\include\Platform.h ..\include\Scintilla.h \ - ..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \ - ..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ../src/CharClassify.h \ - ..\src\Document.h ..\src\Editor.h \ - ..\src\ScintillaBase.h ..\src\UniConversion.h + ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ + ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ + ../src/AutoComplete.h ../src/ViewStyle.h ../src/CharClassify.h \ + ../src/Decoration.h ../src/Document.h ../src/Editor.h \ + ../src/ScintillaBase.h ../src/UniConversion.h +$(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx ../include/Platform.h \ + ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ + ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ + ../src/AutoComplete.h ../src/ViewStyle.h ../src/CharClassify.h \ + ../src/Decoration.h ../src/Document.h ../src/Editor.h \ + ../src/ScintillaBase.h ../src/UniConversion.h +$(DIR_O)\ScintillaWinL.obj: ScintillaWin.cxx ../include/Platform.h \ + ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ + ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ + ../src/AutoComplete.h ../src/ViewStyle.h ../src/CharClassify.h \ + ../src/Decoration.h ../src/Document.h ../src/Editor.h \ + ../src/ScintillaBase.h ../src/UniConversion.h $(DIR_O)\Style.obj: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \ - ../src/Style.h + ../src/Style.h $(DIR_O)\StyleContext.obj: ../src/StyleContext.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ - ../src/StyleContext.h + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../src/StyleContext.h $(DIR_O)\UniConversion.obj: ../src/UniConversion.cxx ../src/UniConversion.h $(DIR_O)\ViewStyle.obj: ../src/ViewStyle.cxx ../include/Platform.h \ - ../include/Scintilla.h ../src/Indicator.h ../src/LineMarker.h \ - ../src/Style.h ../src/ViewStyle.h ../src/XPM.h + ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ + ../src/Style.h ../src/ViewStyle.h $(DIR_O)\WindowAccessor.obj: ../src/WindowAccessor.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ - ../include/WindowAccessor.h ../include/Scintilla.h + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/WindowAccessor.h ../include/Scintilla.h $(DIR_O)\XPM.obj: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h diff --git a/win32/scintilla_vc6.mak b/win32/scintilla_vc6.mak index 75862f494..5506dd1fd 100644 --- a/win32/scintilla_vc6.mak +++ b/win32/scintilla_vc6.mak @@ -94,6 +94,7 @@ SOBJS=\ $(DIR_O)\CellBuffer.obj \ $(DIR_O)\CharClassify.obj \ $(DIR_O)\ContractionState.obj \ + $(DIR_O)\Decoration.obj \ $(DIR_O)\Document.obj \ $(DIR_O)\Editor.obj \ $(DIR_O)\Indicator.obj \ @@ -102,6 +103,7 @@ SOBJS=\ $(DIR_O)\PlatWin.obj \ $(DIR_O)\PropSet.obj \ $(DIR_O)\RESearch.obj \ + $(DIR_O)\RunStyles.obj \ $(DIR_O)\ScintillaBase.obj \ $(DIR_O)\ScintillaWin.obj \ $(DIR_O)\Style.obj \ @@ -182,6 +184,7 @@ LOBJS=\ $(DIR_O)\CellBuffer.obj \ $(DIR_O)\CharClassify.obj \ $(DIR_O)\ContractionState.obj \ + $(DIR_O)\Decoration.obj \ $(DIR_O)\Document.obj \ $(DIR_O)\DocumentAccessor.obj \ $(DIR_O)\Editor.obj \ @@ -191,6 +194,7 @@ LOBJS=\ $(DIR_O)\KeyWords.obj \ $(DIR_O)\LineMarker.obj \ $(DIR_O)\PlatWin.obj \ + $(DIR_O)\RunStyles.obj \ $(DIR_O)\RESearch.obj \ $(DIR_O)\PropSet.obj \ $(DIR_O)\ScintillaBaseL.obj \ @@ -249,37 +253,46 @@ LEX_HEADERS=..\include\Platform.h ..\include\PropSet.h \ ..\include\Scintilla.h ..\include\SciLexer.h ..\src\StyleContext.h $(DIR_O)\AutoComplete.obj: ../src/AutoComplete.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h + ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h $(DIR_O)\CallTip.obj: ../src/CallTip.cxx ../include/Platform.h \ - ../include/Scintilla.h ../src/CallTip.h + ../include/Scintilla.h ../src/CallTip.h $(DIR_O)\CellBuffer.obj: ../src/CellBuffer.cxx ../include/Platform.h \ - ../include/Scintilla.h ../src/SVector.h ../src/CellBuffer.h + ../include/Scintilla.h ../src/SVector.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/CellBuffer.h $(DIR_O)\CharClassify.obj: ../src/CharClassify.cxx ../src/CharClassify.h $(DIR_O)\ContractionState.obj: ../src/ContractionState.cxx ../include/Platform.h \ - ../src/ContractionState.h + ../src/ContractionState.h +$(DIR_O)\Decoration.obj: ../src/Decoration.cxx ../include/Platform.h \ + ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h ../src/Decoration.h $(DIR_O)\Document.obj: ../src/Document.cxx ../include/Platform.h \ - ../include/Scintilla.h ../src/SVector.h ../src/CellBuffer.h \ - ../src/Document.h ../src/RESearch.h + ../include/Scintilla.h ../src/SVector.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ + ../src/CharClassify.h ../src/Decoration.h ../src/Document.h \ + ../src/RESearch.h $(DIR_O)\DocumentAccessor.obj: ../src/DocumentAccessor.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../src/SVector.h \ - ../include/Accessor.h ../src/DocumentAccessor.h ../src/CellBuffer.h \ - ../include/Scintilla.h ../src/Document.h -$(DIR_O)\Editor.obj: ../src/Editor.cxx ../include/Platform.h \ - ../include/Scintilla.h ../src/ContractionState.h ../src/SVector.h \ - ../src/CellBuffer.h ../src/KeyMap.h ../src/Indicator.h \ - ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \ - ../src/Document.h ../src/Editor.h ../src/XPM.h + ../include/PropSet.h ../include/SString.h ../src/SVector.h \ + ../include/Accessor.h ../src/DocumentAccessor.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ + ../include/Scintilla.h ../src/CharClassify.h ../src/Decoration.h \ + ../src/Document.h +$(DIR_O)\Editor.obj: ../src/Editor.cxx ../include/Platform.h ../include/Scintilla.h \ + ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/CellBuffer.h ../src/KeyMap.h \ + ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ + ../src/Style.h ../src/ViewStyle.h ../src/CharClassify.h \ + ../src/Decoration.h ../src/Document.h ../src/Editor.h $(DIR_O)\ExternalLexer.obj: ../src/ExternalLexer.cxx ../include/Platform.h \ - ../include/SciLexer.h ../include/PropSet.h ../include/SString.h \ - ../include/Accessor.h ../src/DocumentAccessor.h ../include/KeyWords.h \ - ../src/ExternalLexer.h + ../include/Scintilla.h ../include/SciLexer.h ../include/PropSet.h \ + ../include/SString.h ../include/Accessor.h ../src/DocumentAccessor.h \ + ../include/KeyWords.h ../src/ExternalLexer.h $(DIR_O)\Indicator.obj: ../src/Indicator.cxx ../include/Platform.h \ - ../include/Scintilla.h ../src/Indicator.h -$(DIR_O)\KeyMap.obj: ../src/KeyMap.cxx ../include/Platform.h \ - ../include/Scintilla.h ../src/KeyMap.h + ../include/Scintilla.h ../src/Indicator.h +$(DIR_O)\KeyMap.obj: ../src/KeyMap.cxx ../include/Platform.h ../include/Scintilla.h \ + ../src/KeyMap.h $(DIR_O)\KeyWords.obj: ../src/KeyWords.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ - ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h #++Autogenerated -- run src/LexGen.py to regenerate #**\n\($(DIR_O)\\\*.obj: ..\\src\\\*.cxx $(LEX_HEADERS)\n\n\) @@ -410,49 +423,66 @@ $(DIR_O)\LexYAML.obj: ..\src\LexYAML.cxx $(LEX_HEADERS) #--Autogenerated -- end of automatically generated section $(DIR_O)\LineMarker.obj: ../src/LineMarker.cxx ../include/Platform.h \ - ../include/Scintilla.h ../src/LineMarker.h ../src/XPM.h + ../include/Scintilla.h ../src/XPM.h ../src/LineMarker.h $(DIR_O)\PlatWin.obj: PlatWin.cxx ../include/Platform.h PlatformRes.h \ - ../src/UniConversion.h ../src/XPM.h -$(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h -$(DIR_O)\RESearch.obj: ../src/RESearch.cxx ../src/RESearch.h + ../src/UniConversion.h ../src/XPM.h +$(DIR_O)\PropSet.obj: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h \ + ../include/SString.h +$(DIR_O)\RESearch.obj: ../src/RESearch.cxx ../src/CharClassify.h ../src/RESearch.h +$(DIR_O)\RunStyles.obj: ../src/RunStyles.cxx ../include/Platform.h \ + ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h $(DIR_O)\ScintillaBase.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ - ../src/ContractionState.h ../src/SVector.h ../src/CellBuffer.h \ - ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h \ - ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \ - ../src/AutoComplete.h ../src/Document.h ../src/Editor.h \ - ../src/ScintillaBase.h ../src/XPM.h -$(DIR_O)\ScintillaBaseL.obj: ..\src\ScintillaBase.cxx ..\include\Platform.h ..\include\Scintilla.h ..\include\SciLexer.h \ - ..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \ - ..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ..\src\Document.h ..\src\Editor.h \ - ..\src\ScintillaBase.h ..\include\PropSet.h ..\include\SString.h ..\include\Accessor.h \ - ..\src\DocumentAccessor.h ..\include\KeyWords.h ../src/XPM.h + ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ + ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ + ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \ + ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \ + ../src/AutoComplete.h ../src/CharClassify.h ../src/Decoration.h \ + ../src/Document.h ../src/Editor.h ../src/ScintillaBase.h +$(DIR_O)\ScintillaBaseL.obj: ../src/ScintillaBase.cxx ../include/Platform.h \ + ../include/Scintilla.h ../include/PropSet.h ../include/SString.h \ + ../src/ContractionState.h ../src/SVector.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ + ../src/CallTip.h ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h \ + ../src/LineMarker.h ../src/Style.h ../src/ViewStyle.h \ + ../src/AutoComplete.h ../src/CharClassify.h ../src/Decoration.h \ + ../src/Document.h ../src/Editor.h ../src/ScintillaBase.h $(DIR_O)\ScintillaWin.obj: ScintillaWin.cxx ../include/Platform.h \ - ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ - ../src/SVector.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ - ../src/Indicator.h ../src/LineMarker.h ../src/Style.h \ - ../src/AutoComplete.h ../src/ViewStyle.h ../src/Document.h \ - ../src/Editor.h ../src/ScintillaBase.h ../src/UniConversion.h ../src/XPM.h -$(DIR_O)\ScintillaWinL.obj: ScintillaWin.cxx ..\include\Platform.h ..\include\Scintilla.h ..\include\SciLexer.h \ - ..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \ - ..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ..\src\Document.h ..\src\Editor.h \ - ..\src\ScintillaBase.h ..\include\PropSet.h \ - ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h ..\src\UniConversion.h ../src/XPM.h -$(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx ..\include\Platform.h ..\include\Scintilla.h \ - ..\src\ContractionState.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \ - ..\src\LineMarker.h ..\src\Style.h ..\src\AutoComplete.h ..\src\ViewStyle.h ..\src\Document.h ..\src\Editor.h \ - ..\src\ScintillaBase.h ..\src\UniConversion.h + ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ + ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ + ../src/AutoComplete.h ../src/ViewStyle.h ../src/CharClassify.h \ + ../src/Decoration.h ../src/Document.h ../src/Editor.h \ + ../src/ScintillaBase.h ../src/UniConversion.h +$(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx ../include/Platform.h \ + ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ + ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ + ../src/AutoComplete.h ../src/ViewStyle.h ../src/CharClassify.h \ + ../src/Decoration.h ../src/Document.h ../src/Editor.h \ + ../src/ScintillaBase.h ../src/UniConversion.h +$(DIR_O)\ScintillaWinL.obj: ScintillaWin.cxx ../include/Platform.h \ + ../include/Scintilla.h ../include/SString.h ../src/ContractionState.h \ + ../src/SVector.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h ../src/CellBuffer.h ../src/CallTip.h ../src/KeyMap.h \ + ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h ../src/Style.h \ + ../src/AutoComplete.h ../src/ViewStyle.h ../src/CharClassify.h \ + ../src/Decoration.h ../src/Document.h ../src/Editor.h \ + ../src/ScintillaBase.h ../src/UniConversion.h $(DIR_O)\Style.obj: ../src/Style.cxx ../include/Platform.h ../include/Scintilla.h \ - ../src/Style.h + ../src/Style.h $(DIR_O)\StyleContext.obj: ../src/StyleContext.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ - ../src/StyleContext.h + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../src/StyleContext.h $(DIR_O)\UniConversion.obj: ../src/UniConversion.cxx ../src/UniConversion.h $(DIR_O)\ViewStyle.obj: ../src/ViewStyle.cxx ../include/Platform.h \ - ../include/Scintilla.h ../src/Indicator.h ../src/LineMarker.h \ - ../src/Style.h ../src/ViewStyle.h ../src/XPM.h + ../include/Scintilla.h ../src/SplitVector.h ../src/Partitioning.h \ + ../src/RunStyles.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \ + ../src/Style.h ../src/ViewStyle.h $(DIR_O)\WindowAccessor.obj: ../src/WindowAccessor.cxx ../include/Platform.h \ - ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ - ../include/WindowAccessor.h ../include/Scintilla.h + ../include/PropSet.h ../include/SString.h ../include/Accessor.h \ + ../include/WindowAccessor.h ../include/Scintilla.h $(DIR_O)\XPM.obj: ../src/XPM.cxx ../include/Platform.h ../src/XPM.h |