Updated to Scintilla 1.62

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-11 22:53:19 +00:00
parent cc9a39576a
commit a33203cb9f
78 changed files with 4016 additions and 1359 deletions
--- a/contrib/build/stc/makefile.wat
+++ b/contrib/build/stc/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.6 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================

@@ -62,6 +62,13 @@ WXDLLFLAG =
 !ifeq SHARED 1
 WXDLLFLAG = dll
 !endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
 EXTRALIBS_FOR_BASE =
 !ifeq MONOLITHIC 0
 EXTRALIBS_FOR_BASE = 
@@ -159,7 +166,14 @@ __EXCEPTIONSFLAG =
 __EXCEPTIONSFLAG = 
 !endif
 !ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG = -xs
+__EXCEPTIONSFLAG = -xr
+!endif
+__EXCEPTIONSFLAG_0 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_0 = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_0 = -xs
 !endif
 __WXUNIV_DEFINE_p =
 !ifeq WXUNIV 1
@@ -178,28 +192,23 @@ __UNICODE_DEFINE_p =
 !ifeq UNICODE 1
 __UNICODE_DEFINE_p = -d_UNICODE
 !endif
-LIBDIRNAME =
-!ifeq SHARED 0
-LIBDIRNAME = ..\..\src\stc\..\..\..\lib\wat_lib$(CFG)
-!endif
-!ifeq SHARED 1
-LIBDIRNAME = ..\..\src\stc\..\..\..\lib\wat_dll$(CFG)
-!endif

 ### Variables: ###

 WX_RELEASE_NODOT = 25
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4
 OBJS = &
 	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = ..\..\src\stc\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = &
 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 STCDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
 	-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
-	-i=..\..\src\stc\..\..\..\include -i=$(SETUPHDIR) -wcd=549 -wcd=656 -wcd=657 &
-	-i=..\..\src\stc\..\..\include -i=..\..\src\stc\scintilla\include &
-	-i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS &
-	-dWXUSINGDLL -dWXMAKINGDLL_STC $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+	-i=..\..\src\stc\..\..\..\include -i=$(SETUPHDIR) -wx -wcd=549 -wcd=656 &
+	-wcd=657 -wcd=667 -i=..\..\src\stc\..\..\include &
+	-i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\src -d__WX__ &
+	-dSCI_LEXER -dLINK_LEXERS -dWXUSINGDLL -dWXMAKINGDLL_STC $(__EXCEPTIONSFLAG) &
+	$(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
 STCDLL_OBJECTS =  &
 	$(OBJS)\stcdll_PlatWX.obj &
 	$(OBJS)\stcdll_ScintillaWX.obj &
@@ -208,8 +217,8 @@ STCDLL_OBJECTS =  &
 	$(OBJS)\stcdll_CallTip.obj &
 	$(OBJS)\stcdll_CellBuffer.obj &
 	$(OBJS)\stcdll_ContractionState.obj &
-	$(OBJS)\stcdll_DocumentAccessor.obj &
 	$(OBJS)\stcdll_Document.obj &
+	$(OBJS)\stcdll_DocumentAccessor.obj &
 	$(OBJS)\stcdll_Editor.obj &
 	$(OBJS)\stcdll_ExternalLexer.obj &
 	$(OBJS)\stcdll_Indicator.obj &
@@ -220,6 +229,7 @@ STCDLL_OBJECTS =  &
 	$(OBJS)\stcdll_LexAVE.obj &
 	$(OBJS)\stcdll_LexAda.obj &
 	$(OBJS)\stcdll_LexAsm.obj &
+	$(OBJS)\stcdll_LexAsn1.obj &
 	$(OBJS)\stcdll_LexBaan.obj &
 	$(OBJS)\stcdll_LexBash.obj &
 	$(OBJS)\stcdll_LexBullant.obj &
@@ -258,24 +268,26 @@ STCDLL_OBJECTS =  &
 	$(OBJS)\stcdll_LexSpecman.obj &
 	$(OBJS)\stcdll_LexTeX.obj &
 	$(OBJS)\stcdll_LexVB.obj &
+	$(OBJS)\stcdll_LexVHDL.obj &
 	$(OBJS)\stcdll_LexVerilog.obj &
 	$(OBJS)\stcdll_LexYAML.obj &
 	$(OBJS)\stcdll_LineMarker.obj &
 	$(OBJS)\stcdll_PropSet.obj &
 	$(OBJS)\stcdll_RESearch.obj &
 	$(OBJS)\stcdll_ScintillaBase.obj &
-	$(OBJS)\stcdll_StyleContext.obj &
 	$(OBJS)\stcdll_Style.obj &
+	$(OBJS)\stcdll_StyleContext.obj &
 	$(OBJS)\stcdll_UniConversion.obj &
 	$(OBJS)\stcdll_ViewStyle.obj &
 	$(OBJS)\stcdll_WindowAccessor.obj &
 	$(OBJS)\stcdll_XPM.obj
 STCLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
 	-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
-	-i=..\..\src\stc\..\..\..\include -i=$(SETUPHDIR) -wcd=549 -wcd=656 -wcd=657 &
-	-i=..\..\src\stc\..\..\include -i=..\..\src\stc\scintilla\include &
-	-i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS &
-	$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+	-i=..\..\src\stc\..\..\..\include -i=$(SETUPHDIR) -wx -wcd=549 -wcd=656 &
+	-wcd=657 -wcd=667 -i=..\..\src\stc\..\..\include &
+	-i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\src -d__WX__ &
+	-dSCI_LEXER -dLINK_LEXERS $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) &
+	$(CPPFLAGS) $(CXXFLAGS)
 STCLIB_OBJECTS =  &
 	$(OBJS)\stclib_PlatWX.obj &
 	$(OBJS)\stclib_ScintillaWX.obj &
