todos, cleanups, detabified

[wxWidgets.git] / src / wxWindows.dsp

diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index b85c015fc70d27151c4ca27848cb318235e4540b..f4f209cbd0a43d0660fbdd3b810fb164bddd8ee7 100644 (file)
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -49,7 +49,7 @@ CFG=wxWindows - Win32 Debug
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdllu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdllu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -60,8 +60,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250u.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250u.dll"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250u.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250u.dll"
 
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
 
@@ -78,7 +78,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdllud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdllud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -89,8 +89,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250ud.dll" /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250ud.dll"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250ud.dll" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250ud.dll"
 
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode"
 
@@ -106,7 +106,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
@@ -131,7 +131,7 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_DEBUG" /D "__WXDEBUG__" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
@@ -157,7 +157,7 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdll" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdll" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -168,8 +168,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250.dll"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250.dll"
 
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug DLL"
 
@@ -186,7 +186,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdlld" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdlld" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -197,8 +197,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250d.dll" /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250d.dll"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250d.dll" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250d.dll"
 
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"
 
@@ -214,7 +214,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
@@ -239,7 +239,7 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswd" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "_DEBUG" /D "__WXDEBUG__" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswd" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
@@ -263,8 +263,8 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "ReleaseDebug"
 # PROP Target_Dir ""
 CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
-# ADD CPP /nologo /MD /W4 /Zi /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD BASE CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W4 /Zi /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
@@ -288,6 +288,10 @@ LIB32=link.exe -lib
 # Name "wxWindows - Win32 Release"
 # Name "wxWindows - Win32 Debug"
 # Name "wxWindows - Win32 Release With Debug Info"
+# Begin Source File
+
+SOURCE="This project is deprecated, please see install.txt"
+# End Source File
 # Begin Group "Common Files"
 
 # PROP Default_Filter ""
@@ -313,6 +317,14 @@ SOURCE=.\common\artstd.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\bmpbase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\common\bookctrl.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\choiccmn.cpp
 # End Source File
 # Begin Source File
@@ -514,6 +526,10 @@ SOURCE=.\common\gaugecmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\gbsizer.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\gdicmn.cpp
 # End Source File
 # Begin Source File
@@ -734,6 +750,10 @@ SOURCE=.\common\statbar.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\stockitem.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\stopwatch.cpp
 # End Source File
 # Begin Source File
@@ -839,6 +859,18 @@ SOURCE=.\common\xpmdecod.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\xti.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\common\xtistrm.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\common\xtixml.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\zipstrm.cpp
 # End Source File
 # Begin Source File
@@ -859,11 +891,11 @@ SOURCE=.\generic\calctrl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\choicdgg.cpp
+SOURCE=.\generic\choicbkg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\dcbuffer.cpp
+SOURCE=.\generic\choicdgg.cpp
 # End Source File
 # Begin Source File
 
@@ -891,10 +923,22 @@ SOURCE=.\generic\gridsel.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\helpext.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\generic\htmllbox.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\laywin.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\listbkg.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\logg.cpp
 # End Source File
 # Begin Source File
@@ -907,6 +951,14 @@ SOURCE=.\generic\panelg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\printps.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\generic\prntdlgg.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\progdlgg.cpp
 # End Source File
 # Begin Source File
@@ -943,10 +995,6 @@ SOURCE=.\generic\statusbr.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\tbarsmpl.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\generic\textdlgg.cpp
 # End Source File
 # Begin Source File
@@ -963,6 +1011,14 @@ SOURCE=.\generic\treectlg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\vlbox.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\generic\vscroll.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\wizard.cpp
 # End Source File
 # End Group
@@ -1053,38 +1109,6 @@ SOURCE=.\html\winpars.cpp
 # Begin Group "MSW Files"
 
 # PROP Default_Filter ""
-# Begin Group "OLE Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\msw\ole\access.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\automtn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\dataobj.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\dropsrc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\droptgt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\oleutils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\uuid.cpp
-# End Source File
-# End Group
 # Begin Source File
 
 SOURCE=.\msw\accel.cpp
@@ -1272,13 +1296,11 @@ SOURCE=.\msw\glcanvas.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\gsocket.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\msw\gsocket.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\gsockmsw.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\msw\gsockmsw.cpp
 # End Source File
 # Begin Source File
 
@@ -1362,19 +1384,43 @@ SOURCE=.\msw\notebook.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\ownerdrw.cpp
+SOURCE=.\msw\ole\access.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\palette.cpp
+SOURCE=.\msw\ole\automtn.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\pen.cpp
+SOURCE=.\msw\ole\dataobj.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\dropsrc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\droptgt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\oleutils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\uuid.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\penwin.cpp
+SOURCE=.\msw\ownerdrw.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\palette.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\pen.cpp
 # End Source File
 # Begin Source File
 
