src/gtk/data.cpp is no longer needed

[wxWidgets.git] / build / msw / wx_core.dsp

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index 26dbbee794e1e2f60eda9ba19a25c981e1a134a8..104d4d6023694eefbc1cffcee4a1ca9ce8683910 100644 (file)
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -1,4 +1,4 @@
-# Microsoft Developer Studio Project File - Name="core" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="wx_core" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
@@ -55,18 +55,18 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_dll"
 # PROP Intermediate_Dir "vc_mswunivudll\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv252u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv252u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswunivu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv290u_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d WXDLLNAME=wxmswuniv290u_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_core.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25u_core.lib"
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29u_core.lib"
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
@@ -80,18 +80,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"
 # PROP Intermediate_Dir "vc_mswunivuddll\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv252ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv252ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv290ud_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d WXDLLNAME=wxmswuniv290ud_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_core.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25ud_core.lib" /debug
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29ud_core.lib" /debug
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
@@ -105,18 +105,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"
 # PROP Intermediate_Dir "vc_mswunivdll\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv252_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv252_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswuniv" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmswuniv290_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\include" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv290_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\lib\vc_dll\mswuniv" /i "..\..\include" /d WXDLLNAME=wxmswuniv290_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_core.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25_core.lib"
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_core.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29_core.lib"
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
@@ -130,18 +130,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"
 # PROP Intermediate_Dir "vc_mswunivddll\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv252d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv252d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswunivd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmswuniv290d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv290d_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswunivd" /i "..\..\include" /d WXDLLNAME=wxmswuniv290d_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_core.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv252d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv25d_core.lib" /debug
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_core.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmswuniv290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmswuniv29d_core.lib" /debug
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
@@ -155,18 +155,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"
 # PROP Intermediate_Dir "vc_mswudll\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw252u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw252u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswu" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw290u_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d WXDLLNAME=wxmsw290u_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_core.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25u_core.lib"
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib"
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
@@ -180,18 +180,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"
 # PROP Intermediate_Dir "vc_mswuddll\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw252ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw252ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\include" /i "..\..\lib\vc_dll\mswud" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw290ud_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d WXDLLNAME=wxmsw290ud_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_core.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25ud_core.lib" /debug
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
@@ -205,18 +205,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"
 # PROP Intermediate_Dir "vc_mswdll\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw252_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw252_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw290_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\msw" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_coredll.pch" /Fd..\..\lib\vc_dll\wxmsw290_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_dll\msw" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\include" /i "..\..\lib\vc_dll\msw" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw290_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "__WXMSW__" /i "..\..\lib\vc_dll\msw" /i "..\..\include" /d WXDLLNAME=wxmsw290_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_core.lib"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25_core.lib"
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_core.lib"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29_core.lib"
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
@@ -230,18 +230,18 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"
 # PROP Intermediate_Dir "vc_mswddll\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw252d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw252d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_dll\mswd" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_coredll.pch" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxmsw290d_core_vc_custom.pdb /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\include" /i "..\..\lib\vc_dll\mswd" /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw290d_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\lib\vc_dll\mswd" /i "..\..\include" /d WXDLLNAME=wxmsw290d_core_vc_custom /i "..\..\src\tiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_core.lib" /debug
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib ..\..\lib\vc_dll\wxbase25d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw252d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw25d_core.lib" /debug
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_core.lib" /debug
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ..\..\lib\vc_dll\wxbase29d.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw290d_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29d_core.lib" /debug
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
@@ -255,16 +255,16 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswunivu\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /W4 /Fd..\..\lib\vc_lib\wxmswuniv25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /W4 /Fd..\..\lib\vc_lib\wxmswuniv25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25u_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25u_core.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29u_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29u_core.lib"
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
@@ -278,16 +278,16 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswunivud\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25ud_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25ud_core.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29ud_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29ud_core.lib"
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
@@ -301,16 +301,16 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswuniv\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /W4 /Fd..\..\lib\vc_lib\wxmswuniv25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /W4 /Fd..\..\lib\vc_lib\wxmswuniv25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswuniv" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmswuniv29_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25_core.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29_core.lib"
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
@@ -324,16 +324,16 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswunivd\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswunivd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmswuniv29d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25d_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv25d_core.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29d_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmswuniv29d_core.lib"
 
 !ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
@@ -347,16 +347,16 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswu\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /W4 /Fd..\..\lib\vc_lib\wxmsw25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /W4 /Fd..\..\lib\vc_lib\wxmsw25u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25u_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25u_core.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29u_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29u_core.lib"
 
 !ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
@@ -370,16 +370,16 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswud\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25ud_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25ud_core.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29ud_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29ud_core.lib"
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
@@ -393,16 +393,16 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_msw\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /W4 /Fd..\..\lib\vc_lib\wxmsw25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /W4 /Fd..\..\lib\vc_lib\wxmsw25_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\msw" /I "..\..\include" /W4 /Fd..\..\lib\vc_lib\wxmsw29_core.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25_core.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29_core.lib"
 
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
@@ -416,16 +416,16 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"
 # PROP Intermediate_Dir "vc_mswd\core"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw25d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
+# ADD BASE CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /GR /EHsc /I "..\..\lib\vc_lib\mswd" /I "..\..\include" /W4 /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxmsw29d_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_corelib.pch" /I "..\..\src\tiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25d_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw25d_core.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29d_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29d_core.lib"
 
 !ENDIF
 
@@ -456,6 +456,10 @@ SOURCE=..\..\src\common\accesscmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\anidecod.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\appcmn.cpp
 # End Source File
 # Begin Source File
@@ -476,6 +480,10 @@ SOURCE=..\..\src\common\bookctrl.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\btncmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\choiccmn.cpp
 # End Source File
 # Begin Source File
@@ -484,6 +492,10 @@ SOURCE=..\..\src\common\clipcmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\clrpickercmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\cmdproc.cpp
 # End Source File
 # Begin Source File
@@ -492,6 +504,14 @@ SOURCE=..\..\src\common\cmndata.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\colourcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\combocmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\containr.cpp
 # End Source File
 # Begin Source File
@@ -516,6 +536,18 @@ SOURCE=..\..\src\common\dcbase.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\dcbufcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\dcgraph.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\dcsvg.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\dlgcmn.cpp
 # End Source File
 # Begin Source File
@@ -544,6 +576,12 @@ SOURCE=..\..\src\common\dseldlg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\effects.cpp
 # End Source File
 # Begin Source File
@@ -552,10 +590,18 @@ SOURCE=..\..\src\common\event.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\evtloopcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\fddlgcmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\filepickercmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\fldlgcmn.cpp
 # End Source File
 # Begin Source File
