Use %rename("%(wxpy)s")

[wxWidgets.git] / src / wxWindows.dsp

diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index e154731b56abe99fe303608ab9cb183cfe1cef23..16fb7ccf3a1bf8b91b55e5febd1d085be05b6a23 100644 (file)
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -27,7 +27,6 @@ CFG=wxWindows - Win32 Debug
 !MESSAGE "wxWindows - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "wxWindows - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE "wxWindows - Win32 Release With Debug Info" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxWindows - Win32 Release Unicode With Debug Info" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -50,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 /GX /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
+# 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
@@ -79,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 /GX /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
+# 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
@@ -107,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 /GX /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
+# 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
@@ -132,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 /GX /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
+# 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
@@ -158,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 /GX /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
+# 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
@@ -187,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 /GX /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
+# 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
@@ -215,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 /GX /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 /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
@@ -240,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 /GX /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
+# 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
@@ -265,7 +264,7 @@ LIB32=link.exe -lib
 # 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" /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 /GX /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
+# 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
@@ -276,31 +275,6 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\lib\wxmsw.lib"
 # ADD LIB32 /nologo /out:"..\lib\wxmsw.lib"
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode With Debug Info"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "wxWindows___Win32_Release_Unicode_With_Debug_Info"
-# PROP BASE Intermediate_Dir "wxWindows___Win32_Release_Unicode_With_Debug_Info"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "wxWindows___Win32_Release_Unicode_With_Debug_Info"
-# PROP Intermediate_Dir "wxWindows___Win32_Release_Unicode_With_Debug_Info"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W4 /GX /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
-# ADD CPP /nologo /MD /W4 /GX /Zi /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
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\lib\wxmswu.lib"
-# ADD LIB32 /nologo /out:"..\lib\wxmswu.lib"
-
 !ENDIF 
 
 # Begin Target
@@ -314,7 +288,10 @@ LIB32=link.exe -lib
 # Name "wxWindows - Win32 Release"
 # Name "wxWindows - Win32 Debug"
 # Name "wxWindows - Win32 Release With Debug Info"
-# Name "wxWindows - Win32 Release Unicode 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 ""
@@ -332,6 +309,10 @@ SOURCE=.\common\appcmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\archive.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\artprov.cpp
 # End Source File
 # Begin Source File
@@ -372,6 +353,14 @@ SOURCE=.\common\cmndata.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\colourcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\common\combocmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\config.cpp
 # End Source File
 # Begin Source File
@@ -380,6 +369,10 @@ SOURCE=.\common\containr.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\convauto.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\cshelp.cpp
 # End Source File
 # Begin Source File
@@ -396,6 +389,10 @@ SOURCE=.\common\datacmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\datavcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\datetime.cpp
 # End Source File
 # Begin Source File
@@ -420,6 +417,10 @@ SOURCE=.\common\dcbase.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\debugrpt.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\dircmn.cpp
 # End Source File
 # Begin Source File
@@ -476,6 +477,10 @@ SOURCE=.\common\event.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\evtloopcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\extended.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
@@ -565,10 +570,6 @@ SOURCE=.\common\gifdecod.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\gzstream.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\common\hash.cpp
 # End Source File
 # Begin Source File
@@ -673,6 +674,10 @@ SOURCE=.\common\matrix.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\mediactrlcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\memory.cpp
 # End Source File
 # Begin Source File
@@ -773,10 +778,22 @@ SOURCE=.\common\socket.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\sstream.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\statbar.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\stdpbase.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
@@ -837,8 +854,7 @@ SOURCE=.\common\txtstrm.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\unzip.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\common\uri.cpp
 # End Source File
 # Begin Source File
 
@@ -910,15 +926,35 @@ SOURCE=.\generic\busyinfo.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\buttonbar.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\calctrl.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\choicbkg.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\choicdgg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\dcbuffer.cpp
+SOURCE=.\generic\combog.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\generic\datavgen.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\generic\datectlg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\generic\dbgrptg.cpp
 # End Source File
 # Begin Source File
 
