Added wxRichTextTableBlock class to help with table UI operations

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

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index f329910d8c64993f6bfbe64804211917e4e697a9..106bd726021ea12fa9e45894e6df569f798584ff 100644 (file)
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -3,7 +3,7 @@
 # ** DO NOT EDIT **\r
 \r
 # TARGTYPE "Win32 (x86) Static Library" 0x0104\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
 \r
 CFG=core - Win32 Debug\r
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
@@ -31,7 +31,7 @@ CFG=core - Win32 Debug
 CPP=cl.exe\r
 RSC=rc.exe\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Release"
+!IF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
@@ -43,18 +43,18 @@ RSC=rc.exe
 # 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" /Zi /Fd..\..\lib\vc_dll\wxmsw295u_core_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /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\wxmsw295u_core_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /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\wxmsw30u_core_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /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\wxmsw30u_core_vc_custom.pdb /opt:ref /opt:icf /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 "NDEBUG" /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 "NDEBUG" /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 "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw295u_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 RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw295u_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 RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw30u_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 RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw30u_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
 BSC32=bscmake.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 wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw295u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw295u_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\wxmsw295u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw295u_core_vc_custom.pdb"\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\wxbase30u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw30u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw30u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw30u_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\wxbase30u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw30u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw30u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw30u_core_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
@@ -68,18 +68,18 @@ LINK32=link.exe
 # 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 /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\wxmsw295ud_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 "_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\wxmsw295ud_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 "_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\wxmsw30ud_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 "_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\wxmsw30ud_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 "_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 "_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 "_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 "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw295ud_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 RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw295ud_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 RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw30ud_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 RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw30ud_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
 BSC32=bscmake.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 wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw295ud_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\wxmsw295ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.pdb"\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\wxbase30ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw30ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw30ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw30ud_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\wxbase30ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw30ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw30ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw30ud_core_vc_custom.pdb"\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
@@ -93,16 +93,16 @@ LINK32=link.exe
 # 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 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /opt:ref /opt:icf /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 "NDEBUG" /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 /opt:ref /opt:icf /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 "NDEBUG" /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\wxmsw30u_core.pdb /opt:ref /opt:icf /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 "NDEBUG" /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\wxmsw30u_core.pdb /opt:ref /opt:icf /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 "NDEBUG" /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 BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29u_core.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29u_core.lib"\r
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw30u_core.lib"\r
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw30u_core.lib"\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
 \r
@@ -116,16 +116,16 @@ LIB32=link.exe -lib
 # 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 /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 "_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 "_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\wxmsw30ud_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 "_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\wxmsw30ud_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 "_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 BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LIB32=link.exe -lib\r
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29ud_core.lib"\r
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29ud_core.lib"\r
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw30ud_core.lib"\r
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw30ud_core.lib"\r
 \r
 !ENDIF\r
 \r
@@ -478,6 +478,10 @@ SOURCE=..\..\src\common\menucmn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\common\modalhook.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\common\mousemanager.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -518,6 +522,10 @@ SOURCE=..\..\src\common\popupcmn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\common\preferencescmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\common\prntbase.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -667,635 +675,639 @@ SOURCE=..\..\src\common\xpmdecod.cpp
 # Begin Source File\r
 \r
 SOURCE=..\..\src\msw\accel.cpp\r