@@ -564,10 +610,22 @@ SOURCE=..\..\src\common\fontcmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\fontenumcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\fontmap.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\fontpickercmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\fontutilcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\framecmn.cpp
 # End Source File
 # Begin Source File
@@ -596,6 +654,10 @@ SOURCE=..\..\src\common\gifdecod.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\graphcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\helpbase.cpp
 # End Source File
 # Begin Source File
@@ -644,6 +706,10 @@ SOURCE=..\..\src\common\imagpnm.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\imagtga.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\imagtiff.cpp
 # End Source File
 # Begin Source File
@@ -660,6 +726,10 @@ SOURCE=..\..\src\common\lboxcmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\listctrlcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\matrix.cpp
 # End Source File
 # Begin Source File
@@ -676,10 +746,18 @@ SOURCE=..\..\src\common\nbkbase.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\overlaycmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\paper.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\pickerbase.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\popupcmn.cpp
 # End Source File
 # Begin Source File
@@ -712,19 +790,27 @@ SOURCE=..\..\src\common\sizer.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\common\srchcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\statbar.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\common\tbarbase.cpp
+SOURCE=..\..\src\common\stattextcmn.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\common\textcmn.cpp
+SOURCE=..\..\src\common\stockitem.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\common\timercmn.cpp
+SOURCE=..\..\src\common\tbarbase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\textcmn.cpp
 # End Source File
 # Begin Source File
 
@@ -1296,6 +1382,69 @@ SOURCE=..\..\src\msw\colour.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\msw\combo.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\msw\combobox.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
@@ -1526,6 +1675,65 @@ SOURCE=..\..\src\msw\dib.cpp
 # Begin Source File
 
 SOURCE=..\..\src\msw\dirdlg.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
+
+!ENDIF
+
 # End Source File
 # Begin Source File
 
@@ -1604,12 +1812,6 @@ SOURCE=..\..\src\msw\ole\droptgt.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\msw\enhmeta.cpp
 # End Source File
 # Begin Source File
@@ -1953,11 +2155,35 @@ SOURCE=..\..\src\msw\gdiobj.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\msw\gdiplus.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\graphics.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\msw\gsockmsw.cpp
 # End Source File
 # Begin Source File
 
 SOURCE=..\..\src\msw\helpchm.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\helpwin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\icon.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\imaglist.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\iniconf.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -2020,7 +2246,7 @@ SOURCE=..\..\src\msw\helpchm.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\helpwin.cpp
+SOURCE=..\..\src\msw\listbox.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -2083,11 +2309,7 @@ SOURCE=..\..\src\msw\helpwin.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\icon.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\imaglist.cpp
+SOURCE=..\..\src\msw\listctrl.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -2150,7 +2372,11 @@ SOURCE=..\..\src\msw\imaglist.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\iniconf.cpp
+SOURCE=..\..\src\msw\main.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\mdi.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -2213,7 +2439,7 @@ SOURCE=..\..\src\msw\iniconf.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\listbox.cpp
+SOURCE=..\..\src\msw\menu.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -2276,7 +2502,7 @@ SOURCE=..\..\src\msw\listbox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\listctrl.cpp
+SOURCE=..\..\src\msw\menuitem.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -2339,11 +2565,7 @@ SOURCE=..\..\src\msw\listctrl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\main.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\mdi.cpp
+SOURCE=..\..\src\msw\metafile.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -2406,7 +2628,11 @@ SOURCE=..\..\src\msw\mdi.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\menu.cpp
+SOURCE=..\..\src\msw\minifram.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\msgdlg.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -2469,7 +2695,11 @@ SOURCE=..\..\src\msw\menu.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\menuitem.cpp
+SOURCE=..\..\src\msw\mslu.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\nativdlg.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -2532,7 +2762,7 @@ SOURCE=..\..\src\msw\menuitem.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\metafile.cpp
+SOURCE=..\..\src\msw\notebook.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -2595,11 +2825,11 @@ SOURCE=..\..\src\msw\metafile.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\minifram.cpp
+SOURCE=..\..\src\msw\ole\oleutils.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\msgdlg.cpp
+SOURCE=..\..\src\msw\ownerdrw.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -2662,11 +2892,27 @@ SOURCE=..\..\src\msw\msgdlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\mslu.cpp
+SOURCE=..\..\src\msw\palette.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\nativdlg.cpp
+SOURCE=..\..\src\msw\pen.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\popupwin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\printdlg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\printwin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\radiobox.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -2729,7 +2975,7 @@ SOURCE=..\..\src\msw\nativdlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\notebook.cpp
+SOURCE=..\..\src\msw\radiobut.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -2792,11 +3038,15 @@ SOURCE=..\..\src\msw\notebook.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\ole\oleutils.cpp
+SOURCE=..\..\src\msw\region.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\ownerdrw.cpp
+SOURCE=..\..\src\msw\renderer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\scrolbar.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -2859,27 +3109,11 @@ SOURCE=..\..\src\msw\ownerdrw.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\palette.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\pen.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\popupwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\printdlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\printwin.cpp
+SOURCE=..\..\src\msw\settings.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\radiobox.cpp
+SOURCE=..\..\src\msw\slider95.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -2942,7 +3176,7 @@ SOURCE=..\..\src\msw\radiobox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\radiobut.cpp
+SOURCE=..\..\src\msw\spinbutt.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -3005,15 +3239,7 @@ SOURCE=..\..\src\msw\radiobut.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\region.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\renderer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\scrolbar.cpp
+SOURCE=..\..\src\msw\spinctrl.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -3076,11 +3302,7 @@ SOURCE=..\..\src\msw\scrolbar.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\settings.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\slider95.cpp
+SOURCE=..\..\src\msw\statbmp.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -3143,7 +3365,7 @@ SOURCE=..\..\src\msw\slider95.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\spinbutt.cpp
+SOURCE=..\..\src\msw\statbox.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -3206,7 +3428,7 @@ SOURCE=..\..\src\msw\spinbutt.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\spinctrl.cpp
+SOURCE=..\..\src\msw\statbr95.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -3269,7 +3491,7 @@ SOURCE=..\..\src\msw\spinctrl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\statbmp.cpp
+SOURCE=..\..\src\msw\statline.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -3332,7 +3554,7 @@ SOURCE=..\..\src\msw\statbmp.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\statbox.cpp
+SOURCE=..\..\src\msw\stattext.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -3395,7 +3617,7 @@ SOURCE=..\..\src\msw\statbox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\statbr95.cpp
+SOURCE=..\..\src\msw\tabctrl.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -3458,7 +3680,7 @@ SOURCE=..\..\src\msw\statbr95.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\statline.cpp
+SOURCE=..\..\src\msw\tbar95.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -3521,7 +3743,7 @@ SOURCE=..\..\src\msw\statline.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\stattext.cpp
+SOURCE=..\..\src\msw\textctrl.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -3584,7 +3806,7 @@ SOURCE=..\..\src\msw\stattext.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\tabctrl.cpp
+SOURCE=..\..\src\msw\tglbtn.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -3647,7 +3869,15 @@ SOURCE=..\..\src\msw\tabctrl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\tbar95.cpp
+SOURCE=..\..\src\msw\tooltip.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\toplevel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\treectrl.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -3710,23 +3940,31 @@ SOURCE=..\..\src\msw\tbar95.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\textctrl.cpp
+SOURCE=..\..\src\msw\utilsgui.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\ole\uuid.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\uxtheme.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\version.rc
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
@@ -3758,184 +3996,200 @@ SOURCE=..\..\src\msw\textctrl.cpp
 
 !ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
+# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\tglbtn.cpp
+SOURCE=..\..\src\msw\volume.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\window.cpp
+# End Source File
+# End Group
+# Begin Group "Generic Sources"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\src\generic\accel.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
+# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\timer.cpp
+SOURCE=..\..\src\generic\busyinfo.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\tooltip.cpp
+SOURCE=..\..\src\generic\buttonbar.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\toplevel.cpp
+SOURCE=..\..\src\generic\choicbkg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\treectrl.cpp
+SOURCE=..\..\src\generic\choicdgg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\clrpickerg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\collpaneg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\colrdlgg.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
+# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\utilsgui.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\ole\uuid.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\msw\uxtheme.cpp
+SOURCE=..\..\src\generic\combog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\volume.cpp
+SOURCE=..\..\src\generic\dcpsg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\window.cpp
+SOURCE=..\..\src\generic\dirctrlg.cpp
 # End Source File
-# End Group
-# Begin Group "Generic Sources"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\src\generic\accel.cpp
+SOURCE=..\..\src\generic\dirdlgg.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -3998,15 +4252,11 @@ SOURCE=..\..\src\generic\accel.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\busyinfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\choicdgg.cpp
+SOURCE=..\..\src\generic\dragimgg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\colrdlgg.cpp
+SOURCE=..\..\src\generic\fdrepdlg.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -4069,15 +4319,7 @@ SOURCE=..\..\src\generic\colrdlgg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\dcpsg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\dirctrlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\dirdlgg.cpp
+SOURCE=..\..\src\generic\filedlgg.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -4140,11 +4382,11 @@ SOURCE=..\..\src\generic\dirdlgg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\dragimgg.cpp
+SOURCE=..\..\src\generic\filepickerg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\fdrepdlg.cpp
+SOURCE=..\..\src\generic\fontdlgg.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -4207,7 +4449,15 @@ SOURCE=..\..\src\generic\fdrepdlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\filedlgg.cpp
+SOURCE=..\..\src\generic\fontpickerg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\listbkg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\listctrl.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -4270,7 +4520,11 @@ SOURCE=..\..\src\generic\filedlgg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\fontdlgg.cpp
+SOURCE=..\..\src\generic\logg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\mdig.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -4333,7 +4587,7 @@ SOURCE=..\..\src\generic\fontdlgg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\imaglist.cpp
+SOURCE=..\..\src\generic\msgdlgg.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -4396,78 +4650,114 @@ SOURCE=..\..\src\generic\imaglist.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\listbkg.cpp
+SOURCE=..\..\src\generic\numdlgg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\listctrl.cpp
+SOURCE=..\..\src\generic\panelg.cpp
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+SOURCE=..\..\src\generic\printps.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\generic\prntdlgg.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+SOURCE=..\..\src\generic\progdlgg.cpp
+# End Source File
+# Begin Source File
 