@@ -970,6 +1006,10 @@ SOURCE=.\generic\numdlgg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\odcombo.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\panelg.cpp
 # End Source File
 # Begin Source File
@@ -986,6 +1026,10 @@ SOURCE=.\generic\progdlgg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\propdlg.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\renderg.cpp
 # End Source File
 # Begin Source File
@@ -1030,6 +1074,14 @@ SOURCE=.\generic\tipwin.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\toolbkg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\generic\treebkg.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\treectlg.cpp
 # End Source File
 # Begin Source File
@@ -1058,10 +1110,18 @@ SOURCE=.\html\helpdata.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\html\helpdlg.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\html\helpfrm.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\html\helpwnd.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\html\htmlcell.cpp
 # End Source File
 # Begin Source File
@@ -1138,18 +1198,10 @@ SOURCE=.\msw\accel.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\ole\access.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\msw\app.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\ole\automtn.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\msw\basemsw.cpp
 # End Source File
 # Begin Source File
@@ -1198,6 +1250,10 @@ SOURCE=.\msw\colour.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\combo.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\combobox.cpp
 # End Source File
 # Begin Source File
@@ -1218,7 +1274,7 @@ SOURCE=.\msw\data.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\ole\dataobj.cpp
+SOURCE=.\msw\datectrl.cpp
 # End Source File
 # Begin Source File
 
@@ -1246,6 +1302,10 @@ SOURCE=.\msw\dde.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\debughlp.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\dialog.cpp
 # End Source File
 # Begin Source File
@@ -1270,15 +1330,11 @@ SOURCE=.\msw\display.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\dragimag.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\dropsrc.cpp
+SOURCE=.\msw\dlmsw.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\ole\droptgt.cpp
+SOURCE=.\msw\dragimag.cpp
 # End Source File
 # Begin Source File
 
@@ -1339,13 +1395,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
 
@@ -1393,6 +1447,14 @@ SOURCE=.\msw\mdi.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\mediactrl_am.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\mediactrl_wmp10.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\menu.cpp
 # End Source File
 # Begin Source File
@@ -1429,10 +1491,38 @@ SOURCE=.\msw\notebook.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\ole\access.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\activex.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
+# Begin Source File
+
 SOURCE=.\msw\ownerdrw.cpp
 # End Source File
 # Begin Source File
@@ -1497,6 +1587,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
@@ -1505,6 +1599,10 @@ SOURCE=.\msw\spinctrl.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\stackwalk.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\statbmp.cpp
 # End Source File
 # Begin Source File
@@ -1525,6 +1623,10 @@ SOURCE=.\msw\stattext.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\stdpaths.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\tabctrl.cpp
 # End Source File
 # Begin Source File
@@ -1565,19 +1667,19 @@ SOURCE=.\msw\treectrl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\utils.cpp
+SOURCE=.\msw\urlmsw.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\utilsexc.cpp
+SOURCE=.\msw\utils.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\utilsgui.cpp
+SOURCE=.\msw\utilsexc.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\ole\uuid.cpp
+SOURCE=.\msw\utilsgui.cpp
 # End Source File
 # Begin Source File
 
@@ -1589,10 +1691,6 @@ SOURCE=.\msw\volume.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\wave.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\msw\window.cpp
 # End Source File
 # End Group
@@ -1601,73 +1699,273 @@ SOURCE=.\msw\window.cpp
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\xml\xml.cpp
+SOURCE=.\richtext\richtextbuffer.cpp
 # End Source File
-# End Group
-# Begin Group "Headers"
-
-# PROP Default_Filter ""
-# Begin Group "Setup"
+# Begin Source File
 
-# PROP Default_Filter ""
+SOURCE=.\richtext\richtextctrl.cpp
+# End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\setup.h
+SOURCE=.\richtext\richtexthtml.cpp
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
+SOURCE=.\richtext\richtextstyles.cpp
+# End Source File
+# Begin Source File
 