-# End Source File
-# Begin Source File
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\ole\access.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\ole\access.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\ole\activex.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\ole\activex.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\anybutton.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\anybutton.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\app.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\app.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\artmsw.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\artmsw.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\ole\automtn.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\ole\automtn.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\bitmap.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\bitmap.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\bmpbuttn.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\bmpbuttn.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\brush.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\brush.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\button.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\button.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\caret.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\caret.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\checkbox.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\checkbox.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\checklst.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\checklst.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\choice.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\choice.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\clipbrd.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\clipbrd.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\colordlg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\colordlg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\colour.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\colour.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\combo.cpp
+SOURCE=..\..\src\msw\combo.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\combobox.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\combobox.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\control.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\control.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\cursor.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\cursor.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\data.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\data.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\ole\dataobj.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\ole\dataobj.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\dc.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\dc.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\dcclient.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\dcclient.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\dcmemory.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\dcmemory.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\dcprint.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\dcprint.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\dcscreen.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\dcscreen.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\dialog.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\dialog.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\dialup.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\dialup.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\dib.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\dib.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\dirdlg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\dirdlg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\display.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\display.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\dragimag.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\dragimag.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\ole\dropsrc.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\ole\dropsrc.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\ole\droptgt.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\ole\droptgt.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\enhmeta.cpp
+SOURCE=..\..\src\msw\enhmeta.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\evtloop.cpp
+SOURCE=..\..\src\msw\evtloop.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\fdrepdlg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\fdrepdlg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\filedlg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\filedlg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\font.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\font.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\fontdlg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\fontdlg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\fontenum.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\fontenum.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\fontutil.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\fontutil.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\frame.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\frame.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\gauge.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\gauge.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\gdiimage.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\gdiimage.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\gdiobj.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\gdiobj.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\gdiplus.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\gdiplus.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\graphics.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\graphics.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\headerctrl.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\headerctrl.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\helpchm.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\helpchm.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\helpwin.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\helpwin.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\icon.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\icon.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\imaglist.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\imaglist.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\iniconf.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\iniconf.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\listbox.cpp
+SOURCE=..\..\src\msw\listbox.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\listctrl.cpp
+SOURCE=..\..\src\msw\listctrl.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\main.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\main.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\mdi.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\mdi.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\menu.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\menu.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\menuitem.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\menuitem.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\metafile.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\metafile.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\minifram.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\minifram.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\msgdlg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\msgdlg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\mslu.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\mslu.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\nativdlg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\nativdlg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\nativewin.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\nativewin.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\nonownedwnd.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\nonownedwnd.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\notebook.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\notebook.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\ole\oleutils.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\ole\oleutils.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\ownerdrw.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\ownerdrw.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\palette.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\palette.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\panel.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\panel.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\pen.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\pen.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\popupwin.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\popupwin.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\printdlg.cpp
+SOURCE=..\..\src\msw\printdlg.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\printwin.cpp
+SOURCE=..\..\src\msw\printwin.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\progdlg.cpp
+SOURCE=..\..\src\msw\progdlg.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\radiobox.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\radiobox.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\radiobut.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\radiobut.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\region.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\region.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\renderer.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\renderer.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\richmsgdlg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\richmsgdlg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\ole\safearray.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\ole\safearray.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\scrolbar.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\scrolbar.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\settings.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\settings.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\slider.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\slider.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\spinbutt.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\spinbutt.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\msw\spinctrl.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\spinctrl.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\statbmp.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\statbmp.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\statbox.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\statbox.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\statline.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\statline.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\stattext.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\stattext.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\statusbar.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\statusbar.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\textctrl.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\textctrl.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\textentry.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\textentry.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\textmeasure.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\textmeasure.cpp
+SOURCE=..\..\src\msw\tglbtn.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\tglbtn.cpp
+SOURCE=..\..\src\msw\toolbar.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\toolbar.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\tooltip.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\tooltip.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\toplevel.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\toplevel.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\treectrl.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\treectrl.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\uiaction.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\uiaction.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\utilsgui.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\utilsgui.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\utilswin.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\utilswin.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\ole\uuid.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\ole\uuid.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\uxtheme.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\msw\uxtheme.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\msw\version.rc\r
 \r
-SOURCE=..\..\src\msw\version.rc
+!IF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Release"
 \r
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"\r
 \r
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
-
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Release"\r
 \r
-# PROP Exclude_From_Build 1
+# PROP Exclude_From_Build 1\r
 \r
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"\r
 \r
-# PROP Exclude_From_Build 1
+# PROP Exclude_From_Build 1\r
 \r
 !ENDIF\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\volume.cpp