+SOURCE=..\..\src\generic\renderg.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+SOURCE=..\..\src\generic\scrlwing.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\selstore.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\spinctlg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\splitter.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\srchctlg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\statusbr.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+
+# PROP Exclude_From_Build 1
 
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
-# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\logg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\mdig.cpp
+SOURCE=..\..\src\generic\tabg.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -4530,7 +4820,39 @@ SOURCE=..\..\src\generic\mdig.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\msgdlgg.cpp
+SOURCE=..\..\src\generic\textdlgg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\tipwin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\toolbkg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\treebkg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\treectlg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\vlbox.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\generic\vscroll.cpp
+# End Source File
+# End Group
+# Begin Group "wxUniv Sources"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\src\univ\bmpbuttn.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -4593,110 +4915,70 @@ SOURCE=..\..\src\generic\msgdlgg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\numdlgg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\panelg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\printps.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\prntdlgg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\progdlgg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\renderg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\scrlwing.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\selstore.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\spinctlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\splitter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\statusbr.cpp
+SOURCE=..\..\src\univ\button.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
+# PROP Exclude_From_Build 1
 
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
+# PROP Exclude_From_Build 1
 
 !ENDIF
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\tabg.cpp
+SOURCE=..\..\src\univ\checkbox.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -4759,31 +5041,7 @@ SOURCE=..\..\src\generic\tabg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\textdlgg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\tipwin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\treectlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\vlbox.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\generic\vscroll.cpp
-# End Source File
-# End Group
-# Begin Group "wxUniv Sources"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\univ\bmpbuttn.cpp
+SOURCE=..\..\src\univ\checklst.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -4846,7 +5104,7 @@ SOURCE=..\..\src\univ\bmpbuttn.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\button.cpp
+SOURCE=..\..\src\univ\choice.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -4909,7 +5167,7 @@ SOURCE=..\..\src\univ\button.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\checkbox.cpp
+SOURCE=..\..\src\univ\colschem.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -4972,7 +5230,7 @@ SOURCE=..\..\src\univ\checkbox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\checklst.cpp
+SOURCE=..\..\src\univ\combobox.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -5035,7 +5293,7 @@ SOURCE=..\..\src\univ\checklst.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\choice.cpp
+SOURCE=..\..\src\univ\control.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -5098,7 +5356,7 @@ SOURCE=..\..\src\univ\choice.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\colschem.cpp
+SOURCE=..\..\src\univ\ctrlrend.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -5161,7 +5419,7 @@ SOURCE=..\..\src\univ\colschem.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\combobox.cpp
+SOURCE=..\..\src\univ\dialog.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -5224,7 +5482,7 @@ SOURCE=..\..\src\univ\combobox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\control.cpp
+SOURCE=..\..\src\univ\framuniv.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -5287,7 +5545,7 @@ SOURCE=..\..\src\univ\control.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\ctrlrend.cpp
+SOURCE=..\..\src\univ\gauge.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -5350,7 +5608,7 @@ SOURCE=..\..\src\univ\ctrlrend.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\dialog.cpp
+SOURCE=..\..\src\univ\themes\gtk.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -5413,7 +5671,7 @@ SOURCE=..\..\src\univ\dialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\framuniv.cpp
+SOURCE=..\..\src\univ\inpcons.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -5476,7 +5734,7 @@ SOURCE=..\..\src\univ\framuniv.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\gauge.cpp
+SOURCE=..\..\src\univ\inphand.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -5539,7 +5797,7 @@ SOURCE=..\..\src\univ\gauge.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\themes\gtk.cpp
+SOURCE=..\..\src\univ\listbox.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -5602,7 +5860,7 @@ SOURCE=..\..\src\univ\themes\gtk.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\inpcons.cpp
+SOURCE=..\..\src\univ\menu.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -5665,7 +5923,7 @@ SOURCE=..\..\src\univ\inpcons.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\inphand.cpp
+SOURCE=..\..\src\univ\themes\metal.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -5728,7 +5986,7 @@ SOURCE=..\..\src\univ\inphand.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\listbox.cpp
+SOURCE=..\..\src\univ\themes\mono.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -5791,7 +6049,7 @@ SOURCE=..\..\src\univ\listbox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\menu.cpp
+SOURCE=..\..\src\univ\notebook.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -5854,7 +6112,7 @@ SOURCE=..\..\src\univ\menu.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\themes\metal.cpp
+SOURCE=..\..\src\univ\radiobox.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -5917,7 +6175,7 @@ SOURCE=..\..\src\univ\themes\metal.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\notebook.cpp
+SOURCE=..\..\src\univ\radiobut.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -5980,7 +6238,7 @@ SOURCE=..\..\src\univ\notebook.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\radiobox.cpp
+SOURCE=..\..\src\univ\scrarrow.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -6043,7 +6301,7 @@ SOURCE=..\..\src\univ\radiobox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\radiobut.cpp
+SOURCE=..\..\src\univ\scrolbar.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -6106,7 +6364,7 @@ SOURCE=..\..\src\univ\radiobut.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\scrarrow.cpp
+SOURCE=..\..\src\univ\scrthumb.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -6169,7 +6427,7 @@ SOURCE=..\..\src\univ\scrarrow.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\scrolbar.cpp
+SOURCE=..\..\src\univ\slider.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -6232,7 +6490,7 @@ SOURCE=..\..\src\univ\scrolbar.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\scrthumb.cpp
+SOURCE=..\..\src\univ\spinbutt.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -6295,7 +6553,7 @@ SOURCE=..\..\src\univ\scrthumb.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\slider.cpp
+SOURCE=..\..\src\univ\statbmp.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -6358,7 +6616,7 @@ SOURCE=..\..\src\univ\slider.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\spinbutt.cpp
+SOURCE=..\..\src\univ\statbox.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -6421,7 +6679,7 @@ SOURCE=..\..\src\univ\spinbutt.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\statbmp.cpp
+SOURCE=..\..\src\univ\statline.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -6484,7 +6742,7 @@ SOURCE=..\..\src\univ\statbmp.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\statbox.cpp
+SOURCE=..\..\src\univ\stattext.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -6547,7 +6805,7 @@ SOURCE=..\..\src\univ\statbox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\statline.cpp
+SOURCE=..\..\src\univ\statusbr.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -6610,7 +6868,7 @@ SOURCE=..\..\src\univ\statline.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\stattext.cpp
+SOURCE=..\..\src\univ\stdrend.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -6673,7 +6931,7 @@ SOURCE=..\..\src\univ\stattext.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\statusbr.cpp
+SOURCE=..\..\src\univ\textctrl.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -6736,7 +6994,7 @@ SOURCE=..\..\src\univ\statusbr.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\univ\textctrl.cpp
+SOURCE=..\..\src\univ\tglbtn.cpp
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
@@ -7122,48 +7380,32 @@ SOURCE=..\..\include\wx\msw\setup.h
 
 !IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
+# Begin Custom Build - 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
+# Begin Custom Build - 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
+# Begin Custom Build - 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
 
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
+# Begin Custom Build - 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
@@ -7173,7 +7415,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
@@ -7183,7 +7425,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_dll\msw\wx\setup.h
@@ -7193,7 +7435,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_dll\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_dll\mswd\wx\setup.h
@@ -7202,48 +7444,32 @@ InputPath=..\include\wx\msw\setup.h
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
+# Begin Custom Build - 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
+# Begin Custom Build - 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
+# Begin Custom Build - 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
 
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+# Begin Custom Build - 
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
@@ -7253,7 +7479,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
@@ -7263,7 +7489,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "core - Win32 Release"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\msw\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_lib\msw\wx\setup.h
@@ -7273,7 +7499,7 @@ InputPath=..\include\wx\msw\setup.h
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\setup.h
-InputPath=..\include\wx\msw\setup.h
+InputPath=..\..\include\wx\msw\setup.h
 
 "..\..\lib\vc_lib\mswd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\..\lib\vc_lib\mswd\wx\setup.h
@@ -7282,6 +7508,141 @@ InputPath=..\include\wx\msw\setup.h
 
 !ENDIF
 
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\setup.h
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h
+InputPath=..\..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h
+InputPath=..\..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h
+InputPath=..\..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h
+InputPath=..\..\include\wx\univ\setup.h
+
+"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h
+InputPath=..\..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h
+InputPath=..\..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h
+InputPath=..\..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h
+InputPath=..\..\include\wx\univ\setup.h
+
+"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ENDIF
+
 # End Source File
 # End Group
 # Begin Group "MSW Headers"
@@ -7297,6 +7658,10 @@ SOURCE=..\..\include\wx\msw\ole\access.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\msw\ole\activex.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\msw\app.h
 # End Source File
 # Begin Source File
@@ -7349,6 +7714,10 @@ SOURCE=..\..\include\wx\msw\colour.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\msw\combo.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\msw\combobox.h
 # End Source File
 # Begin Source File
@@ -7373,6 +7742,10 @@ SOURCE=..\..\include\wx\msw\ole\dataobj2.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\msw\datectrl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\msw\dc.h
 # End Source File
 # Begin Source File
@@ -7421,6 +7794,10 @@ SOURCE=..\..\include\wx\msw\enhmeta.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\msw\evtloop.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\msw\fdrepdlg.h
 # End Source File
 # Begin Source File
