Fix recreating of wxBitmapComboBox using untyped client data.

[wxWidgets.git] / build / msw / wx_vc7_wxscintilla.vcproj

diff --git a/build/msw/wx_vc7_wxscintilla.vcproj b/build/msw/wx_vc7_wxscintilla.vcproj
index 49a99aef0db597699c717769001c83952143dc73..98b4c15cb535069af04b7b97310142ba4b152cc0 100644 (file)
--- a/build/msw/wx_vc7_wxscintilla.vcproj
+++ b/build/msw/wx_vc7_wxscintilla.vcproj
@@ -2,7 +2,7 @@
 <!--\r
 \r
   This project was generated by\r
 <!--\r
 \r
   This project was generated by\r

-  Bakefile 0.2.6 (http://www.bakefile.org)\r
+  Bakefile 0.2.9 (http://www.bakefile.org)\r

   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r


@@ -22,12 +22,13 @@
                        IntermediateDirectory="vc_mswud\wxscintilla"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswud\wxscintilla"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswud;..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"\r

                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r


@@ -48,8 +49,8 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r

-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswud;..\..\include"/>\r

                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r


@@ -58,9 +59,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswud;..\..\include"/>\r

                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r


@@ -78,12 +79,13 @@
                        IntermediateDirectory="vc_mswu\wxscintilla"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswu\wxscintilla"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswu;..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"\r

                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r


@@ -101,8 +103,8 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r

-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswu;..\..\include"/>\r

                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r


@@ -111,118 +113,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivud\wxscintilla"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               MinimalRebuild="TRUE"\r
-                               ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
-                               RuntimeTypeInfo="TRUE"\r
-                               ObjectFile="vc_mswunivud\wxscintilla\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintillad.pdb"\r
-                               WarningLevel="3"\r
-                               SuppressStartupBanner="TRUE"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="3"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxscintillad.lib"\r
-                               SuppressStartupBanner="TRUE"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_lib"\r
-                       IntermediateDirectory="vc_mswunivu\wxscintilla"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
-                               RuntimeTypeInfo="TRUE"\r
-                               ObjectFile="vc_mswunivu\wxscintilla\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_lib\wxscintilla.pdb"\r
-                               WarningLevel="3"\r
-                               SuppressStartupBanner="TRUE"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="3"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_lib\wxscintilla.lib"\r
-                               SuppressStartupBanner="TRUE"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_lib\mswu;..\..\include"/>\r

                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r


@@ -240,12 +133,13 @@
                        IntermediateDirectory="vc_mswuddll\wxscintilla"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswuddll\wxscintilla"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswud;..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE"\r

                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r


@@ -266,8 +160,8 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r

-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
+                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswud;..\..\include"/>\r

                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r


@@ -276,9 +170,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswud;..\..\include"/>\r

                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r


@@ -296,12 +190,13 @@
                        IntermediateDirectory="vc_mswudll\wxscintilla"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswudll\wxscintilla"\r
                        ConfigurationType="4"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="1">\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswu;..\..\include"\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE"\r

                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r


@@ -319,8 +214,8 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r

-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE"\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswu;..\..\include"/>\r

                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                        <Tool\r


@@ -329,118 +224,9 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r

-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE"\r

                                Culture="1033"\r
                                Culture="1033"\r

-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="DLL Universal Debug|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivuddll\wxscintilla"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               MinimalRebuild="TRUE"\r
-                               ExceptionHandling="TRUE"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               BufferSecurityCheck="TRUE"\r
-                               RuntimeTypeInfo="TRUE"\r
-                               ObjectFile="vc_mswunivuddll\wxscintilla\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintillad.pdb"\r
-                               WarningLevel="3"\r
-                               SuppressStartupBanner="TRUE"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="3"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxscintillad.lib"\r
-                               SuppressStartupBanner="TRUE"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"/>\r
-                       <Tool\r
-                               Name="VCManagedWrapperGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="DLL Universal Release|Win32"\r
-                       OutputDirectory="..\..\lib\vc_dll"\r
-                       IntermediateDirectory="vc_mswunivudll\wxscintilla"\r
-                       ConfigurationType="4"\r
-                       UseOfMFC="0"\r
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE">\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               ExceptionHandling="TRUE"\r
-                               RuntimeLibrary="2"\r
-                               RuntimeTypeInfo="TRUE"\r
-                               ObjectFile="vc_mswunivudll\wxscintilla\"\r
-                               ProgramDataBaseFileName="..\..\lib\vc_dll\wxscintilla.pdb"\r
-                               WarningLevel="3"\r
-                               SuppressStartupBanner="TRUE"\r
-                               Detect64BitPortabilityProblems="TRUE"\r
-                               DebugInformationFormat="3"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCLibrarianTool"\r
-                               OutputFile="..\..\lib\vc_dll\wxscintilla.lib"\r
-                               SuppressStartupBanner="TRUE"/>\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="__WX__;SCI_LEXER;LINK_LEXERS"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src"/>\r
+                               AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;..\..\lib\vc_dll\mswu;..\..\include"/>\r

                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r


@@ -461,18 +247,27 @@
                        Name="Source Files"\r
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
                        Name="Source Files"\r
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r

+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexlib\Accessor.cxx">\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\AutoComplete.cxx">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\CallTip.cxx">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\AutoComplete.cxx">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\CallTip.cxx">\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\src\Catalogue.cxx">\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\CellBuffer.cxx">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\CharClassify.cxx">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\CellBuffer.cxx">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\CharClassify.cxx">\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexlib\CharacterSet.cxx">\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\ContractionState.cxx">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\ContractionState.cxx">\r
                        </File>\r


@@ -482,9 +277,6 @@
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\Document.cxx">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\Document.cxx">\r
                        </File>\r

-                       <File\r
-                               RelativePath="..\..\src\stc\scintilla\src\DocumentAccessor.cxx">\r
-                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\Editor.cxx">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\Editor.cxx">\r
                        </File>\r


@@ -498,217 +290,289 @@
                                RelativePath="..\..\src\stc\scintilla\src\KeyMap.cxx">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\KeyMap.cxx">\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\KeyWords.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexA68k.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexAPDL.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexASY.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexAU3.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexAVE.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexAVS.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexAbaqus.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexAda.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexAsm.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexAsn1.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexBaan.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexBash.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexBasic.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexAPDL.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexBullant.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexASY.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexCLW.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexAU3.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexCOBOL.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexAVE.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexCPP.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexAbaqus.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexCSS.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexAda.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexCaml.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexAsm.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexCmake.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexAsn1.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexCoffeeScript.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexBaan.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexConf.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexBash.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexCrontab.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexBasic.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexCsound.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexBullant.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexD.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexCLW.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexECL.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexCPP.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexEScript.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexCSS.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexEiffel.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexCaml.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexErlang.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexCmake.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexFlagship.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexConf.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexForth.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexCrontab.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexFortran.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexCsound.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexGAP.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexD.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexGui4Cli.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexEScript.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexHTML.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexEiffel.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexHaskell.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexErlang.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexInno.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexFlagship.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexKix.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexForth.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexLisp.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexFortran.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexLout.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexGAP.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexLua.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexGui4Cli.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexMMIXAL.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexHTML.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexMPT.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexHaskell.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexMSSQL.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexInno.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexMagik.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexKix.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexMarkdown.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexLisp.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexMatlab.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexLout.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexMetapost.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexLua.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexModula.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexMMIXAL.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexMySQL.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexMPT.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexNimrod.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexMSSQL.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexNsis.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexMatlab.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexOScript.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexMetapost.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexOpal.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexNsis.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexOthers.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexOpal.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexPB.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexOthers.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexPLM.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexPB.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexPOV.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexPLM.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexPS.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexPOV.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexPascal.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexPS.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexPerl.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexPascal.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexPowerPro.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexPerl.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexPowerShell.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexProgress.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexProgress.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexPython.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexPython.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexR.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexR.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexRebol.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexRebol.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexRuby.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexRuby.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexSQL.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexSML.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexScriptol.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexSQL.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexSmalltalk.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexScriptol.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexSpecman.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexSmalltalk.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexSpice.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexSorcus.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexTADS3.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexSpecman.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexTCL.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexSpice.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexTeX.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexTACL.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexVB.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexTADS3.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexVHDL.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexTAL.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexVerilog.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexTCL.cxx">\r

                        </File>\r
                        <File\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\LexYAML.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexTCMD.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexTeX.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexTxt2tags.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexVB.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexVHDL.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexVerilog.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexVisualProlog.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexers\LexYAML.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexlib\LexerBase.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexlib\LexerModule.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexlib\LexerNoExceptions.cxx">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\lexlib\LexerSimple.cxx">\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LineMarker.cxx">\r
                        </File>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\LineMarker.cxx">\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\src\PerLine.cxx">\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\PositionCache.cxx">\r
                        </File>\r
                        <File\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\PositionCache.cxx">\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\PropSet.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexlib\PropSetSimple.cxx">\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\RESearch.cxx">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\RESearch.cxx">\r


@@ -719,11 +583,14 @@
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\ScintillaBase.cxx">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\ScintillaBase.cxx">\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\src\stc\scintilla\src\Selection.cxx">\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\Style.cxx">\r
                        </File>\r
                        <File\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\Style.cxx">\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\StyleContext.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexlib\StyleContext.cxx">\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\UniConversion.cxx">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\UniConversion.cxx">\r


@@ -732,12 +599,102 @@
                                RelativePath="..\..\src\stc\scintilla\src\ViewStyle.cxx">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\ViewStyle.cxx">\r
                        </File>\r
                        <File\r

-                               RelativePath="..\..\src\stc\scintilla\src\WindowAccessor.cxx">\r
+                               RelativePath="..\..\src\stc\scintilla\lexlib\WordList.cxx">\r

                        </File>\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\XPM.cxx">\r
                        </File>\r
                </Filter>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\src\stc\scintilla\src\XPM.cxx">\r
                        </File>\r
                </Filter>\r

+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\genrcdefs.h">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswud\wx\msw&quot;"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_lib\mswu\wx\msw&quot;"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswud\wx\msw&quot;"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+                                               CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h&quot;"\r
+                                               Outputs="..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"\r
+                                               AdditionalDependencies="&quot;..\..\lib\vc_dll\mswu\wx\msw&quot;"/>\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\msw\setup.h">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswud\wx\setup.h"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Creating ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_lib\mswu\wx\setup.h"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32">\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswud\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswud\wx\setup.h"/>\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32">\r
+                                       <Tool\r
+                                               Name="VCCustomBuildTool"\r
+                                               Description="Creating ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_dll\mswu\wx\setup.h"\r
+                                               Outputs="..\..\lib\vc_dll\mswu\wx\setup.h"/>\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\univ\setup.h">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"/>\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Debug|Win32"/>\r
+                               <FileConfiguration\r
+                                       Name="DLL Release|Win32"/>\r
+                       </File>\r
+               </Filter>\r

        </Files>\r
        <Globals>\r
                \r
        </Files>\r
        <Globals>\r
                \r