-# Begin Custom Build - Creating ..\lib\mswdllu\wx\setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup.h
+SOURCE=.\richtext\richtextxml.cpp
+# End Source File
+# Begin Source File
 
-"../lib/mswdllu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\lib\mswdllu\wx\setup.h
+SOURCE=.\xml\xml.cpp
+# End Source File
+# Begin Source File
 
-# End Custom Build
+SOURCE=.\xrc\xh_bmp.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
+SOURCE=.\xrc\xh_bmpbt.cpp
+# End Source File
+# Begin Source File
 
-# Begin Custom Build - Creating ..\lib\mswdllud\wx\setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup.h
+SOURCE=.\xrc\xh_bttn.cpp
+# End Source File
+# Begin Source File
 
-"../lib/mswdllud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\lib\mswdllud\wx\setup.h
+SOURCE=.\xrc\xh_cald.cpp
+# End Source File
+# Begin Source File
 
-# End Custom Build
+SOURCE=.\xrc\xh_chckb.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode"
+SOURCE=.\xrc\xh_chckl.cpp
+# End Source File
+# Begin Source File
 
-# Begin Custom Build - Creating ..\lib\mswu\wx\setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup.h
+SOURCE=.\xrc\xh_choic.cpp
+# End Source File
+# Begin Source File
 
-"../lib/mswu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\lib\mswu\wx\setup.h
+SOURCE=.\xrc\xh_choicbk.cpp
+# End Source File
+# Begin Source File
 
-# End Custom Build
+SOURCE=.\xrc\xh_combo.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode"
+SOURCE=.\xrc\xh_datectrl.cpp
+# End Source File
+# Begin Source File
 
-# Begin Custom Build - Creating ..\lib\mswud\wx\setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup.h
+SOURCE=.\xrc\xh_dlg.cpp
+# End Source File
+# Begin Source File
 
-"../lib/mswud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\lib\mswud\wx\setup.h
+SOURCE=.\xrc\xh_frame.cpp
+# End Source File
+# Begin Source File
 
-# End Custom Build
+SOURCE=.\xrc\xh_gauge.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release DLL"
+SOURCE=.\xrc\xh_gdctl.cpp
+# End Source File
+# Begin Source File
 
-# Begin Custom Build - Creating ..\lib\mswdll\wx\setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup.h
+SOURCE=.\xrc\xh_grid.cpp
+# End Source File
+# Begin Source File
 
-"../lib/mswdll/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\lib\mswdll\wx\setup.h
+SOURCE=.\xrc\xh_html.cpp
+# End Source File
+# Begin Source File
 
-# End Custom Build
+SOURCE=.\xrc\xh_listb.cpp
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug DLL"
+SOURCE=.\xrc\xh_listbk.cpp
+# End Source File
+# Begin Source File
 
-# Begin Custom Build - Creating ..\lib\mswdlld\wx\setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup.h
+SOURCE=.\xrc\xh_listc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_mdi.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_menu.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_notbk.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_panel.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_radbt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_radbx.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_scrol.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_scwin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_sizer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_slidr.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_spin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_split.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_statbar.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_stbmp.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_stbox.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_stlin.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_sttxt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_text.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_tglbtn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_toolb.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_tree.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_treebk.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_unkwn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_wizrd.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xmlres.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xmlrsall.cpp
+# End Source File
+# End Group
+# Begin Group "Headers"
+
+# PROP Default_Filter ""
+# Begin Group "Setup"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\include\wx\msw\setup.h
+
+!IF  "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
+
+# Begin Custom Build - Creating ..\lib\mswdllu\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswdllu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\lib\mswdllu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
+
+# Begin Custom Build - Creating ..\lib\mswdllud\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswdllud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\lib\mswdllud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode"
+
+# Begin Custom Build - Creating ..\lib\mswu\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\lib\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug Unicode"
+
+# Begin Custom Build - Creating ..\lib\mswud\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\lib\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release DLL"
+
+# Begin Custom Build - Creating ..\lib\mswdll\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/mswdll/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\lib\mswdll\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug DLL"
+
+# Begin Custom Build - Creating ..\lib\mswdlld\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
 
 "../lib/mswdlld/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
        copy "$(InputPath)" ..\lib\mswdlld\wx\setup.h