@@ -7445,1235 +7822,1862 @@ SOURCE=..\..\include\wx\msw\gauge95.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\gdiimage.h
+SOURCE=..\..\include\wx\msw\gdiimage.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\genrcdefs.h
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
+
+"..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivu\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
+
+"..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivud\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
+
+"..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswuniv\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
+
+"..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswunivd\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
+
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
+
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
+
+"..\..\lib\vc_dll\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\msw\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
+
+"..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswd\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
+
+"..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivu\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
+
+"..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivud\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
+
+"..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswuniv\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswuniv\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
+
+"..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswunivd\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswunivd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
+
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
+
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
+
+"..\..\lib\vc_lib\msw\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\msw\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
+
+"..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswd\wx\msw"
+       cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\glcanvas.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\helpbest.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\helpchm.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\helpwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\htmlhelp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\icon.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\imaglist.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\iniconf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\joystick.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\listbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\listctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\mdi.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\menu.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\menuitem.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\metafile.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\minifram.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\missing.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\msgdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\msvcrt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\notebook.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\ole\oleutils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\palette.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\pen.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\popupwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\printdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\printwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\radiobox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\radiobut.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\rcdefs.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\region.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\scrolbar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\setup0.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\slider95.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\sound.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\spinbutt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\spinctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\statbmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\statbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\statbr95.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\statline.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\stattext.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\tabctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\taskbar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\tbar95.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\textctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\tglbtn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\tooltip.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\toplevel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\treectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\ole\uuid.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\uxtheme.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\uxthemep.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\window.h
+# End Source File
+# End Group
+# Begin Group "Generic Headers"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\aboutdlgg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\accel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\animate.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\bmpcbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\busyinfo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\buttonbar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\calctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\choicdgg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\clrpickerg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\collpaneg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\colrdlgg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\combo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\dataview.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\datectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\dcpsg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\dirctrlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\dirdlgg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\dragimgg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\fdrepdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\filedlgg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\filepickerg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\fontdlgg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\fontpickerg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\grid.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\gridctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\gridsel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\helpext.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\hyperlink.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\laywin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\listctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\logg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\mdig.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\msgdlgg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\notebook.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\numdlgg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\panelg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\printps.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\prntdlgg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\progdlgg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\propdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\sashwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\scrolwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\spinctlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\splash.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\splitter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\srchctlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\statusbr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\tabg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\textdlgg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\treectlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\wizard.h
+# End Source File
+# End Group
+# Begin Group "wxUniv Headers"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\app.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\bmpbuttn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\button.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\checkbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\checklst.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\chkconf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\choice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\colschem.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\combobox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\control.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\dialog.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\gdiobj.h
+SOURCE=..\..\include\wx\univ\frame.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\glcanvas.h
+SOURCE=..\..\include\wx\univ\gauge.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\helpbest.h
+SOURCE=..\..\include\wx\univ\inpcons.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\helpchm.h
+SOURCE=..\..\include\wx\univ\inphand.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\helpwin.h
+SOURCE=..\..\include\wx\univ\listbox.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\icon.h
+SOURCE=..\..\include\wx\univ\menu.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\imaglist.h
+SOURCE=..\..\include\wx\univ\menuitem.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\iniconf.h
+SOURCE=..\..\include\wx\univ\notebook.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\joystick.h
+SOURCE=..\..\include\wx\univ\radiobox.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\listbox.h
+SOURCE=..\..\include\wx\univ\radiobut.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\listctrl.h
+SOURCE=..\..\include\wx\univ\renderer.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\mdi.h
+SOURCE=..\..\include\wx\univ\scrarrow.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\menu.h
+SOURCE=..\..\include\wx\univ\scrolbar.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\menuitem.h
+SOURCE=..\..\include\wx\univ\scrthumb.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\metafile.h
+SOURCE=..\..\include\wx\univ\scrtimer.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\minifram.h
+SOURCE=..\..\include\wx\univ\slider.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\missing.h
+SOURCE=..\..\include\wx\univ\spinbutt.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\msgdlg.h
+SOURCE=..\..\include\wx\univ\statbmp.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\mslu.h
+SOURCE=..\..\include\wx\univ\statbox.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\msvcrt.h
+SOURCE=..\..\include\wx\univ\statline.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\notebook.h
+SOURCE=..\..\include\wx\univ\stattext.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\ole\oleutils.h
+SOURCE=..\..\include\wx\univ\statusbr.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\palette.h
+SOURCE=..\..\include\wx\univ\stdrend.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\pen.h
+SOURCE=..\..\include\wx\univ\textctrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\printdlg.h
+SOURCE=..\..\include\wx\univ\theme.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\printwin.h
+SOURCE=..\..\include\wx\univ\toolbar.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\private.h
+SOURCE=..\..\include\wx\univ\toplevel.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\radiobox.h
+SOURCE=..\..\include\wx\univ\window.h
 # End Source File
+# End Group
+# Begin Group "wxHTML Headers"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\radiobut.h
+SOURCE=..\..\include\wx\html\helpctrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\regconf.h
+SOURCE=..\..\include\wx\html\helpdata.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\region.h
+SOURCE=..\..\include\wx\html\helpdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\registry.h
+SOURCE=..\..\include\wx\html\helpfrm.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\scrolbar.h
+SOURCE=..\..\include\wx\html\helpwnd.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\setup0.h
+SOURCE=..\..\include\wx\html\htmlcell.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\slider95.h
+SOURCE=..\..\include\wx\html\htmldefs.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\slidrmsw.h
+SOURCE=..\..\include\wx\html\htmlfilt.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\sound.h
+SOURCE=..\..\include\wx\html\htmlpars.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\spinbutt.h
+SOURCE=..\..\include\wx\html\htmlproc.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\spinctrl.h
+SOURCE=..\..\include\wx\html\htmltag.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\statbmp.h
+SOURCE=..\..\include\wx\html\htmlwin.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\statbox.h
+SOURCE=..\..\include\wx\html\htmprint.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\statbr95.h
+SOURCE=..\..\include\wx\html\m_templ.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\statline.h
+SOURCE=..\..\include\wx\html\winpars.h
 # End Source File
+# End Group
+# Begin Group "Common Headers"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\stattext.h
+SOURCE=..\..\include\wx\aboutdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\tabctrl.h
+SOURCE=..\..\include\wx\accel.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\taskbar.h
+SOURCE=..\..\include\wx\access.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\tbar95.h
+SOURCE=..\..\include\wx\anidecod.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\tbarmsw.h
+SOURCE=..\..\include\wx\animate.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\textctrl.h
+SOURCE=..\..\include\wx\animdecod.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\tglbtn.h
+SOURCE=..\..\include\wx\artprov.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\timer.h
+SOURCE=..\..\include\wx\aui\aui.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\tooltip.h
+SOURCE=..\..\include\wx\aui\auibook.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\toplevel.h
+SOURCE=..\..\include\wx\bitmap.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\treectrl.h
+SOURCE=..\..\include\wx\bmpbuttn.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\ole\uuid.h
+SOURCE=..\..\include\wx\bmpcbox.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\window.h
+SOURCE=..\..\include\wx\bookctrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\gnuwin32\winresrc.h
+SOURCE=..\..\include\wx\brush.h
 # End Source File
