Added build/msw/wx_propgrid.dsp to vc manifest (I hope this fixes #10564)

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

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index a6a52de429c39d95aef842c914d89ddc206492c2..524e745dfcd5e788f97602895e05e5aaeef74d51 100644 (file)
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -38,17 +38,17 @@ RSC=rc.exe
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 # PROP BASE Use_MFC 0\r

-# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Use_Debug_Libraries 1\r

 # PROP BASE Output_Dir "..\..\lib\vc_dll"\r
 # PROP BASE Intermediate_Dir "vc_mswunivudll\core"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP BASE Output_Dir "..\..\lib\vc_dll"\r
 # PROP BASE Intermediate_Dir "vc_mswunivudll\core"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r

-# PROP Use_Debug_Libraries 0\r
+# PROP Use_Debug_Libraries 1\r

 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\core"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\core"\r
 # PROP Target_Dir ""\r

-# 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\libtiff" /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 "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# 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\libtiff" /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 "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# 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" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /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 "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# 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" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /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 "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r

 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290u_core_vc_custom /i "..\..\src\tiff\libtiff" /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\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290u_core_vc_custom /i "..\..\src\tiff\libtiff" /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\r


@@ -57,8 +57,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r

-# 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 ..\..\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"\r
-# 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 ..\..\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"\r
+# 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 wininet.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" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"\r
+# 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 wininet.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" /debug /pdb:"..\..\lib\vc_dll\wxmswuniv290u_core_vc_custom.pdb"\r

 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
 \r


@@ -72,8 +72,8 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivuddll\core"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivuddll\core"\r
 # PROP Target_Dir ""\r

-# 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\libtiff" /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 "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# 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\libtiff" /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 "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /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 "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswunivud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /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 "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r

 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290ud_core_vc_custom /i "..\..\src\tiff\libtiff" /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\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswunivud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmswuniv290ud_core_vc_custom /i "..\..\src\tiff\libtiff" /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\r


@@ -82,23 +82,23 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r

-# 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 ..\..\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\r
-# 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 ..\..\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\r
+# 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 wininet.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 /pdb:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"\r
+# 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 wininet.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 /pdb:"..\..\lib\vc_dll\wxmswuniv290ud_core_vc_custom.pdb"\r

 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP BASE Use_MFC 0\r

-# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Use_Debug_Libraries 1\r

 # PROP BASE Output_Dir "..\..\lib\vc_dll"\r
 # PROP BASE Intermediate_Dir "vc_mswudll\core"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP BASE Output_Dir "..\..\lib\vc_dll"\r
 # PROP BASE Intermediate_Dir "vc_mswudll\core"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r

-# PROP Use_Debug_Libraries 0\r
+# PROP Use_Debug_Libraries 1\r

 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\core"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\core"\r
 # PROP Target_Dir ""\r

-# 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\libtiff" /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 "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# 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\libtiff" /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 "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# 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" /Zi /Fd..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /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 "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# 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" /Zi /Fd..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /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 "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r

 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290u_core_vc_custom /i "..\..\src\tiff\libtiff" /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\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290u_core_vc_custom /i "..\..\src\tiff\libtiff" /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\r


@@ -107,8 +107,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r

-# 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 ..\..\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"\r
-# 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 ..\..\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"\r
+# 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 wininet.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" /debug /pdb:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"\r
+# 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 wininet.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" /debug /pdb:"..\..\lib\vc_dll\wxmsw290u_core_vc_custom.pdb"\r

 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r


@@ -122,8 +122,8 @@ LINK32=link.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\core"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\core"\r
 # PROP Target_Dir ""\r

-# 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\libtiff" /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 "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
-# 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\libtiff" /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 "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /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 "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /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 "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c\r

 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290ud_core_vc_custom /i "..\..\src\tiff\libtiff" /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\r
 # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw290ud_core_vc_custom /i "..\..\src\tiff\libtiff" /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\r


@@ -132,23 +132,23 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r

-# 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 ..\..\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\r
-# 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 ..\..\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\r
+# 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 wininet.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 /pdb:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"\r
+# 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 wininet.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 /pdb:"..\..\lib\vc_dll\wxmsw290ud_core_vc_custom.pdb"\r

 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
 \r
 # PROP BASE Use_MFC 0\r

-# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Use_Debug_Libraries 1\r

 # PROP BASE Output_Dir "..\..\lib\vc_lib"\r
 # PROP BASE Intermediate_Dir "vc_mswunivu\core"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP BASE Output_Dir "..\..\lib\vc_lib"\r
 # PROP BASE Intermediate_Dir "vc_mswunivu\core"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r

-# PROP Use_Debug_Libraries 0\r
+# PROP Use_Debug_Libraries 1\r

 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswunivu\core"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswunivu\core"\r
 # PROP Target_Dir ""\r

-# 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\libtiff" /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 "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# 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\libtiff" /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 "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /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 "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswunivu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /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 "WXBUILDING" /D wxUSE_BASE=0 /c\r

 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r


@@ -170,8 +170,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswunivud\core"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswunivud\core"\r
 # PROP Target_Dir ""\r

-# 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\libtiff" /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 "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# 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\libtiff" /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 "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /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 "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswunivud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmswuniv29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /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 "WXBUILDING" /D wxUSE_BASE=0 /c\r

 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r


@@ -184,17 +184,17 @@ LIB32=link.exe -lib
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
 # PROP BASE Use_MFC 0\r

-# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Use_Debug_Libraries 1\r

 # PROP BASE Output_Dir "..\..\lib\vc_lib"\r
 # PROP BASE Intermediate_Dir "vc_mswu\core"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r
 # PROP BASE Output_Dir "..\..\lib\vc_lib"\r
 # PROP BASE Intermediate_Dir "vc_mswu\core"\r
 # PROP BASE Target_Dir ""\r
 # PROP Use_MFC 0\r

-# PROP Use_Debug_Libraries 0\r
+# PROP Use_Debug_Libraries 1\r

 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswu\core"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswu\core"\r
 # PROP Target_Dir ""\r

-# 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\libtiff" /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 "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# 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\libtiff" /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 "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /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 "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /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 "WXBUILDING" /D wxUSE_BASE=0 /c\r

 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r


@@ -216,8 +216,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswud\core"\r
 # PROP Target_Dir ""\r
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswud\core"\r
 # PROP Target_Dir ""\r

-# 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\libtiff" /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 "WXBUILDING" /D wxUSE_BASE=0 /c\r
-# 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\libtiff" /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 "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /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 "WXBUILDING" /D wxUSE_BASE=0 /c\r
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /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 "WXBUILDING" /D wxUSE_BASE=0 /c\r

 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r


@@ -458,6 +458,14 @@ SOURCE=..\..\src\common\graphcmn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\headercolcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\common\headerctrlcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\helpbase.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\helpbase.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -554,6 +562,10 @@ SOURCE=..\..\src\common\paper.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\persist.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\pickerbase.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\pickerbase.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -574,6 +586,10 @@ SOURCE=..\..\src\common\radiocmn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\rearrangectrl.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\rendcmn.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\rendcmn.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -590,6 +606,10 @@ SOURCE=..\..\src\common\sizer.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\spinctrlcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\srchcmn.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\common\srchcmn.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -650,6 +670,10 @@ SOURCE=..\..\src\common\windowid.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\common\wrapsizer.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\common\xpmdecod.cpp\r
 # End Source File\r
 # End Group\r
 SOURCE=..\..\src\common\xpmdecod.cpp\r
 # End Source File\r
 # End Group\r


@@ -723,6 +747,41 @@ SOURCE=..\..\src\msw\ole\access.cpp
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
 \r
 \r

+!ENDIF\r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\msw\ole\activex.cpp\r
+\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
+\r
+\r

 !ENDIF\r
 \r
 # End Source File\r
 !ENDIF\r
 \r
 # End Source File\r


@@ -732,6 +791,41 @@ SOURCE=..\..\src\msw\app.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\msw\artmsw.cpp\r
+\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
+\r
+\r
+!ENDIF\r
+\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\msw\ole\automtn.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\msw\ole\automtn.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -1388,7 +1482,7 @@ SOURCE=..\..\src\msw\frame.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\msw\gauge95.cpp\r
+SOURCE=..\..\src\msw\gauge.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -1439,6 +1533,41 @@ SOURCE=..\..\src\msw\graphics.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\msw\headerctrl.cpp\r
+\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
+\r
+\r
+!ENDIF\r
+\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\msw\helpchm.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\msw\helpchm.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -1777,6 +1906,41 @@ SOURCE=..\..\src\msw\nativdlg.cpp
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
 \r
 \r

+!ENDIF\r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\msw\nativewin.cpp\r
+\r
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
+\r
+# PROP Exclude_From_Build 1\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
+\r
+\r

 !ENDIF\r
 \r
 # End Source File\r
 !ENDIF\r
 \r
 # End Source File\r


@@ -1993,7 +2157,7 @@ SOURCE=..\..\src\msw\settings.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\msw\slider95.cpp\r
+SOURCE=..\..\src\msw\slider.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -2163,41 +2327,6 @@ SOURCE=..\..\src\msw\statbox.cpp
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
 \r
 \r

-!ENDIF\r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\msw\statbr95.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
-\r
-\r

 !ENDIF\r
 \r
 # End Source File\r
 !ENDIF\r
 \r
 # End Source File\r


@@ -2273,7 +2402,7 @@ SOURCE=..\..\src\msw\stattext.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\msw\tabctrl.cpp\r
+SOURCE=..\..\src\msw\statusbar.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -2308,7 +2437,7 @@ SOURCE=..\..\src\msw\tabctrl.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\msw\tbar95.cpp\r
+SOURCE=..\..\src\msw\textctrl.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -2343,7 +2472,7 @@ SOURCE=..\..\src\msw\tbar95.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\msw\textctrl.cpp\r
+SOURCE=..\..\src\msw\textentry.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -2378,7 +2507,7 @@ SOURCE=..\..\src\msw\textctrl.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\msw\textentry.cpp\r
+SOURCE=..\..\src\msw\tglbtn.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -2413,7 +2542,7 @@ SOURCE=..\..\src\msw\textentry.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\msw\tglbtn.cpp\r
+SOURCE=..\..\src\msw\toolbar.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -2812,6 +2941,10 @@ SOURCE=..\..\src\generic\fontpickerg.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\generic\headerctrlg.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\generic\listbkg.cpp\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\src\generic\listbkg.cpp\r
 # End Source File\r
 # Begin Source File\r


@@ -2969,6 +3102,14 @@ SOURCE=..\..\src\generic\srchctlg.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\src\generic\statbmpg.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\generic\stattextg.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\src\generic\statusbr.cpp\r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 SOURCE=..\..\src\generic\statusbr.cpp\r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r


@@ -2999,41 +3140,6 @@ SOURCE=..\..\src\generic\statusbr.cpp
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
 \r
 \r

-!ENDIF\r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\src\generic\tabg.cpp\r
-\r
-!IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"\r
-\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Release"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r

 !ENDIF\r
 \r
 # End Source File\r
 !ENDIF\r
 \r
 # End Source File\r


@@ -3246,7 +3352,7 @@ SOURCE=..\..\src\univ\choice.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\univ\colschem.cpp\r
+SOURCE=..\..\src\univ\combobox.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -3281,7 +3387,7 @@ SOURCE=..\..\src\univ\colschem.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\univ\combobox.cpp\r
+SOURCE=..\..\src\univ\control.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -3316,7 +3422,7 @@ SOURCE=..\..\src\univ\combobox.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\univ\control.cpp\r
+SOURCE=..\..\src\univ\ctrlrend.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -3351,7 +3457,7 @@ SOURCE=..\..\src\univ\control.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\univ\ctrlrend.cpp\r
+SOURCE=..\..\src\univ\dialog.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -3386,7 +3492,7 @@ SOURCE=..\..\src\univ\ctrlrend.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\univ\dialog.cpp\r
+SOURCE=..\..\src\univ\framuniv.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -3421,7 +3527,7 @@ SOURCE=..\..\src\univ\dialog.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\univ\framuniv.cpp\r
+SOURCE=..\..\src\univ\gauge.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -3456,7 +3562,7 @@ SOURCE=..\..\src\univ\framuniv.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\univ\gauge.cpp\r
+SOURCE=..\..\src\univ\themes\gtk.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -3491,7 +3597,7 @@ SOURCE=..\..\src\univ\gauge.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\univ\themes\gtk.cpp\r
+SOURCE=..\..\src\univ\inpcons.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -3526,7 +3632,7 @@ SOURCE=..\..\src\univ\themes\gtk.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\univ\inpcons.cpp\r
+SOURCE=..\..\src\univ\inphand.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -3561,7 +3667,7 @@ SOURCE=..\..\src\univ\inpcons.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\univ\inphand.cpp\r
+SOURCE=..\..\src\univ\listbox.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -3596,7 +3702,7 @@ SOURCE=..\..\src\univ\inphand.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\univ\listbox.cpp\r
+SOURCE=..\..\src\univ\menu.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -3631,7 +3737,7 @@ SOURCE=..\..\src\univ\listbox.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\univ\menu.cpp\r
+SOURCE=..\..\src\univ\themes\metal.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -3666,7 +3772,7 @@ SOURCE=..\..\src\univ\menu.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\univ\themes\metal.cpp\r
+SOURCE=..\..\src\univ\themes\mono.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -3701,7 +3807,7 @@ SOURCE=..\..\src\univ\themes\metal.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\univ\themes\mono.cpp\r
+SOURCE=..\..\src\univ\notebook.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -3736,7 +3842,7 @@ SOURCE=..\..\src\univ\themes\mono.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\univ\notebook.cpp\r
+SOURCE=..\..\src\univ\radiobox.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -3771,7 +3877,7 @@ SOURCE=..\..\src\univ\notebook.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\univ\radiobox.cpp\r
+SOURCE=..\..\src\univ\radiobut.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -3806,7 +3912,7 @@ SOURCE=..\..\src\univ\radiobox.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\univ\radiobut.cpp\r
+SOURCE=..\..\src\univ\scrarrow.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -3841,7 +3947,7 @@ SOURCE=..\..\src\univ\radiobut.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\univ\scrarrow.cpp\r
+SOURCE=..\..\src\univ\scrolbar.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -3876,7 +3982,7 @@ SOURCE=..\..\src\univ\scrarrow.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\univ\scrolbar.cpp\r
+SOURCE=..\..\src\univ\scrthumb.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -3911,7 +4017,7 @@ SOURCE=..\..\src\univ\scrolbar.cpp
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\src\univ\scrthumb.cpp\r
+SOURCE=..\..\src\univ\settingsuniv.cpp\r

 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r
 \r
 !IF  "$(CFG)" == "core - Win32 DLL Universal Release"\r
 \r


@@ -4649,6 +4755,10 @@ SOURCE=..\..\include\wx\msw\bmpbuttn.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\msw\bmpcbox.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\msw\brush.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\msw\brush.h\r
 # End Source File\r
 # Begin Source File\r


@@ -4657,6 +4767,10 @@ SOURCE=..\..\include\wx\msw\button.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\msw\calctrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\msw\caret.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\msw\caret.h\r
 # End Source File\r
 # Begin Source File\r


@@ -4793,7 +4907,7 @@ SOURCE=..\..\include\wx\msw\frame.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\include\wx\msw\gauge95.h\r
+SOURCE=..\..\include\wx\msw\gauge.h\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r


@@ -4892,6 +5006,10 @@ SOURCE=..\..\include\wx\msw\glcanvas.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\msw\headerctrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\msw\helpbest.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\msw\helpbest.h\r
 # End Source File\r
 # Begin Source File\r


@@ -5020,7 +5138,7 @@ SOURCE=..\..\include\wx\msw\setup0.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\include\wx\msw\slider95.h\r
+SOURCE=..\..\include\wx\msw\slider.h\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r


@@ -5044,10 +5162,6 @@ SOURCE=..\..\include\wx\msw\statbox.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\include\wx\msw\statbr95.h\r
-# End Source File\r
-# Begin Source File\r
-\r

 SOURCE=..\..\include\wx\msw\statline.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\msw\statline.h\r
 # End Source File\r
 # Begin Source File\r


@@ -5056,7 +5170,7 @@ SOURCE=..\..\include\wx\msw\stattext.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\include\wx\msw\tabctrl.h\r
+SOURCE=..\..\include\wx\msw\statusbar.h\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r


@@ -5064,10 +5178,6 @@ SOURCE=..\..\include\wx\msw\taskbar.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\include\wx\msw\tbar95.h\r
-# End Source File\r
-# Begin Source File\r
-\r

 SOURCE=..\..\include\wx\msw\textctrl.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\msw\textctrl.h\r
 # End Source File\r
 # Begin Source File\r


@@ -5080,6 +5190,10 @@ SOURCE=..\..\include\wx\msw\tglbtn.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\msw\toolbar.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\msw\tooltip.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\msw\tooltip.h\r
 # End Source File\r
 # Begin Source File\r


@@ -5136,7 +5250,7 @@ SOURCE=..\..\include\wx\generic\buttonbar.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\include\wx\generic\calctrl.h\r
+SOURCE=..\..\include\wx\generic\calctrlg.h\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r


@@ -5220,10 +5334,18 @@ SOURCE=..\..\include\wx\generic\gridctrl.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\generic\grideditors.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\generic\gridsel.h\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\..\include\wx\generic\gridsel.h\r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\generic\headerctrlg.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\generic\helpext.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\generic\helpext.h\r
 # End Source File\r
 # Begin Source File\r


@@ -5308,11 +5430,15 @@ SOURCE=..\..\include\wx\generic\srchctlg.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\include\wx\generic\statusbr.h\r
+SOURCE=..\..\include\wx\generic\statbmpg.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\generic\stattextg.h\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\include\wx\generic\tabg.h\r
+SOURCE=..\..\include\wx\generic\statusbr.h\r

 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r


@@ -5572,6 +5698,10 @@ SOURCE=..\..\include\wx\access.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\propgrid\advprops.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\anidecod.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\anidecod.h\r
 # End Source File\r
 # Begin Source File\r


@@ -5592,6 +5722,10 @@ SOURCE=..\..\include\wx\aui\aui.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\aui\auibar.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\aui\auibook.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\aui\auibook.h\r
 # End Source File\r
 # Begin Source File\r


@@ -5608,6 +5742,10 @@ SOURCE=..\..\include\wx\bmpcbox.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\persist\bookctrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\bookctrl.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\bookctrl.h\r
 # End Source File\r
 # Begin Source File\r


@@ -5816,6 +5954,10 @@ SOURCE=..\..\include\wx\editlbox.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\propgrid\editors.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\effects.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\effects.h\r
 # End Source File\r
 # Begin Source File\r


@@ -5916,6 +6058,14 @@ SOURCE=..\..\include\wx\grid.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\headercol.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\headerctrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\help.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\help.h\r
 # End Source File\r
 # Begin Source File\r


@@ -6024,6 +6174,10 @@ SOURCE=..\..\include\wx\listctrl.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\propgrid\manager.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\matrix.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\matrix.h\r
 # End Source File\r
 # Begin Source File\r


@@ -6056,6 +6210,10 @@ SOURCE=..\..\include\wx\msgdlg.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\nativewin.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\nonownedwnd.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\nonownedwnd.h\r
 # End Source File\r
 # Begin Source File\r


@@ -6100,6 +6258,10 @@ SOURCE=..\..\include\wx\pen.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\persist.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\pickerbase.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\pickerbase.h\r
 # End Source File\r
 # Begin Source File\r


@@ -6132,6 +6294,30 @@ SOURCE=..\..\include\wx\propdlg.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\propgrid\property.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\propgrid\propgrid.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\propgrid\propgriddefs.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\propgrid\propgridiface.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\propgrid\propgridpagestate.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\propgrid\props.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\quantize.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\quantize.h\r
 # End Source File\r
 # Begin Source File\r


@@ -6148,6 +6334,10 @@ SOURCE=..\..\include\wx\rawbmp.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\rearrangectrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\region.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\region.h\r
 # End Source File\r
 # Begin Source File\r


@@ -6272,14 +6462,6 @@ SOURCE=..\..\include\wx\stc\stc.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

-SOURCE=..\..\include\wx\tab.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\include\wx\tabctrl.h\r
-# End Source File\r
-# Begin Source File\r
-\r

 SOURCE=..\..\include\wx\aui\tabmdi.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\aui\tabmdi.h\r
 # End Source File\r
 # Begin Source File\r


@@ -6332,6 +6514,10 @@ SOURCE=..\..\include\wx\toplevel.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\persist\toplevel.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\treebase.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\treebase.h\r
 # End Source File\r
 # Begin Source File\r


@@ -6340,6 +6526,10 @@ SOURCE=..\..\include\wx\treebook.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\persist\treebook.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\treectrl.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\treectrl.h\r
 # End Source File\r
 # Begin Source File\r


@@ -6376,6 +6566,10 @@ SOURCE=..\..\include\wx\window.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\persist\window.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\windowid.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\windowid.h\r
 # End Source File\r
 # Begin Source File\r


@@ -6384,6 +6578,10 @@ SOURCE=..\..\include\wx\wizard.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\wrapsizer.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\wupdlock.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\wupdlock.h\r
 # End Source File\r
 # Begin Source File\r


@@ -6448,6 +6646,10 @@ SOURCE=..\..\include\wx\xrc\xh_combo.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\xrc\xh_comboctrl.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\xrc\xh_datectrl.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\xrc\xh_datectrl.h\r
 # End Source File\r
 # Begin Source File\r