@@ -284,8 +296,8 @@ STCLIB_OBJECTS =  &
 	$(OBJS)\stclib_CallTip.obj &
 	$(OBJS)\stclib_CellBuffer.obj &
 	$(OBJS)\stclib_ContractionState.obj &
-	$(OBJS)\stclib_DocumentAccessor.obj &
 	$(OBJS)\stclib_Document.obj &
+	$(OBJS)\stclib_DocumentAccessor.obj &
 	$(OBJS)\stclib_Editor.obj &
 	$(OBJS)\stclib_ExternalLexer.obj &
 	$(OBJS)\stclib_Indicator.obj &
@@ -296,6 +308,7 @@ STCLIB_OBJECTS =  &
 	$(OBJS)\stclib_LexAVE.obj &
 	$(OBJS)\stclib_LexAda.obj &
 	$(OBJS)\stclib_LexAsm.obj &
+	$(OBJS)\stclib_LexAsn1.obj &
 	$(OBJS)\stclib_LexBaan.obj &
 	$(OBJS)\stclib_LexBash.obj &
 	$(OBJS)\stclib_LexBullant.obj &
@@ -334,14 +347,15 @@ STCLIB_OBJECTS =  &
 	$(OBJS)\stclib_LexSpecman.obj &
 	$(OBJS)\stclib_LexTeX.obj &
 	$(OBJS)\stclib_LexVB.obj &
+	$(OBJS)\stclib_LexVHDL.obj &
 	$(OBJS)\stclib_LexVerilog.obj &
 	$(OBJS)\stclib_LexYAML.obj &
 	$(OBJS)\stclib_LineMarker.obj &
 	$(OBJS)\stclib_PropSet.obj &
 	$(OBJS)\stclib_RESearch.obj &
 	$(OBJS)\stclib_ScintillaBase.obj &
-	$(OBJS)\stclib_StyleContext.obj &
 	$(OBJS)\stclib_Style.obj &