@@ -1704,16 +2002,6 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode With Debug Info"
-
-# Begin Custom Build - Creating ..\lib\mswu\wx\setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup.h
-
-"../lib/mswu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\lib\mswu\wx\setup.h
-
-# End Custom Build
-
 !ENDIF 
 
 # End Source File
@@ -1743,6 +2031,10 @@ SOURCE=..\include\wx\apptrait.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\archive.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\arrstr.h
 # End Source File
 # Begin Source File
@@ -1803,6 +2095,10 @@ SOURCE=..\include\wx\checklst.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\chkconf.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\choicdlg.h
 # End Source File
 # Begin Source File
@@ -1811,6 +2107,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
@@ -1839,6 +2139,10 @@ SOURCE=..\include\wx\colour.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\combo.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\combobox.h
 # End Source File
 # Begin Source File
@@ -1859,6 +2163,10 @@ SOURCE=..\include\wx\control.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\convauto.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\cshelp.h
 # End Source File
 # Begin Source File
@@ -1875,6 +2183,22 @@ SOURCE=..\include\wx\dataobj.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\dataview.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\dataview.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\datectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\dateevt.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\datetime.h
 # End Source File
 # Begin Source File
@@ -1939,6 +2263,14 @@ SOURCE=..\include\wx\debug.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\debugrpt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\defs.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\dialog.h
 # End Source File
 # Begin Source File
@@ -1963,6 +2295,10 @@ SOURCE=..\include\wx\display.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\display_impl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\dlimpexp.h
 # End Source File
 # Begin Source File
@@ -2023,15 +2359,15 @@ SOURCE=..\include\wx\fdrepdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\ffile.h
+SOURCE=..\include\wx\features.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\file.h
+SOURCE=..\include\wx\ffile.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\protocol\file.h
+SOURCE=..\include\wx\file.h
 # End Source File
 # Begin Source File
 
@@ -2099,10 +2435,6 @@ SOURCE=..\include\wx\fs_zip.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\protocol\ftp.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\gauge.h
 # End Source File
 # Begin Source File
@@ -2139,10 +2471,6 @@ SOURCE=..\include\wx\gsocket.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\gzstream.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\hash.h
 # End Source File
 # Begin Source File
@@ -2175,10 +2503,6 @@ SOURCE=..\include\wx\htmllbox.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\protocol\http.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\icon.h
 # End Source File
 # Begin Source File
@@ -2279,6 +2603,10 @@ SOURCE=..\include\wx\laywin.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\link.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\list.h
 # End Source File
 # Begin Source File
@@ -2319,6 +2647,10 @@ SOURCE=..\include\wx\mdi.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\mediactrl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\memconf.h
 # End Source File
 # Begin Source File
@@ -2363,15 +2695,15 @@ SOURCE=..\include\wx\msgout.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msgout.h
+SOURCE=..\include\wx\mstream.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\mstream.h
+SOURCE=..\include\wx\notebook.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\notebook.h
+SOURCE=..\include\wx\numdlg.h
 # End Source File
 # Begin Source File
 
@@ -2379,6 +2711,10 @@ SOURCE=..\include\wx\object.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\odcombo.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\ownerdrw.h
 # End Source File
 # Begin Source File
@@ -2399,6 +2735,10 @@ SOURCE=..\include\wx\pen.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\platform.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\popupwin.h
 # End Source File
 # Begin Source File
@@ -2423,6 +2763,22 @@ SOURCE=..\include\wx\progdlg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\propdlg.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
@@ -2451,6 +2807,10 @@ SOURCE=..\include\wx\rawbmp.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\recguard.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\regex.h
 # End Source File
 # Begin Source File