+SOURCE=..\..\src\msw\volume.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\msw\window.cpp
-# End Source File
-# End Group
-# Begin Group "Generic Sources"
+SOURCE=..\..\src\msw\window.cpp\r
+# End Source File\r
+# End Group\r
+# Begin Group "Generic Sources"\r
+\r
+# PROP Default_Filter ""\r
+# Begin Source File\r
 \r
-# PROP Default_Filter ""
-# Begin Source File
+SOURCE=..\..\src\generic\busyinfo.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\busyinfo.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\buttonbar.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\buttonbar.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\choicbkg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\choicbkg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\choicdgg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\choicdgg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\clrpickerg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\clrpickerg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\collpaneg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\collpaneg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\combog.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\combog.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\dcpsg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\dcpsg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\dirctrlg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\dirctrlg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\dragimgg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\dragimgg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\filectrlg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\filectrlg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\filepickerg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\filepickerg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\fontpickerg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\fontpickerg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\graphicc.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\graphicc.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\headerctrlg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\headerctrlg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\infobar.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\infobar.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\listbkg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\listbkg.cpp
+SOURCE=..\..\src\generic\logg.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\generic\logg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\markuptext.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\markuptext.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\msgdlgg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\msgdlgg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\numdlgg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\numdlgg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\preferencesg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\printps.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\printps.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\prntdlgg.cpp
+SOURCE=..\..\src\generic\prntdlgg.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\generic\progdlgg.cpp
+SOURCE=..\..\src\generic\progdlgg.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\generic\renderg.cpp
+SOURCE=..\..\src\generic\renderg.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\generic\richmsgdlgg.cpp
+SOURCE=..\..\src\generic\richmsgdlgg.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\generic\scrlwing.cpp
+SOURCE=..\..\src\generic\scrlwing.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\generic\selstore.cpp
+SOURCE=..\..\src\generic\selstore.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\generic\spinctlg.cpp
+SOURCE=..\..\src\generic\spinctlg.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\generic\splitter.cpp
+SOURCE=..\..\src\generic\splitter.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\generic\srchctlg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\srchctlg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\statbmpg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\statbmpg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\stattextg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\stattextg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\statusbr.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\statusbr.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\textdlgg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\textdlgg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\tipwin.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\tipwin.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\toolbkg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\toolbkg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\treebkg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\treebkg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\treectlg.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\treectlg.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\vlbox.cpp
-# End Source File
-# Begin Source File
+SOURCE=..\..\src\generic\vlbox.cpp\r
+# End Source File\r
+# Begin Source File\r
 \r
-SOURCE=..\..\src\generic\vscroll.cpp
+SOURCE=..\..\src\generic\vscroll.cpp\r
 # End Source File\r
 # End Group\r
 # Begin Group "Setup Headers"\r
@@ -1305,7 +1317,7 @@ SOURCE=..\..\src\generic\vscroll.cpp
 \r
 SOURCE=..\..\include\wx\msw\setup.h\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Release"
+!IF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h\r
 InputPath=..\..\include\wx\msw\setup.h\r
@@ -1352,7 +1364,7 @@ InputPath=..\..\include\wx\msw\setup.h
 \r
 SOURCE=..\..\include\wx\univ\setup.h\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Release"
+!IF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # Begin Custom Build - \r
 \r
@@ -1591,7 +1603,7 @@ SOURCE=..\..\include\wx\msw\gdiimage.h
 \r
 SOURCE=..\..\include\wx\msw\genrcdefs.h\r
 \r
-!IF  "$(CFG)" == "core - Win32 DLL Release"
+!IF  "$(CFG)" == "core - Win32 DLL Release"\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r
@@ -2792,6 +2804,10 @@ SOURCE=..\..\include\wx\minifram.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\modalhook.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\mousemanager.h\r
 # End Source File\r
 # Begin Source File\r
@@ -3288,6 +3304,10 @@ SOURCE=..\..\include\wx\windowid.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\windowptr.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\withimages.h\r
 # End Source File\r
 # Begin Source File\r