+	$(OBJS)\stclib_StyleContext.obj &
 	$(OBJS)\stclib_UniConversion.obj &
 	$(OBJS)\stclib_ViewStyle.obj &
 	$(OBJS)\stclib_WindowAccessor.obj &
@@ -361,6 +375,7 @@ clean : .SYMBOLIC
 	-if exist $(OBJS)\*.res del $(OBJS)\*.res
 	-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
 	-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_wat$(VENDORTAG).dll
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib
@@ -408,10 +423,10 @@ $(OBJS)\stcdll_CellBuffer.obj :  .AUTODEPEND ../../src/stc\scintilla\src\CellBuf
 $(OBJS)\stcdll_ContractionState.obj :  .AUTODEPEND ../../src/stc\scintilla\src\ContractionState.cxx
 	$(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<

-$(OBJS)\stcdll_DocumentAccessor.obj :  .AUTODEPEND ../../src/stc\scintilla\src\DocumentAccessor.cxx
+$(OBJS)\stcdll_Document.obj :  .AUTODEPEND ../../src/stc\scintilla\src\Document.cxx
 	$(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<

-$(OBJS)\stcdll_Document.obj :  .AUTODEPEND ../../src/stc\scintilla\src\Document.cxx
+$(OBJS)\stcdll_DocumentAccessor.obj :  .AUTODEPEND ../../src/stc\scintilla\src\DocumentAccessor.cxx
 	$(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<

 $(OBJS)\stcdll_Editor.obj :  .AUTODEPEND ../../src/stc\scintilla\src\Editor.cxx
@@ -444,6 +459,9 @@ $(OBJS)\stcdll_LexAda.obj :  .AUTODEPEND ../../src/stc\scintilla\src\LexAda.cxx
 $(OBJS)\stcdll_LexAsm.obj :  .AUTODEPEND ../../src/stc\scintilla\src\LexAsm.cxx
 	$(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<

+$(OBJS)\stcdll_LexAsn1.obj :  .AUTODEPEND ../../src/stc\scintilla\src\LexAsn1.cxx
+	$(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
+
 $(OBJS)\stcdll_LexBaan.obj :  .AUTODEPEND ../../src/stc\scintilla\src\LexBaan.cxx
 	$(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<

@@ -558,6 +576,9 @@ $(OBJS)\stcdll_LexTeX.obj :  .AUTODEPEND ../../src/stc\scintilla\src\LexTeX.cxx
 $(OBJS)\stcdll_LexVB.obj :  .AUTODEPEND ../../src/stc\scintilla\src\LexVB.cxx
 	$(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<

+$(OBJS)\stcdll_LexVHDL.obj :  .AUTODEPEND ../../src/stc\scintilla\src\LexVHDL.cxx
+	$(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<
+
 $(OBJS)\stcdll_LexVerilog.obj :  .AUTODEPEND ../../src/stc\scintilla\src\LexVerilog.cxx
 	$(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<

@@ -576,10 +597,10 @@ $(OBJS)\stcdll_RESearch.obj :  .AUTODEPEND ../../src/stc\scintilla\src\RESearch.
 $(OBJS)\stcdll_ScintillaBase.obj :  .AUTODEPEND ../../src/stc\scintilla\src\ScintillaBase.cxx
 	$(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<

-$(OBJS)\stcdll_StyleContext.obj :  .AUTODEPEND ../../src/stc\scintilla\src\StyleContext.cxx
+$(OBJS)\stcdll_Style.obj :  .AUTODEPEND ../../src/stc\scintilla\src\Style.cxx
 	$(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<

-$(OBJS)\stcdll_Style.obj :  .AUTODEPEND ../../src/stc\scintilla\src\Style.cxx
+$(OBJS)\stcdll_StyleContext.obj :  .AUTODEPEND ../../src/stc\scintilla\src\StyleContext.cxx
 	$(CXX) -zq -fo=$^@ $(STCDLL_CXXFLAGS) $<

 $(OBJS)\stcdll_UniConversion.obj :  .AUTODEPEND ../../src/stc\scintilla\src\UniConversion.cxx
@@ -615,10 +636,10 @@ $(OBJS)\stclib_CellBuffer.obj :  .AUTODEPEND ../../src/stc\scintilla\src\CellBuf
 $(OBJS)\stclib_ContractionState.obj :  .AUTODEPEND ../../src/stc\scintilla\src\ContractionState.cxx
 	$(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<

-$(OBJS)\stclib_DocumentAccessor.obj :  .AUTODEPEND ../../src/stc\scintilla\src\DocumentAccessor.cxx
+$(OBJS)\stclib_Document.obj :  .AUTODEPEND ../../src/stc\scintilla\src\Document.cxx
 	$(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<

-$(OBJS)\stclib_Document.obj :  .AUTODEPEND ../../src/stc\scintilla\src\Document.cxx
+$(OBJS)\stclib_DocumentAccessor.obj :  .AUTODEPEND ../../src/stc\scintilla\src\DocumentAccessor.cxx
 	$(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<

 $(OBJS)\stclib_Editor.obj :  .AUTODEPEND ../../src/stc\scintilla\src\Editor.cxx
@@ -651,6 +672,9 @@ $(OBJS)\stclib_LexAda.obj :  .AUTODEPEND ../../src/stc\scintilla\src\LexAda.cxx
 $(OBJS)\stclib_LexAsm.obj :  .AUTODEPEND ../../src/stc\scintilla\src\LexAsm.cxx
 	$(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<

+$(OBJS)\stclib_LexAsn1.obj :  .AUTODEPEND ../../src/stc\scintilla\src\LexAsn1.cxx
+	$(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
+
 $(OBJS)\stclib_LexBaan.obj :  .AUTODEPEND ../../src/stc\scintilla\src\LexBaan.cxx
 	$(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<

@@ -765,6 +789,9 @@ $(OBJS)\stclib_LexTeX.obj :  .AUTODEPEND ../../src/stc\scintilla\src\LexTeX.cxx
 $(OBJS)\stclib_LexVB.obj :  .AUTODEPEND ../../src/stc\scintilla\src\LexVB.cxx
 	$(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<

+$(OBJS)\stclib_LexVHDL.obj :  .AUTODEPEND ../../src/stc\scintilla\src\LexVHDL.cxx
+	$(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
+
 $(OBJS)\stclib_LexVerilog.obj :  .AUTODEPEND ../../src/stc\scintilla\src\LexVerilog.cxx
 	$(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<

@@ -783,10 +810,10 @@ $(OBJS)\stclib_RESearch.obj :  .AUTODEPEND ../../src/stc\scintilla\src\RESearch.
 $(OBJS)\stclib_ScintillaBase.obj :  .AUTODEPEND ../../src/stc\scintilla\src\ScintillaBase.cxx
 	$(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<

-$(OBJS)\stclib_StyleContext.obj :  .AUTODEPEND ../../src/stc\scintilla\src\StyleContext.cxx
+$(OBJS)\stclib_Style.obj :  .AUTODEPEND ../../src/stc\scintilla\src\Style.cxx
 	$(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<

-$(OBJS)\stclib_Style.obj :  .AUTODEPEND ../../src/stc\scintilla\src\Style.cxx
+$(OBJS)\stclib_StyleContext.obj :  .AUTODEPEND ../../src/stc\scintilla\src\StyleContext.cxx
 	$(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<

 $(OBJS)\stclib_UniConversion.obj :  .AUTODEPEND ../../src/stc\scintilla\src\UniConversion.cxx
@@ -800,3 +827,4 @@ $(OBJS)\stclib_WindowAccessor.obj :  .AUTODEPEND ../../src/stc\scintilla\src\Win

 $(OBJS)\stclib_XPM.obj :  .AUTODEPEND ../../src/stc\scintilla\src\XPM.cxx
 	$(CXX) -zq -fo=$^@ $(STCLIB_CXXFLAGS) $<
+