-# End Group
-# Begin Group "Generic Headers"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\accel.h
+SOURCE=..\..\include\wx\busyinfo.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\calctrl.h
+SOURCE=..\..\include\wx\button.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\choicdgg.h
+SOURCE=..\..\include\wx\calctrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\colrdlgg.h
+SOURCE=..\..\include\wx\caret.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\dcpsg.h
+SOURCE=..\..\include\wx\checkbox.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\dirctrlg.h
+SOURCE=..\..\include\wx\checklst.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\dirdlgg.h
+SOURCE=..\..\include\wx\choicdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\dragimgg.h
+SOURCE=..\..\include\wx\choice.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\fdrepdlg.h
+SOURCE=..\..\include\wx\choicebk.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\filedlgg.h
+SOURCE=..\..\include\wx\clipbrd.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\fontdlgg.h
+SOURCE=..\..\include\wx\clrpicker.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\grid.h
+SOURCE=..\..\include\wx\cmdproc.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\gridctrl.h
+SOURCE=..\..\include\wx\cmndata.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\gridsel.h
+SOURCE=..\..\include\wx\collpane.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\helpext.h
+SOURCE=..\..\include\wx\colordlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\imaglist.h
+SOURCE=..\..\include\wx\colour.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\laywin.h
+SOURCE=..\..\include\wx\combo.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\listctrl.h
+SOURCE=..\..\include\wx\combobox.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\logg.h
+SOURCE=..\..\include\wx\control.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\mdig.h
+SOURCE=..\..\include\wx\cshelp.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\msgdlgg.h
+SOURCE=..\..\include\wx\ctrlsub.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\notebook.h
+SOURCE=..\..\include\wx\cursor.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\numdlgg.h
+SOURCE=..\..\include\wx\dataobj.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\panelg.h
+SOURCE=..\..\include\wx\dataview.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\printps.h
+SOURCE=..\..\include\wx\datectrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\prntdlgg.h
+SOURCE=..\..\include\wx\dateevt.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\progdlgg.h
+SOURCE=..\..\include\wx\dbgrid.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\sashwin.h
+SOURCE=..\..\include\wx\dc.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\scrolwin.h
+SOURCE=..\..\include\wx\dcbuffer.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\spinctlg.h
+SOURCE=..\..\include\wx\dcclient.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\splash.h
+SOURCE=..\..\include\wx\dcgraph.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\splitter.h
+SOURCE=..\..\include\wx\dcmemory.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\statusbr.h
+SOURCE=..\..\include\wx\dcmirror.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\tabg.h
+SOURCE=..\..\include\wx\dcprint.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\textdlgg.h
+SOURCE=..\..\include\wx\dcps.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\timer.h
+SOURCE=..\..\include\wx\dcscreen.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\treectlg.h
+SOURCE=..\..\include\wx\dcsvg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\wizard.h
+SOURCE=..\..\include\wx\debugrpt.h
 # End Source File
-# End Group
-# Begin Group "wxUniv Headers"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\app.h
+SOURCE=..\..\include\wx\dialog.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\bmpbuttn.h
+SOURCE=..\..\include\wx\dialup.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\button.h
+SOURCE=..\..\include\wx\dirctrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\checkbox.h
+SOURCE=..\..\include\wx\dirdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\checklst.h
+SOURCE=..\..\include\wx\display.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\choice.h
+SOURCE=..\..\include\wx\display_impl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\colschem.h
+SOURCE=..\..\include\wx\dnd.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\combobox.h
+SOURCE=..\..\include\wx\aui\dockart.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\control.h
+SOURCE=..\..\include\wx\docmdi.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\dialog.h
+SOURCE=..\..\include\wx\docview.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\frame.h
+SOURCE=..\..\include\wx\dragimag.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\gauge.h
+SOURCE=..\..\include\wx\editlbox.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\inpcons.h
+SOURCE=..\..\include\wx\effects.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\inphand.h
+SOURCE=..\..\include\wx\encinfo.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\listbox.h
+SOURCE=..\..\include\wx\evtloop.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\menu.h
+SOURCE=..\..\include\wx\fdrepdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\menuitem.h
+SOURCE=..\..\include\wx\filedlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\notebook.h
+SOURCE=..\..\include\wx\filepicker.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\radiobox.h
+SOURCE=..\..\include\wx\aui\floatpane.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\radiobut.h
+SOURCE=..\..\include\wx\fmappriv.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\renderer.h
+SOURCE=..\..\include\wx\font.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\scrarrow.h
+SOURCE=..\..\include\wx\fontdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\scrolbar.h
+SOURCE=..\..\include\wx\fontenum.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\scrthumb.h
+SOURCE=..\..\include\wx\fontpicker.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\scrtimer.h
+SOURCE=..\..\include\wx\fontutil.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\slider.h
+SOURCE=..\..\include\wx\frame.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\spinbutt.h
+SOURCE=..\..\include\wx\aui\framemanager.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\statbmp.h
+SOURCE=..\..\include\wx\gauge.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\statbox.h
+SOURCE=..\..\include\wx\gbsizer.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\statline.h
+SOURCE=..\..\include\wx\gdicmn.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\stattext.h
+SOURCE=..\..\include\wx\gdiobj.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\statusbr.h
+SOURCE=..\..\include\wx\geometry.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\textctrl.h
+SOURCE=..\..\include\wx\gifdecod.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\theme.h
+SOURCE=..\..\include\wx\glcanvas.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\toolbar.h
+SOURCE=..\..\include\wx\graphics.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\toplevel.h
+SOURCE=..\..\include\wx\grid.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\window.h
+SOURCE=..\..\include\wx\help.h
 # End Source File
