|
From: Mark H. <mha...@us...> - 2008-02-10 11:01:48
|
Update of /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18959/win32 Modified Files: PlatWin.cxx ScintRes.rc ScintillaWin.cxx scintilla.mak scintilla_vc6.mak Log Message: upgrade to scintilla 1.75 Index: scintilla_vc6.mak =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/win32/scintilla_vc6.mak,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** scintilla_vc6.mak 24 May 2007 12:50:50 -0000 1.3 --- scintilla_vc6.mak 10 Feb 2008 11:01:48 -0000 1.4 *************** *** 37,41 **** #-Zc:forScope -Zc:wchar_t ! CXXFLAGS=-Zi -TP -W4 -D_CRT_SECURE_NO_DEPRECATE # For something scary:-Wp64 CXXDEBUG=-Od -MTd -DDEBUG --- 37,41 ---- #-Zc:forScope -Zc:wchar_t ! CXXFLAGS=-Zi -TP -W4 # For something scary:-Wp64 CXXDEBUG=-Od -MTd -DDEBUG *************** *** 93,97 **** --- 93,99 ---- $(DIR_O)\CallTip.obj \ $(DIR_O)\CellBuffer.obj \ + $(DIR_O)\CharClassify.obj \ $(DIR_O)\ContractionState.obj \ + $(DIR_O)\Decoration.obj \ $(DIR_O)\Document.obj \ $(DIR_O)\Editor.obj \ *************** *** 100,105 **** --- 102,109 ---- $(DIR_O)\LineMarker.obj \ $(DIR_O)\PlatWin.obj \ + $(DIR_O)\PositionCache.obj \ $(DIR_O)\PropSet.obj \ $(DIR_O)\RESearch.obj \ + $(DIR_O)\RunStyles.obj \ $(DIR_O)\ScintillaBase.obj \ $(DIR_O)\ScintillaWin.obj \ *************** *** 112,151 **** --- 116,187 ---- #**LEXOBJS=\\\n\(\t$(DIR_O)\\\*.obj \\\n\) LEXOBJS=\ + $(DIR_O)\LexAbaqus.obj \ $(DIR_O)\LexAda.obj \ + $(DIR_O)\LexAPDL.obj \ $(DIR_O)\LexAsm.obj \ + $(DIR_O)\LexAsn1.obj \ + $(DIR_O)\LexASY.obj \ + $(DIR_O)\LexAU3.obj \ $(DIR_O)\LexAVE.obj \ $(DIR_O)\LexBaan.obj \ + $(DIR_O)\LexBash.obj \ + $(DIR_O)\LexBasic.obj \ $(DIR_O)\LexBullant.obj \ + $(DIR_O)\LexCaml.obj \ $(DIR_O)\LexCLW.obj \ + $(DIR_O)\LexCmake.obj \ $(DIR_O)\LexConf.obj \ $(DIR_O)\LexCPP.obj \ $(DIR_O)\LexCrontab.obj \ + $(DIR_O)\LexCsound.obj \ $(DIR_O)\LexCSS.obj \ + $(DIR_O)\LexD.obj \ $(DIR_O)\LexEiffel.obj \ $(DIR_O)\LexErlang.obj \ $(DIR_O)\LexEScript.obj \ + $(DIR_O)\LexFlagship.obj \ $(DIR_O)\LexForth.obj \ $(DIR_O)\LexFortran.obj \ + $(DIR_O)\LexGAP.obj \ + $(DIR_O)\LexGui4Cli.obj \ + $(DIR_O)\LexHaskell.obj \ $(DIR_O)\LexHTML.obj \ + $(DIR_O)\LexInno.obj \ + $(DIR_O)\LexKix.obj \ $(DIR_O)\LexLisp.obj \ $(DIR_O)\LexLout.obj \ $(DIR_O)\LexLua.obj \ + $(DIR_O)\LexMagik.obj \ $(DIR_O)\LexMatlab.obj \ $(DIR_O)\LexMetapost.obj \ $(DIR_O)\LexMMIXAL.obj \ $(DIR_O)\LexMPT.obj \ + $(DIR_O)\LexMSSQL.obj \ $(DIR_O)\LexNsis.obj \ + $(DIR_O)\LexOpal.obj \ $(DIR_O)\LexOthers.obj \ $(DIR_O)\LexPascal.obj \ $(DIR_O)\LexPB.obj \ $(DIR_O)\LexPerl.obj \ + $(DIR_O)\LexPLM.obj \ $(DIR_O)\LexPOV.obj \ + $(DIR_O)\LexPowerShell.obj \ + $(DIR_O)\LexProgress.obj \ $(DIR_O)\LexPS.obj \ $(DIR_O)\LexPython.obj \ + $(DIR_O)\LexR.obj \ + $(DIR_O)\LexRebol.obj \ $(DIR_O)\LexRuby.obj \ $(DIR_O)\LexScriptol.obj \ + $(DIR_O)\LexSmalltalk.obj \ + $(DIR_O)\LexSpecman.obj \ + $(DIR_O)\LexSpice.obj \ $(DIR_O)\LexSQL.obj \ + $(DIR_O)\LexTADS3.obj \ + $(DIR_O)\LexTCL.obj \ $(DIR_O)\LexTeX.obj \ $(DIR_O)\LexVB.obj \ + $(DIR_O)\LexVerilog.obj \ + $(DIR_O)\LexVHDL.obj \ $(DIR_O)\LexYAML.obj \ *************** *** 156,160 **** --- 192,198 ---- $(DIR_O)\CallTip.obj \ $(DIR_O)\CellBuffer.obj \ + $(DIR_O)\CharClassify.obj \ $(DIR_O)\ContractionState.obj \ + $(DIR_O)\Decoration.obj \ $(DIR_O)\Document.obj \ $(DIR_O)\DocumentAccessor.obj \ *************** *** 166,169 **** --- 204,209 ---- $(DIR_O)\LineMarker.obj \ $(DIR_O)\PlatWin.obj \ + $(DIR_O)\PositionCache.obj \ + $(DIR_O)\RunStyles.obj \ $(DIR_O)\RESearch.obj \ $(DIR_O)\PropSet.obj \ *************** *** 224,273 **** $(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 \ ! ../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 $(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/SVector.h ../src/CellBuffer.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 $(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 $(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 $(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\) $(DIR_O)\LexAda.obj: ..\src\LexAda.cxx $(LEX_HEADERS) $(DIR_O)\LexAsm.obj: ..\src\LexAsm.cxx $(LEX_HEADERS) $(DIR_O)\LexAVE.obj: ..\src\LexAVE.cxx $(LEX_HEADERS) $(DIR_O)\LexBaan.obj: ..\src\LexBaan.cxx $(LEX_HEADERS) $(DIR_O)\LexBullant.obj: ..\src\LexBullant.cxx $(LEX_HEADERS) $(DIR_O)\LexCLW.obj: ..\src\LexCLW.cxx $(LEX_HEADERS) $(DIR_O)\LexConf.obj: ..\src\LexConf.cxx $(LEX_HEADERS) --- 264,341 ---- $(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 \ ! ../include/Scintilla.h ../src/CallTip.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)\ContractionState.obj: ../src/ContractionState.cxx ../include/Platform.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/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/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/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 $(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\) + $(DIR_O)\LexAbaqus.obj: ..\src\LexAbaqus.cxx $(LEX_HEADERS) + $(DIR_O)\LexAda.obj: ..\src\LexAda.cxx $(LEX_HEADERS) + $(DIR_O)\LexAPDL.obj: ..\src\LexAPDL.cxx $(LEX_HEADERS) + $(DIR_O)\LexAsm.obj: ..\src\LexAsm.cxx $(LEX_HEADERS) + $(DIR_O)\LexAsn1.obj: ..\src\LexAsn1.cxx $(LEX_HEADERS) + + $(DIR_O)\LexASY.obj: ..\src\LexASY.cxx $(LEX_HEADERS) + + $(DIR_O)\LexAU3.obj: ..\src\LexAU3.cxx $(LEX_HEADERS) + $(DIR_O)\LexAVE.obj: ..\src\LexAVE.cxx $(LEX_HEADERS) $(DIR_O)\LexBaan.obj: ..\src\LexBaan.cxx $(LEX_HEADERS) + $(DIR_O)\LexBash.obj: ..\src\LexBash.cxx $(LEX_HEADERS) + + $(DIR_O)\LexBasic.obj: ..\src\LexBasic.cxx $(LEX_HEADERS) + $(DIR_O)\LexBullant.obj: ..\src\LexBullant.cxx $(LEX_HEADERS) + $(DIR_O)\LexCaml.obj: ..\src\LexCaml.cxx $(LEX_HEADERS) + $(DIR_O)\LexCLW.obj: ..\src\LexCLW.cxx $(LEX_HEADERS) + $(DIR_O)\LexCmake.obj: ..\src\LexCmake.cxx $(LEX_HEADERS) + $(DIR_O)\LexConf.obj: ..\src\LexConf.cxx $(LEX_HEADERS) *************** *** 276,281 **** --- 344,353 ---- $(DIR_O)\LexCrontab.obj: ..\src\LexCrontab.cxx $(LEX_HEADERS) + $(DIR_O)\LexCsound.obj: ..\src\LexCsound.cxx $(LEX_HEADERS) + $(DIR_O)\LexCSS.obj: ..\src\LexCSS.cxx $(LEX_HEADERS) + $(DIR_O)\LexD.obj: ..\src\LexD.cxx $(LEX_HEADERS) + $(DIR_O)\LexEiffel.obj: ..\src\LexEiffel.cxx $(LEX_HEADERS) *************** *** 284,293 **** --- 356,377 ---- $(DIR_O)\LexEScript.obj: ..\src\LexEScript.cxx $(LEX_HEADERS) + $(DIR_O)\LexFlagship.obj: ..\src\LexFlagship.cxx $(LEX_HEADERS) + $(DIR_O)\LexForth.obj: ..\src\LexForth.cxx $(LEX_HEADERS) $(DIR_O)\LexFortran.obj: ..\src\LexFortran.cxx $(LEX_HEADERS) + $(DIR_O)\LexGAP.obj: ..\src\LexGAP.cxx $(LEX_HEADERS) + + $(DIR_O)\LexGui4Cli.obj: ..\src\LexGui4Cli.cxx $(LEX_HEADERS) + + $(DIR_O)\LexHaskell.obj: ..\src\LexHaskell.cxx $(LEX_HEADERS) + $(DIR_O)\LexHTML.obj: ..\src\LexHTML.cxx $(LEX_HEADERS) + $(DIR_O)\LexInno.obj: ..\src\LexInno.cxx $(LEX_HEADERS) + + $(DIR_O)\LexKix.obj: ..\src\LexKix.cxx $(LEX_HEADERS) + $(DIR_O)\LexLisp.obj: ..\src\LexLisp.cxx $(LEX_HEADERS) *************** *** 296,299 **** --- 380,385 ---- $(DIR_O)\LexLua.obj: ..\src\LexLua.cxx $(LEX_HEADERS) + $(DIR_O)\LexMagik.obj: ..\src\LexMagik.cxx $(LEX_HEADERS) + $(DIR_O)\LexMatlab.obj: ..\src\LexMatlab.cxx $(LEX_HEADERS) *************** *** 304,309 **** --- 390,399 ---- $(DIR_O)\LexMPT.obj: ..\src\LexMPT.cxx $(LEX_HEADERS) + $(DIR_O)\LexMSSQL.obj: ..\src\LexMSSQL.cxx $(LEX_HEADERS) + $(DIR_O)\LexNsis.obj: ..\src\LexNsis.cxx $(LEX_HEADERS) + $(DIR_O)\LexOpal.obj: ..\src\LexOpal.cxx $(LEX_HEADERS) + $(DIR_O)\LexOthers.obj: ..\src\LexOthers.cxx $(LEX_HEADERS) *************** *** 314,333 **** --- 404,447 ---- $(DIR_O)\LexPerl.obj: ..\src\LexPerl.cxx $(LEX_HEADERS) + $(DIR_O)\LexPLM.obj: ..\src\LexPLM.cxx $(LEX_HEADERS) + $(DIR_O)\LexPOV.obj: ..\src\LexPOV.cxx $(LEX_HEADERS) + $(DIR_O)\LexPowerShell.obj: ..\src\LexPowerShell.cxx $(LEX_HEADERS) + + $(DIR_O)\LexProgress.obj: ..\src\LexProgress.cxx $(LEX_HEADERS) + $(DIR_O)\LexPS.obj: ..\src\LexPS.cxx $(LEX_HEADERS) $(DIR_O)\LexPython.obj: ..\src\LexPython.cxx $(LEX_HEADERS) + $(DIR_O)\LexR.obj: ..\src\LexR.cxx $(LEX_HEADERS) + + $(DIR_O)\LexRebol.obj: ..\src\LexRebol.cxx $(LEX_HEADERS) + $(DIR_O)\LexRuby.obj: ..\src\LexRuby.cxx $(LEX_HEADERS) $(DIR_O)\LexScriptol.obj: ..\src\LexScriptol.cxx $(LEX_HEADERS) + $(DIR_O)\LexSmalltalk.obj: ..\src\LexSmalltalk.cxx $(LEX_HEADERS) + + $(DIR_O)\LexSpecman.obj: ..\src\LexSpecman.cxx $(LEX_HEADERS) + + $(DIR_O)\LexSpice.obj: ..\src\LexSpice.cxx $(LEX_HEADERS) + $(DIR_O)\LexSQL.obj: ..\src\LexSQL.cxx $(LEX_HEADERS) + $(DIR_O)\LexTADS3.obj: ..\src\LexTADS3.cxx $(LEX_HEADERS) + + $(DIR_O)\LexTCL.obj: ..\src\LexTCL.cxx $(LEX_HEADERS) + $(DIR_O)\LexTeX.obj: ..\src\LexTeX.cxx $(LEX_HEADERS) $(DIR_O)\LexVB.obj: ..\src\LexVB.cxx $(LEX_HEADERS) + $(DIR_O)\LexVerilog.obj: ..\src\LexVerilog.cxx $(LEX_HEADERS) + + $(DIR_O)\LexVHDL.obj: ..\src\LexVHDL.cxx $(LEX_HEADERS) + $(DIR_O)\LexYAML.obj: ..\src\LexYAML.cxx $(LEX_HEADERS) *************** *** 336,383 **** $(DIR_O)\LineMarker.obj: ../src/LineMarker.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/LineMarker.h ../src/XPM.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 $(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 $(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 $(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/Indicator.h ../src/LineMarker.h \ ! ../src/Style.h ../src/ViewStyle.h ../src/XPM.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 --- 450,514 ---- $(DIR_O)\LineMarker.obj: ../src/LineMarker.cxx ../include/Platform.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/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/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/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 $(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 Index: ScintillaWin.cxx =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/win32/ScintillaWin.cxx,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ScintillaWin.cxx 25 Nov 2003 10:45:21 -0000 1.14 --- ScintillaWin.cxx 10 Feb 2008 11:01:48 -0000 1.15 *************** *** 13,17 **** #include <limits.h> ! #define _WIN32_WINNT 0x0400 #include <windows.h> #include <commctrl.h> --- 13,17 ---- #include <limits.h> ! #define _WIN32_WINNT 0x0500 #include <windows.h> [...1704 lines suppressed...] *** 2061,2064 **** --- 2418,2422 ---- sptr_t ScintillaWin::DirectFunction( ScintillaWin *sci, UINT iMessage, uptr_t wParam, sptr_t lParam) { + PLATFORM_ASSERT(::GetCurrentThreadId() == ::GetWindowThreadProcessId(sci->MainHWND(), NULL)); return sci->WndProc(iMessage, wParam, lParam); } *************** *** 2086,2090 **** } } else { ! if (iMessage == WM_DESTROY) { sci->Finalise(); delete sci; --- 2444,2448 ---- } } else { ! if (iMessage == WM_NCDESTROY) { sci->Finalise(); delete sci; Index: ScintRes.rc =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/win32/ScintRes.rc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ScintRes.rc 25 Nov 2003 10:45:21 -0000 1.11 --- ScintRes.rc 10 Feb 2008 11:01:48 -0000 1.12 *************** *** 1,4 **** // Resource file for Scintilla ! // Copyright 1998-2003 by Neil Hodgson <ne...@sc...> // The License.txt file describes the conditions under which this software may be distributed. --- 1,4 ---- // Resource file for Scintilla ! // Copyright 1998-2007 by Neil Hodgson <ne...@sc...> // The License.txt file describes the conditions under which this software may be distributed. *************** *** 10,15 **** VS_VERSION_INFO VERSIONINFO ! FILEVERSION 1, 5, 6, 0 ! PRODUCTVERSION 1, 5, 6, 0 FILEFLAGSMASK 0x3fL FILEFLAGS 0 --- 10,15 ---- VS_VERSION_INFO VERSIONINFO ! FILEVERSION 1, 7, 5, 0 ! PRODUCTVERSION 1, 7, 5, 0 FILEFLAGSMASK 0x3fL FILEFLAGS 0 *************** *** 28,37 **** VALUE "CompanyName", "Neil Hodgson ne...@sc...\0" VALUE "FileDescription", "Scintilla.DLL - a Source Editing Component\0" ! VALUE "FileVersion", "1.56\0" VALUE "InternalName", "Scintilla\0" ! VALUE "LegalCopyright", "Copyright 1998-2003 by Neil Hodgson\0" VALUE "OriginalFilename", "Scintilla.DLL\0" VALUE "ProductName", "Scintilla\0" ! VALUE "ProductVersion", "1.56\0" END END --- 28,37 ---- VALUE "CompanyName", "Neil Hodgson ne...@sc...\0" VALUE "FileDescription", "Scintilla.DLL - a Source Editing Component\0" ! VALUE "FileVersion", "1.75\0" VALUE "InternalName", "Scintilla\0" ! VALUE "LegalCopyright", "Copyright 1998-2007 by Neil Hodgson\0" VALUE "OriginalFilename", "Scintilla.DLL\0" VALUE "ProductName", "Scintilla\0" ! VALUE "ProductVersion", "1.75\0" END END Index: scintilla.mak =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/win32/scintilla.mak,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** scintilla.mak 25 Nov 2003 10:45:21 -0000 1.6 --- scintilla.mak 10 Feb 2008 11:01:48 -0000 1.7 *************** *** 36,40 **** LD=link ! CXXFLAGS=-Zi -TP -W4 -Zc:forScope -Zc:wchar_t # For something scary:-Wp64 CXXDEBUG=-Od -MTd -DDEBUG --- 36,40 ---- LD=link ! CXXFLAGS=-Zi -TP -W4 -Zc:forScope -Zc:wchar_t -D_CRT_SECURE_NO_DEPRECATE=1 # For something scary:-Wp64 CXXDEBUG=-Od -MTd -DDEBUG *************** *** 53,57 **** LD=ilink32 ! CXXFLAGS=-P -tWM -w -w-prc -w-inl -RT- -x- # Above turns off warnings for clarfying parentheses and inlines with for not expanded CXXDEBUG=-Od -v -DDEBUG --- 53,57 ---- LD=ilink32 ! CXXFLAGS=-P -tWM -w -w-prc -w-inl -w-pin -RT- -x- # Above turns off warnings for clarfying parentheses and inlines with for not expanded CXXDEBUG=-Od -v -DDEBUG *************** *** 91,95 **** --- 91,97 ---- $(DIR_O)\CallTip.obj \ $(DIR_O)\CellBuffer.obj \ + $(DIR_O)\CharClassify.obj \ $(DIR_O)\ContractionState.obj \ + $(DIR_O)\Decoration.obj \ $(DIR_O)\Document.obj \ $(DIR_O)\Editor.obj \ *************** *** 98,103 **** --- 100,107 ---- $(DIR_O)\LineMarker.obj \ $(DIR_O)\PlatWin.obj \ + $(DIR_O)\PositionCache.obj \ $(DIR_O)\PropSet.obj \ $(DIR_O)\RESearch.obj \ + $(DIR_O)\RunStyles.obj \ $(DIR_O)\ScintillaBase.obj \ $(DIR_O)\ScintillaWin.obj \ *************** *** 110,149 **** --- 114,185 ---- #**LEXOBJS=\\\n\(\t$(DIR_O)\\\*.obj \\\n\) LEXOBJS=\ + $(DIR_O)\LexAbaqus.obj \ $(DIR_O)\LexAda.obj \ + $(DIR_O)\LexAPDL.obj \ $(DIR_O)\LexAsm.obj \ + $(DIR_O)\LexAsn1.obj \ + $(DIR_O)\LexASY.obj \ + $(DIR_O)\LexAU3.obj \ $(DIR_O)\LexAVE.obj \ $(DIR_O)\LexBaan.obj \ + $(DIR_O)\LexBash.obj \ + $(DIR_O)\LexBasic.obj \ $(DIR_O)\LexBullant.obj \ + $(DIR_O)\LexCaml.obj \ $(DIR_O)\LexCLW.obj \ + $(DIR_O)\LexCmake.obj \ $(DIR_O)\LexConf.obj \ $(DIR_O)\LexCPP.obj \ $(DIR_O)\LexCrontab.obj \ + $(DIR_O)\LexCsound.obj \ $(DIR_O)\LexCSS.obj \ + $(DIR_O)\LexD.obj \ $(DIR_O)\LexEiffel.obj \ $(DIR_O)\LexErlang.obj \ $(DIR_O)\LexEScript.obj \ + $(DIR_O)\LexFlagship.obj \ $(DIR_O)\LexForth.obj \ $(DIR_O)\LexFortran.obj \ + $(DIR_O)\LexGAP.obj \ + $(DIR_O)\LexGui4Cli.obj \ + $(DIR_O)\LexHaskell.obj \ $(DIR_O)\LexHTML.obj \ + $(DIR_O)\LexInno.obj \ + $(DIR_O)\LexKix.obj \ $(DIR_O)\LexLisp.obj \ $(DIR_O)\LexLout.obj \ $(DIR_O)\LexLua.obj \ + $(DIR_O)\LexMagik.obj \ $(DIR_O)\LexMatlab.obj \ $(DIR_O)\LexMetapost.obj \ $(DIR_O)\LexMMIXAL.obj \ $(DIR_O)\LexMPT.obj \ + $(DIR_O)\LexMSSQL.obj \ $(DIR_O)\LexNsis.obj \ + $(DIR_O)\LexOpal.obj \ $(DIR_O)\LexOthers.obj \ $(DIR_O)\LexPascal.obj \ $(DIR_O)\LexPB.obj \ $(DIR_O)\LexPerl.obj \ + $(DIR_O)\LexPLM.obj \ $(DIR_O)\LexPOV.obj \ + $(DIR_O)\LexPowerShell.obj \ + $(DIR_O)\LexProgress.obj \ $(DIR_O)\LexPS.obj \ $(DIR_O)\LexPython.obj \ + $(DIR_O)\LexR.obj \ + $(DIR_O)\LexRebol.obj \ $(DIR_O)\LexRuby.obj \ $(DIR_O)\LexScriptol.obj \ + $(DIR_O)\LexSmalltalk.obj \ + $(DIR_O)\LexSpecman.obj \ + $(DIR_O)\LexSpice.obj \ $(DIR_O)\LexSQL.obj \ + $(DIR_O)\LexTADS3.obj \ + $(DIR_O)\LexTCL.obj \ $(DIR_O)\LexTeX.obj \ $(DIR_O)\LexVB.obj \ + $(DIR_O)\LexVerilog.obj \ + $(DIR_O)\LexVHDL.obj \ $(DIR_O)\LexYAML.obj \ *************** *** 154,158 **** --- 190,196 ---- $(DIR_O)\CallTip.obj \ $(DIR_O)\CellBuffer.obj \ + $(DIR_O)\CharClassify.obj \ $(DIR_O)\ContractionState.obj \ + $(DIR_O)\Decoration.obj \ $(DIR_O)\Document.obj \ $(DIR_O)\DocumentAccessor.obj \ *************** *** 164,169 **** $(DIR_O)\LineMarker.obj \ $(DIR_O)\PlatWin.obj \ ! $(DIR_O)\RESearch.obj \ $(DIR_O)\PropSet.obj \ $(DIR_O)\ScintillaBaseL.obj \ $(DIR_O)\ScintillaWinL.obj \ --- 202,209 ---- $(DIR_O)\LineMarker.obj \ $(DIR_O)\PlatWin.obj \ ! $(DIR_O)\PositionCache.obj \ $(DIR_O)\PropSet.obj \ + $(DIR_O)\RESearch.obj \ + $(DIR_O)\RunStyles.obj \ $(DIR_O)\ScintillaBaseL.obj \ $(DIR_O)\ScintillaWinL.obj \ *************** *** 222,271 **** $(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 \ ! ../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 $(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/SVector.h ../src/CellBuffer.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 $(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 $(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 $(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\) $(DIR_O)\LexAda.obj: ..\src\LexAda.cxx $(LEX_HEADERS) $(DIR_O)\LexAsm.obj: ..\src\LexAsm.cxx $(LEX_HEADERS) $(DIR_O)\LexAVE.obj: ..\src\LexAVE.cxx $(LEX_HEADERS) $(DIR_O)\LexBaan.obj: ..\src\LexBaan.cxx $(LEX_HEADERS) $(DIR_O)\LexBullant.obj: ..\src\LexBullant.cxx $(LEX_HEADERS) $(DIR_O)\LexCLW.obj: ..\src\LexCLW.cxx $(LEX_HEADERS) $(DIR_O)\LexConf.obj: ..\src\LexConf.cxx $(LEX_HEADERS) --- 262,339 ---- $(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 \ ! ../include/Scintilla.h ../src/CallTip.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)\ContractionState.obj: ../src/ContractionState.cxx ../include/Platform.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/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/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 ../src/PositionCache.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)\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 #++Autogenerated -- run src/LexGen.py to regenerate #**\n\($(DIR_O)\\\*.obj: ..\\src\\\*.cxx $(LEX_HEADERS)\n\n\) + $(DIR_O)\LexAbaqus.obj: ..\src\LexAbaqus.cxx $(LEX_HEADERS) + $(DIR_O)\LexAda.obj: ..\src\LexAda.cxx $(LEX_HEADERS) + $(DIR_O)\LexAPDL.obj: ..\src\LexAPDL.cxx $(LEX_HEADERS) + $(DIR_O)\LexAsm.obj: ..\src\LexAsm.cxx $(LEX_HEADERS) + $(DIR_O)\LexAsn1.obj: ..\src\LexAsn1.cxx $(LEX_HEADERS) + + $(DIR_O)\LexASY.obj: ..\src\LexASY.cxx $(LEX_HEADERS) + + $(DIR_O)\LexAU3.obj: ..\src\LexAU3.cxx $(LEX_HEADERS) + $(DIR_O)\LexAVE.obj: ..\src\LexAVE.cxx $(LEX_HEADERS) $(DIR_O)\LexBaan.obj: ..\src\LexBaan.cxx $(LEX_HEADERS) + $(DIR_O)\LexBash.obj: ..\src\LexBash.cxx $(LEX_HEADERS) + + $(DIR_O)\LexBasic.obj: ..\src\LexBasic.cxx $(LEX_HEADERS) + $(DIR_O)\LexBullant.obj: ..\src\LexBullant.cxx $(LEX_HEADERS) + $(DIR_O)\LexCaml.obj: ..\src\LexCaml.cxx $(LEX_HEADERS) + $(DIR_O)\LexCLW.obj: ..\src\LexCLW.cxx $(LEX_HEADERS) + $(DIR_O)\LexCmake.obj: ..\src\LexCmake.cxx $(LEX_HEADERS) + $(DIR_O)\LexConf.obj: ..\src\LexConf.cxx $(LEX_HEADERS) *************** *** 274,279 **** --- 342,351 ---- $(DIR_O)\LexCrontab.obj: ..\src\LexCrontab.cxx $(LEX_HEADERS) + $(DIR_O)\LexCsound.obj: ..\src\LexCsound.cxx $(LEX_HEADERS) + $(DIR_O)\LexCSS.obj: ..\src\LexCSS.cxx $(LEX_HEADERS) + $(DIR_O)\LexD.obj: ..\src\LexD.cxx $(LEX_HEADERS) + $(DIR_O)\LexEiffel.obj: ..\src\LexEiffel.cxx $(LEX_HEADERS) *************** *** 282,291 **** --- 354,375 ---- $(DIR_O)\LexEScript.obj: ..\src\LexEScript.cxx $(LEX_HEADERS) + $(DIR_O)\LexFlagship.obj: ..\src\LexFlagship.cxx $(LEX_HEADERS) + $(DIR_O)\LexForth.obj: ..\src\LexForth.cxx $(LEX_HEADERS) $(DIR_O)\LexFortran.obj: ..\src\LexFortran.cxx $(LEX_HEADERS) + $(DIR_O)\LexGAP.obj: ..\src\LexGAP.cxx $(LEX_HEADERS) + + $(DIR_O)\LexGui4Cli.obj: ..\src\LexGui4Cli.cxx $(LEX_HEADERS) + + $(DIR_O)\LexHaskell.obj: ..\src\LexHaskell.cxx $(LEX_HEADERS) + $(DIR_O)\LexHTML.obj: ..\src\LexHTML.cxx $(LEX_HEADERS) + $(DIR_O)\LexInno.obj: ..\src\LexInno.cxx $(LEX_HEADERS) + + $(DIR_O)\LexKix.obj: ..\src\LexKix.cxx $(LEX_HEADERS) + $(DIR_O)\LexLisp.obj: ..\src\LexLisp.cxx $(LEX_HEADERS) *************** *** 294,297 **** --- 378,383 ---- $(DIR_O)\LexLua.obj: ..\src\LexLua.cxx $(LEX_HEADERS) + $(DIR_O)\LexMagik.obj: ..\src\LexMagik.cxx $(LEX_HEADERS) + $(DIR_O)\LexMatlab.obj: ..\src\LexMatlab.cxx $(LEX_HEADERS) *************** *** 302,307 **** --- 388,397 ---- $(DIR_O)\LexMPT.obj: ..\src\LexMPT.cxx $(LEX_HEADERS) + $(DIR_O)\LexMSSQL.obj: ..\src\LexMSSQL.cxx $(LEX_HEADERS) + $(DIR_O)\LexNsis.obj: ..\src\LexNsis.cxx $(LEX_HEADERS) + $(DIR_O)\LexOpal.obj: ..\src\LexOpal.cxx $(LEX_HEADERS) + $(DIR_O)\LexOthers.obj: ..\src\LexOthers.cxx $(LEX_HEADERS) *************** *** 312,331 **** --- 402,445 ---- $(DIR_O)\LexPerl.obj: ..\src\LexPerl.cxx $(LEX_HEADERS) + $(DIR_O)\LexPLM.obj: ..\src\LexPLM.cxx $(LEX_HEADERS) + $(DIR_O)\LexPOV.obj: ..\src\LexPOV.cxx $(LEX_HEADERS) + $(DIR_O)\LexPowerShell.obj: ..\src\LexPowerShell.cxx $(LEX_HEADERS) + + $(DIR_O)\LexProgress.obj: ..\src\LexProgress.cxx $(LEX_HEADERS) + $(DIR_O)\LexPS.obj: ..\src\LexPS.cxx $(LEX_HEADERS) $(DIR_O)\LexPython.obj: ..\src\LexPython.cxx $(LEX_HEADERS) + $(DIR_O)\LexR.obj: ..\src\LexR.cxx $(LEX_HEADERS) + + $(DIR_O)\LexRebol.obj: ..\src\LexRebol.cxx $(LEX_HEADERS) + $(DIR_O)\LexRuby.obj: ..\src\LexRuby.cxx $(LEX_HEADERS) $(DIR_O)\LexScriptol.obj: ..\src\LexScriptol.cxx $(LEX_HEADERS) + $(DIR_O)\LexSmalltalk.obj: ..\src\LexSmalltalk.cxx $(LEX_HEADERS) + + $(DIR_O)\LexSpecman.obj: ..\src\LexSpecman.cxx $(LEX_HEADERS) + + $(DIR_O)\LexSpice.obj: ..\src\LexSpice.cxx $(LEX_HEADERS) + $(DIR_O)\LexSQL.obj: ..\src\LexSQL.cxx $(LEX_HEADERS) + $(DIR_O)\LexTADS3.obj: ..\src\LexTADS3.cxx $(LEX_HEADERS) + + $(DIR_O)\LexTCL.obj: ..\src\LexTCL.cxx $(LEX_HEADERS) + $(DIR_O)\LexTeX.obj: ..\src\LexTeX.cxx $(LEX_HEADERS) $(DIR_O)\LexVB.obj: ..\src\LexVB.cxx $(LEX_HEADERS) + $(DIR_O)\LexVerilog.obj: ..\src\LexVerilog.cxx $(LEX_HEADERS) + + $(DIR_O)\LexVHDL.obj: ..\src\LexVHDL.cxx $(LEX_HEADERS) + $(DIR_O)\LexYAML.obj: ..\src\LexYAML.cxx $(LEX_HEADERS) *************** *** 334,381 **** $(DIR_O)\LineMarker.obj: ../src/LineMarker.cxx ../include/Platform.h \ ! ../include/Scintilla.h ../src/LineMarker.h ../src/XPM.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 $(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 $(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 $(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/Indicator.h ../src/LineMarker.h \ ! ../src/Style.h ../src/ViewStyle.h ../src/XPM.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 --- 448,518 ---- $(DIR_O)\LineMarker.obj: ../src/LineMarker.cxx ../include/Platform.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)\PositionCache.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 ../src/PositionCache.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/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/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 $(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 Index: PlatWin.cxx =================================================================== RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/win32/PlatWin.cxx,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** PlatWin.cxx 24 May 2007 12:50:50 -0000 1.13 --- PlatWin.cxx 10 Feb 2008 11:01:48 -0000 1.14 *************** *** 43,51 **** --- 43,76 ---- ::SetWindowLong(hWnd, 0, reinterpret_cast<LONG>(ptr)); } + + #ifndef GWLP_USERDATA + #define GWLP_USERDATA GWL_USERDATA + #endif + + #ifndef GWLP_WNDPROC + #define GWLP_WNDPROC GWL_WNDPROC [...1853 lines suppressed...] ListBoxX_Register(); } --- 2190,2206 ---- void Platform_Initialise(void *hInstance) { ! OSVERSIONINFO osv = {sizeof(OSVERSIONINFO),0,0,0,0,TEXT("")}; ::GetVersionEx(&osv); onNT = osv.dwPlatformId == VER_PLATFORM_WIN32_NT; ::InitializeCriticalSection(&crPlatformLock); hinstPlatformRes = reinterpret_cast<HINSTANCE>(hInstance); + // This may be called from DllMain, in which case the call to LoadLibrary + // is bad because it can upset the DLL load order. + if (!hDLLImage) { + hDLLImage = ::LoadLibrary(TEXT("Msimg32")); + } + if (hDLLImage) { + AlphaBlendFn = (AlphaBlendSig)::GetProcAddress(hDLLImage, "AlphaBlend"); + } ListBoxX_Register(); } |