@@ -2463,6 +2823,22 @@ SOURCE=..\include\wx\renderer.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\richtext\richtextbuffer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\richtext\richtextctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\richtext\richtextstyles.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\richtext\richtextxml.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\sashwin.h
 # End Source File
 # Begin Source File
@@ -2523,11 +2899,15 @@ SOURCE=..\include\wx\socket.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\spinbutt.h
+SOURCE=..\include\wx\sound.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\spinctrl.h
+SOURCE=..\include\wx\spinbutt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\spinctrl.h
 # End Source File
 # Begin Source File
 
@@ -2539,10 +2919,18 @@ SOURCE=..\include\wx\splitter.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\sstream.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\stack.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\stackwalk.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\statbmp.h
 # End Source File
 # Begin Source File
@@ -2563,6 +2951,14 @@ SOURCE=..\include\wx\statusbr.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\stdpaths.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
@@ -2643,6 +3039,10 @@ SOURCE=..\include\wx\toolbar.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\toolbook.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\tooltip.h
 # End Source File
 # Begin Source File
@@ -2655,6 +3055,10 @@ SOURCE=..\include\wx\treebase.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\treebook.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\treectrl.h
 # End Source File
 # Begin Source File
@@ -2667,6 +3071,10 @@ SOURCE=..\include\wx\types.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\uri.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\url.h
 # End Source File
 # Begin Source File
@@ -2695,6 +3103,10 @@ SOURCE=..\include\wx\vector.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\version.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\vidmode.h
 # End Source File
 # Begin Source File
@@ -2731,10 +3143,18 @@ SOURCE=..\include\wx\wizard.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\wupdlock.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\wx.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\wxchar.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\wxhtml.h
 # End Source File
 # Begin Source File
@@ -2755,6 +3175,186 @@ SOURCE=..\include\wx\xpmhand.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\xrc\xh_all.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_bmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_bmpbt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_bttn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_cald.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_chckb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_chckl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_choic.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_choicbk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_combo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_datectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_dlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_frame.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_gauge.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_gdctl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_grid.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_html.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_listb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_listbk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_listc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_mdi.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_menu.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_notbk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_panel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_radbt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_radbx.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_scrol.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_scwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_sizer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_slidr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_spin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_split.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_statbar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_stbmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_stbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_stlin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_sttxt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_text.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_tglbtn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_toolb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_tree.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_treebk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_unkwn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xh_wizrd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xrc\xmlres.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\xti.h
 # End Source File
 # Begin Source File
@@ -2783,10 +3383,6 @@ SOURCE=..\include\wx\msw\accel.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\ole\access.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\msw\app.h
 # End Source File
 # Begin Source File
@@ -2799,10 +3395,6 @@ SOURCE=..\include\wx\msw\apptrait.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\ole\automtn.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\msw\bitmap.h
 # End Source File
 # Begin Source File
@@ -2831,6 +3423,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
@@ -2847,6 +3443,10 @@ SOURCE=..\include\wx\msw\colour.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\combo.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\combobox.h
 # End Source File
 # Begin Source File
@@ -2863,15 +3463,7 @@ SOURCE=..\include\wx\msw\cursor.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
+SOURCE=..\include\wx\msw\datectrl.h
 # End Source File
 # Begin Source File
 
@@ -2899,6 +3491,10 @@ SOURCE=..\include\wx\msw\dde.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\debughlp.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\dialog.h
 # End Source File
 # Begin Source File
@@ -2915,15 +3511,11 @@ SOURCE=..\include\wx\msw\dragimag.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
+SOURCE=..\include\wx\msw\enhmeta.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\enhmeta.h
+SOURCE=..\include\wx\msw\evtloop.h
 # End Source File
 # Begin Source File
 
@@ -2951,11 +3543,11 @@ SOURCE=..\include\wx\msw\gauge95.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\gdiimage.h
+SOURCE=..\include\wx\msw\gccpriv.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\gdiobj.h
+SOURCE=..\include\wx\msw\gdiimage.h
 # End Source File
 # Begin Source File
 