-# End Group
-# Begin Group "wxHTML Headers"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\include\wx\html\forcelnk.h
+SOURCE=..\..\include\wx\helpbase.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\html\helpctrl.h
+SOURCE=..\..\include\wx\helphtml.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\html\helpdata.h
+SOURCE=..\..\include\wx\helpwin.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\html\helpfrm.h
+SOURCE=..\..\include\wx\htmllbox.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\html\htmlcell.h
+SOURCE=..\..\include\wx\hyperlink.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\html\htmldefs.h
+SOURCE=..\..\include\wx\icon.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\html\htmlfilt.h
+SOURCE=..\..\include\wx\iconbndl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\html\htmlpars.h
+SOURCE=..\..\include\wx\imagbmp.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\html\htmlproc.h
+SOURCE=..\..\include\wx\image.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\html\htmltag.h
+SOURCE=..\..\include\wx\imaggif.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\html\htmlwin.h
+SOURCE=..\..\include\wx\imagiff.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\html\htmprint.h
+SOURCE=..\..\include\wx\imagjpeg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\html\m_templ.h
+SOURCE=..\..\include\wx\imaglist.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\html\winpars.h
+SOURCE=..\..\include\wx\imagpcx.h
 # End Source File
-# End Group
-# Begin Group "Common Headers"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\include\wx\accel.h
+SOURCE=..\..\include\wx\imagpng.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\access.h
+SOURCE=..\..\include\wx\imagpnm.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\artprov.h
+SOURCE=..\..\include\wx\imagtga.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\bitmap.h
+SOURCE=..\..\include\wx\imagtiff.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\bmpbuttn.h
+SOURCE=..\..\include\wx\imagxpm.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\bookctrl.h
+SOURCE=..\..\include\wx\joystick.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\brush.h
+SOURCE=..\..\include\wx\layout.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\busyinfo.h
+SOURCE=..\..\include\wx\laywin.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\button.h
+SOURCE=..\..\include\wx\listbase.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\calctrl.h
+SOURCE=..\..\include\wx\listbook.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\caret.h
+SOURCE=..\..\include\wx\listbox.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\checkbox.h
+SOURCE=..\..\include\wx\listctrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\checklst.h
+SOURCE=..\..\include\wx\matrix.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\choicdlg.h
+SOURCE=..\..\include\wx\mdi.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\choice.h
+SOURCE=..\..\include\wx\mediactrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\clipbrd.h
+SOURCE=..\..\include\wx\menu.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\cmdproc.h
+SOURCE=..\..\include\wx\menuitem.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\cmndata.h
+SOURCE=..\..\include\wx\metafile.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\colordlg.h
+SOURCE=..\..\include\wx\minifram.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\colour.h
+SOURCE=..\..\include\wx\msgdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\combobox.h
+SOURCE=..\..\include\wx\nonownedwnd.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\control.h
+SOURCE=..\..\include\wx\notebook.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\cshelp.h
+SOURCE=..\..\include\wx\numdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\ctrlsub.h
+SOURCE=..\..\include\wx\odcombo.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\cursor.h
+SOURCE=..\..\include\wx\overlay.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\dataobj.h
+SOURCE=..\..\include\wx\ownerdrw.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\dbgrid.h
+SOURCE=..\..\include\wx\palette.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\dc.h
+SOURCE=..\..\include\wx\panel.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\dcbuffer.h
+SOURCE=..\..\include\wx\paper.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\dcclient.h
+SOURCE=..\..\include\wx\pen.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\dcmemory.h
+SOURCE=..\..\include\wx\pickerbase.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\dcmirror.h
+SOURCE=..\..\include\wx\popupwin.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\dcprint.h
+SOURCE=..\..\include\wx\position.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\dcps.h
+SOURCE=..\..\include\wx\print.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\dcscreen.h
+SOURCE=..\..\include\wx\printdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\dialog.h
+SOURCE=..\..\include\wx\prntbase.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\dialup.h
+SOURCE=..\..\include\wx\progdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\dirctrl.h
+SOURCE=..\..\include\wx\propdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\dirdlg.h
+SOURCE=..\..\include\wx\ptr_scpd.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\display.h
+SOURCE=..\..\include\wx\quantize.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\dnd.h
+SOURCE=..\..\include\wx\radiobox.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\docmdi.h
+SOURCE=..\..\include\wx\radiobut.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\docview.h
+SOURCE=..\..\include\wx\rawbmp.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\dragimag.h
+SOURCE=..\..\include\wx\region.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\effects.h
+SOURCE=..\..\include\wx\renderer.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\encinfo.h
+SOURCE=..\..\include\wx\richtext\richtextbuffer.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\evtloop.h
+SOURCE=..\..\include\wx\richtext\richtextctrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\fdrepdlg.h
+SOURCE=..\..\include\wx\richtext\richtextformatdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\filedlg.h
+SOURCE=..\..\include\wx\richtext\richtexthtml.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\fmappriv.h
+SOURCE=..\..\include\wx\richtext\richtextprint.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\font.h
+SOURCE=..\..\include\wx\richtext\richtextstyledlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\fontdlg.h
+SOURCE=..\..\include\wx\richtext\richtextstyles.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\fontenum.h
+SOURCE=..\..\include\wx\richtext\richtextsymboldlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\fontutil.h
+SOURCE=..\..\include\wx\richtext\richtextxml.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\frame.h
+SOURCE=..\..\include\wx\sashwin.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\gauge.h
+SOURCE=..\..\include\wx\scopeguard.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\gbsizer.h
+SOURCE=..\..\include\wx\scrolbar.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\gdicmn.h
+SOURCE=..\..\include\wx\scrolwin.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\gdiobj.h
+SOURCE=..\..\include\wx\selstore.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\geometry.h
+SOURCE=..\..\include\wx\settings.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\gifdecod.h
+SOURCE=..\..\include\wx\sizer.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\glcanvas.h
+SOURCE=..\..\include\wx\slider.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\grid.h
+SOURCE=..\..\include\wx\sound.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\help.h
+SOURCE=..\..\include\wx\spinbutt.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\helpbase.h
+SOURCE=..\..\include\wx\spinctrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\helphtml.h
+SOURCE=..\..\include\wx\splash.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\helpwin.h
+SOURCE=..\..\include\wx\splitter.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\htmllbox.h
+SOURCE=..\..\include\wx\srchctrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\icon.h
+SOURCE=..\..\include\wx\statbmp.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\iconbndl.h
+SOURCE=..\..\include\wx\statbox.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\imagbmp.h
+SOURCE=..\..\include\wx\statline.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\image.h
+SOURCE=..\..\include\wx\stattext.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\imaggif.h
+SOURCE=..\..\include\wx\statusbr.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\imagiff.h
+SOURCE=..\..\include\wx\stc\stc.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\imagjpeg.h
+SOURCE=..\..\include\wx\tab.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\imaglist.h
+SOURCE=..\..\include\wx\tabctrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\imagpcx.h
+SOURCE=..\..\include\wx\aui\tabmdi.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\imagpng.h
+SOURCE=..\..\include\wx\taskbar.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\imagpnm.h
+SOURCE=..\..\include\wx\tbarbase.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\imagtiff.h
+SOURCE=..\..\include\wx\textctrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\imagxpm.h
+SOURCE=..\..\include\wx\textdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\joystick.h
+SOURCE=..\..\include\wx\tglbtn.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\layout.h
+SOURCE=..\..\include\wx\tipdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\laywin.h
+SOURCE=..\..\include\wx\tipwin.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\listbase.h
+SOURCE=..\..\include\wx\toolbar.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\listbook.h
+SOURCE=..\..\include\wx\toolbook.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\listbox.h
+SOURCE=..\..\include\wx\tooltip.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\listctrl.h
+SOURCE=..\..\include\wx\toplevel.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\matrix.h
+SOURCE=..\..\include\wx\treebase.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\mdi.h
+SOURCE=..\..\include\wx\treebook.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\menu.h
+SOURCE=..\..\include\wx\treectrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\menuitem.h
+SOURCE=..\..\include\wx\valgen.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\metafile.h
+SOURCE=..\..\include\wx\validate.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\minifram.h
+SOURCE=..\..\include\wx\valtext.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msgdlg.h
+SOURCE=..\..\include\wx\vidmode.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\notebook.h
+SOURCE=..\..\include\wx\vlbox.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\numdlg.h
+SOURCE=..\..\include\wx\vms_x_fix.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\ownerdrw.h
+SOURCE=..\..\include\wx\vscroll.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\palette.h
+SOURCE=..\..\include\wx\window.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\panel.h
+SOURCE=..\..\include\wx\wizard.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\paper.h
+SOURCE=..\..\include\wx\wupdlock.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\pen.h
+SOURCE=..\..\include\wx\wxhtml.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\popupwin.h
+SOURCE=..\..\include\wx\xrc\xh_all.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\print.h
+SOURCE=..\..\include\wx\xrc\xh_animatctrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\printdlg.h
+SOURCE=..\..\include\wx\xrc\xh_bmp.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\prntbase.h
+SOURCE=..\..\include\wx\xrc\xh_bmpbt.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\progdlg.h
+SOURCE=..\..\include\wx\xrc\xh_bmpcbox.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\ptr_scpd.h
+SOURCE=..\..\include\wx\xrc\xh_bttn.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\quantize.h
+SOURCE=..\..\include\wx\xrc\xh_cald.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\radiobox.h
+SOURCE=..\..\include\wx\xrc\xh_chckb.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\radiobut.h
+SOURCE=..\..\include\wx\xrc\xh_chckl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\rawbmp.h
+SOURCE=..\..\include\wx\xrc\xh_choic.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\region.h
+SOURCE=..\..\include\wx\xrc\xh_choicbk.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\renderer.h
+SOURCE=..\..\include\wx\xrc\xh_clrpicker.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\sashwin.h
+SOURCE=..\..\include\wx\xrc\xh_collpane.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\scopeguard.h
+SOURCE=..\..\include\wx\xrc\xh_combo.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\scrolbar.h
+SOURCE=..\..\include\wx\xrc\xh_datectrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\scrolwin.h
+SOURCE=..\..\include\wx\xrc\xh_dirpicker.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\selstore.h
+SOURCE=..\..\include\wx\xrc\xh_dlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\settings.h
+SOURCE=..\..\include\wx\xrc\xh_filepicker.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\sizer.h
+SOURCE=..\..\include\wx\xrc\xh_fontpicker.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\slider.h
+SOURCE=..\..\include\wx\xrc\xh_frame.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\sound.h
+SOURCE=..\..\include\wx\xrc\xh_gauge.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\spinbutt.h
+SOURCE=..\..\include\wx\xrc\xh_gdctl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\spinctrl.h
+SOURCE=..\..\include\wx\xrc\xh_grid.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\splash.h
+SOURCE=..\..\include\wx\xrc\xh_html.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\splitter.h
+SOURCE=..\..\include\wx\xrc\xh_htmllbox.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\statbmp.h
+SOURCE=..\..\include\wx\xrc\xh_hyperlink.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\statbox.h
+SOURCE=..\..\include\wx\xrc\xh_listb.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\statline.h
+SOURCE=..\..\include\wx\xrc\xh_listbk.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\stattext.h
+SOURCE=..\..\include\wx\xrc\xh_listc.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\statusbr.h
+SOURCE=..\..\include\wx\xrc\xh_mdi.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\tab.h
+SOURCE=..\..\include\wx\xrc\xh_menu.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\tabctrl.h
+SOURCE=..\..\include\wx\xrc\xh_notbk.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\taskbar.h
+SOURCE=..\..\include\wx\xrc\xh_odcombo.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\tbarbase.h
+SOURCE=..\..\include\wx\xrc\xh_panel.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\textctrl.h
+SOURCE=..\..\include\wx\xrc\xh_radbt.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\textdlg.h
+SOURCE=..\..\include\wx\xrc\xh_radbx.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\tglbtn.h
+SOURCE=..\..\include\wx\xrc\xh_scrol.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\tipdlg.h
+SOURCE=..\..\include\wx\xrc\xh_scwin.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\tipwin.h
+SOURCE=..\..\include\wx\xrc\xh_sizer.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\toolbar.h
+SOURCE=..\..\include\wx\xrc\xh_slidr.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\tooltip.h
+SOURCE=..\..\include\wx\xrc\xh_spin.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\toplevel.h
+SOURCE=..\..\include\wx\xrc\xh_split.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\treebase.h
+SOURCE=..\..\include\wx\xrc\xh_statbar.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\treectrl.h
+SOURCE=..\..\include\wx\xrc\xh_stbmp.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\valgen.h
+SOURCE=..\..\include\wx\xrc\xh_stbox.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\validate.h
+SOURCE=..\..\include\wx\xrc\xh_stlin.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\valtext.h
+SOURCE=..\..\include\wx\xrc\xh_sttxt.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\vidmode.h
+SOURCE=..\..\include\wx\xrc\xh_text.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\vlbox.h
+SOURCE=..\..\include\wx\xrc\xh_tglbtn.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\vms_x_fix.h
+SOURCE=..\..\include\wx\xrc\xh_toolb.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\vscroll.h
+SOURCE=..\..\include\wx\xrc\xh_tree.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\wave.h
+SOURCE=..\..\include\wx\xrc\xh_treebk.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\window.h
+SOURCE=..\..\include\wx\xrc\xh_unkwn.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\wizard.h
+SOURCE=..\..\include\wx\xrc\xh_wizrd.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\wxhtml.h
+SOURCE=..\..\include\wx\xrc\xmlres.h
 # End Source File
 # Begin Source File