@@ -1430,6 +1476,10 @@ SOURCE=.\msw\snglinst.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\sound.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\spinbutt.cpp
 # End Source File
 # Begin Source File
@@ -1498,6 +1548,10 @@ SOURCE=.\msw\treectrl.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\urlmsw.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\utils.cpp
 # End Source File
 # Begin Source File
@@ -1518,11 +1572,15 @@ SOURCE=.\msw\volume.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\wave.cpp
+SOURCE=.\msw\window.cpp
 # End Source File
+# End Group
+# Begin Group "Other Sources"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\msw\window.cpp
+SOURCE=.\xml\xml.cpp
 # End Source File
 # End Group
 # Begin Group "Headers"
@@ -1642,6 +1700,10 @@ SOURCE=..\include\wx\access.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\afterstd.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\app.h
 # End Source File
 # Begin Source File
@@ -1650,10 +1712,18 @@ SOURCE=..\include\wx\apptrait.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\arrstr.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\artprov.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\beforestd.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\bitmap.h
 # End Source File
 # Begin Source File
@@ -1662,6 +1732,10 @@ SOURCE=..\include\wx\bmpbuttn.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\bookctrl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\brush.h
 # End Source File
 # Begin Source File
@@ -1710,6 +1784,10 @@ SOURCE=..\include\wx\choice.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\choicebk.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\clipbrd.h
 # End Source File
 # Begin Source File
@@ -1778,10 +1856,6 @@ SOURCE=..\include\wx\datetime.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\datetime.inl
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\datstrm.h
 # End Source File
 # Begin Source File
@@ -1818,6 +1892,10 @@ SOURCE=..\include\wx\dcmemory.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\dcmirror.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\dcprint.h
 # End Source File
 # Begin Source File
@@ -1866,6 +1944,10 @@ SOURCE=..\include\wx\display.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\dlimpexp.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\dnd.h
 # End Source File
 # Begin Source File
@@ -1902,10 +1984,22 @@ SOURCE=..\include\wx\encconv.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\encinfo.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\event.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\evtloop.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\except.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\fdrepdlg.h
 # End Source File
 # Begin Source File
@@ -1990,6 +2084,10 @@ SOURCE=..\include\wx\gauge.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\gbsizer.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\gdicmn.h
 # End Source File
 # Begin Source File
@@ -2026,6 +2124,10 @@ SOURCE=..\include\wx\hashmap.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\hashset.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\help.h
 # End Source File
 # Begin Source File
@@ -2034,10 +2136,18 @@ SOURCE=..\include\wx\helpbase.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\helphtml.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\helpwin.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\htmllbox.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\icon.h
 # End Source File
 # Begin Source File
@@ -2046,6 +2156,10 @@ SOURCE=..\include\wx\iconbndl.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\iconloc.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\imagbmp.h
 # End Source File
 # Begin Source File
@@ -2090,6 +2204,10 @@ SOURCE=..\include\wx\imagxpm.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\init.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\intl.h
 # End Source File
 # Begin Source File
@@ -2138,6 +2256,10 @@ SOURCE=..\include\wx\listbase.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\listbook.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\listbox.h
 # End Source File
 # Begin Source File
@@ -2210,6 +2332,10 @@ SOURCE=..\include\wx\msgout.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msgout.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\mstream.h
 # End Source File
 # Begin Source File
@@ -2218,6 +2344,10 @@ SOURCE=..\include\wx\notebook.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\numdlg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\object.h
 # End Source File
 # Begin Source File
@@ -2270,6 +2400,30 @@ SOURCE=..\include\wx\progdlg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\protocol\file.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\protocol\ftp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\protocol\http.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\protocol\protocol.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\ptr_scpd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\ptr_scpd.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\quantize.h
 # End Source File
 # Begin Source File
@@ -2294,6 +2448,10 @@ SOURCE=..\include\wx\region.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\renderer.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\sashwin.h
 # End Source File
 # Begin Source File
@@ -2310,6 +2468,18 @@ SOURCE=..\include\wx\sckstrm.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\scopeguard.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\scopeguard.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\scrolbar.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\scrolbar.h
 # End Source File
 # Begin Source File
@@ -2342,6 +2512,10 @@ SOURCE=..\include\wx\socket.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\sound.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\spinbutt.h
 # End Source File
 # Begin Source File
@@ -2382,6 +2556,14 @@ SOURCE=..\include\wx\statusbr.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\stockitem.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\stopwatch.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\strconv.h
 # End Source File
 # Begin Source File
@@ -2414,10 +2596,6 @@ SOURCE=..\include\wx\tbarbase.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\tbarsmpl.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\textbuf.h
 # End Source File
 # Begin Source File