@@ -2979,6 +3571,10 @@ SOURCE=..\include\wx\msw\helpwin.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\htmlhelp.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\icon.h
 # End Source File
 # Begin Source File
@@ -2995,6 +3591,10 @@ SOURCE=..\include\wx\msw\joystick.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\libraries.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\listbox.h
 # End Source File
 # Begin Source File
@@ -3047,10 +3647,46 @@ 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\activex.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
@@ -3059,6 +3695,10 @@ SOURCE=..\include\wx\msw\pen.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\popupwin.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\printdlg.h
 # End Source File
 # Begin Source File
@@ -3079,6 +3719,10 @@ SOURCE=..\include\wx\msw\radiobut.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\rcdefs.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\regconf.h
 # End Source File
 # Begin Source File
@@ -3095,6 +3739,10 @@ SOURCE=..\include\wx\msw\scrolbar.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\seh.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\setup0.h
 # End Source File
 # Begin Source File
@@ -3103,7 +3751,7 @@ SOURCE=..\include\wx\msw\slider95.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\slidrmsw.h
+SOURCE=..\include\wx\msw\sound.h
 # End Source File
 # Begin Source File
 
@@ -3115,6 +3763,10 @@ SOURCE=..\include\wx\msw\spinctrl.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\stackwalk.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\statbmp.h
 # End Source File
 # Begin Source File
@@ -3135,19 +3787,19 @@ SOURCE=..\include\wx\msw\stattext.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\tabctrl.h
+SOURCE=..\include\wx\msw\stdpaths.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\taskbar.h
+SOURCE=..\include\wx\msw\tabctrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\tbar95.h
+SOURCE=..\include\wx\msw\taskbar.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\tbarmsw.h
+SOURCE=..\include\wx\msw\tbar95.h
 # End Source File
 # Begin Source File
 
@@ -3175,11 +3827,11 @@ SOURCE=..\include\wx\msw\treectrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\ole\uuid.h
+SOURCE=..\include\wx\msw\uxtheme.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\wave.h
+SOURCE=..\include\wx\msw\uxthemep.h
 # End Source File
 # Begin Source File
 
@@ -3187,15 +3839,15 @@ SOURCE=..\include\wx\msw\window.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\gnuwin32\winresrc.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\wrapcctl.h
+SOURCE=..\include\wx\msw\wrapcdlg.h
 # End Source File
 # Begin Source File
 
@@ -3211,6 +3863,14 @@ SOURCE=..\include\wx\generic\accel.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\generic\busyinfo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\generic\buttonbar.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\generic\calctrl.h
 # End Source File
 # Begin Source File
@@ -3223,6 +3883,18 @@ SOURCE=..\include\wx\generic\colrdlgg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\generic\combo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\generic\dataview.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\generic\datectrl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\generic\dcpsg.h
 # End Source File
 # Begin Source File
@@ -3279,6 +3951,10 @@ SOURCE=..\include\wx\generic\notebook.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\generic\numdlgg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\generic\panelg.h
 # End Source File
 # Begin Source File
@@ -3295,6 +3971,10 @@ SOURCE=..\include\wx\generic\progdlgg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\generic\propdlg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\generic\sashwin.h
 # End Source File
 # Begin Source File
@@ -3347,10 +4027,18 @@ SOURCE=..\include\wx\html\helpdata.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\html\helpdlg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\html\helpfrm.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\html\helpwnd.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\html\htmlcell.h
 # End Source File
 # Begin Source File
@@ -3390,46 +4078,6 @@ SOURCE=..\include\wx\html\m_templ.h
 SOURCE=..\include\wx\html\winpars.h
 # End Source File
 # End Group
-# Begin Group "C-Only"
-
-# PROP Default_Filter ""
-# Begin Group "msw No. 1"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\include\wx\msw\chkconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\msw\gccpriv.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\include\wx\chkconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\defs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\features.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\platform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\version.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\wxchar.h
-# End Source File
-# End Group
 # End Group
 # End Target
 # End Project