@@ -2518,10 +2696,26 @@ SOURCE=..\include\wx\version.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\vidmode.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\vlbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\vms_x_fix.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\volume.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\vscroll.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\wave.h
 # End Source File
 # Begin Source File
@@ -2542,31 +2736,39 @@ SOURCE=..\include\wx\wx.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\wx_cw.h
+SOURCE=..\include\wx\wxchar.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\wx_cw_cm.h
+SOURCE=..\include\wx\wxhtml.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\wx_cw_d.h
+SOURCE=..\include\wx\wxprec.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\wxchar.h
+SOURCE=..\include\wx\xml\xml.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\wxhtml.h
+SOURCE=..\include\wx\xpmdecod.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\wxprec.h
+SOURCE=..\include\wx\xpmhand.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\xpmdecod.h
+SOURCE=..\include\wx\xti.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xtistrm.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xtixml.h
 # End Source File
 # Begin Source File
 
@@ -2586,10 +2788,6 @@ SOURCE=..\include\wx\msw\accel.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\access.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\msw\app.h
 # End Source File
 # Begin Source File
@@ -2630,6 +2828,10 @@ SOURCE=..\include\wx\msw\checklst.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\chkconf.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\choice.h
 # End Source File
 # Begin Source File
@@ -2654,6 +2856,10 @@ SOURCE=..\include\wx\msw\control.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\crashrpt.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\cursor.h
 # End Source File
 # Begin Source File
@@ -2702,6 +2908,10 @@ SOURCE=..\include\wx\msw\enhmeta.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\evtloop.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\fdrepdlg.h
 # End Source File
 # Begin Source File
@@ -2742,15 +2952,15 @@ SOURCE=..\include\wx\msw\glcanvas.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\helpbest.h
+SOURCE=..\include\wx\msw\gnuwin32\winresrc.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\helpchm.h
+SOURCE=..\include\wx\msw\gsockmsw.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\helpwin.h
+SOURCE=..\include\wx\msw\helpbest.h
 # End Source File
 # Begin Source File
 
@@ -2822,6 +3032,42 @@ SOURCE=..\include\wx\msw\notebook.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\ole\access.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\ole\automtn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\ole\dataform.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\ole\dataobj.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\ole\dataobj2.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\ole\dropsrc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\ole\droptgt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\ole\oleutils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\ole\uuid.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\palette.h
 # End Source File
 # Begin Source File
@@ -2866,6 +3112,10 @@ SOURCE=..\include\wx\msw\scrolbar.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\setup0.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\slider95.h
 # End Source File
 # Begin Source File
@@ -2874,6 +3124,10 @@ SOURCE=..\include\wx\msw\slidrmsw.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\sound.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\spinbutt.h
 # End Source File
 # Begin Source File
@@ -2942,15 +3196,19 @@ SOURCE=..\include\wx\msw\treectrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\wave.h
+SOURCE=..\include\wx\msw\window.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\window.h
+SOURCE=..\include\wx\msw\winundef.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\winundef.h
+SOURCE=..\include\wx\msw\wrapcctl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\wrapwin.h
 # End Source File
 # End Group
 # Begin Group "Generic"
@@ -2966,10 +3224,6 @@ SOURCE=..\include\wx\generic\calctrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\generic\caret.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\generic\choicdgg.h
 # End Source File
 # Begin Source File
@@ -2986,18 +3240,10 @@ SOURCE=..\include\wx\generic\dirctrlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\generic\dirdlgg.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\generic\dragimgg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\generic\fdrepdlg.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\generic\filedlgg.h
 # End Source File
 # Begin Source File
@@ -3014,7 +3260,7 @@ SOURCE=..\include\wx\generic\gridctrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\generic\gridg.h
+SOURCE=..\include\wx\generic\gridsel.h
 # End Source File
 # Begin Source File
 
@@ -3030,11 +3276,7 @@ SOURCE=..\include\wx\generic\laywin.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\generic\listctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\mdig.h
+SOURCE=..\include\wx\generic\logg.h
 # End Source File
 # Begin Source File
 
@@ -3046,7 +3288,7 @@ SOURCE=..\include\wx\generic\notebook.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\generic\paletteg.h
+SOURCE=..\include\wx\generic\numdlgg.h
 # End Source File
 # Begin Source File
 
@@ -3086,18 +3328,6 @@ SOURCE=..\include\wx\generic\splitter.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\generic\statline.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\statusbr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\generic\tabg.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\generic\textdlgg.h
 # End Source File
 # Begin Source File
@@ -3150,6 +3380,10 @@ SOURCE=..\include\wx\html\htmlpars.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\html\htmlproc.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\html\htmltag.h
 # End Source File
 # Begin Source File