Added support for static (inlined) wxImages with

[wxWidgets.git] / src / wxWindows.dsp

diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index a35c3281093b9d929043b1fd3971cc6135ae2350..ec0e39b21daf70626a638403d3ad51ae346b818f 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 ""
@@ -305,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
@@ -317,6 +325,10 @@ 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
@@ -518,6 +530,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
@@ -634,6 +650,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
@@ -734,10 +754,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
@@ -798,8 +830,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
 
@@ -843,6 +874,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
@@ -863,11 +906,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
 
@@ -907,6 +950,10 @@ 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
@@ -919,6 +966,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
@@ -955,10 +1010,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
@@ -1260,13 +1311,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
 
@@ -1314,6 +1363,10 @@ SOURCE=.\msw\mdi.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\mediactrl.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\menu.cpp
 # End Source File
 # Begin Source File
@@ -1390,10 +1443,6 @@ SOURCE=.\msw\pen.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\penwin.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\msw\popupwin.cpp
 # End Source File
 # Begin Source File
@@ -1446,6 +1495,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
@@ -1474,6 +1527,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
@@ -1514,6 +1571,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
@@ -1534,10 +1595,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
@@ -1548,6 +1605,162 @@ SOURCE=.\msw\window.cpp
 
 SOURCE=.\xml\xml.cpp
 # End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_bmp.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_bmpbt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_bttn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_cald.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_chckb.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_chckl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_choic.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_combo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_dlg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_frame.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_gauge.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_gdctl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_html.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_listb.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrc\xh_listc.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_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"
 
@@ -1678,6 +1891,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
@@ -1698,6 +1915,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
@@ -1746,6 +1967,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
@@ -1902,6 +2127,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
@@ -1938,6 +2167,10 @@ 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
@@ -1946,6 +2179,10 @@ 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
@@ -2030,6 +2267,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
@@ -2066,6 +2307,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
@@ -2194,6 +2439,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
@@ -2222,6 +2471,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
@@ -2278,6 +2531,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
@@ -2350,6 +2607,10 @@ 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
@@ -2398,6 +2659,10 @@ 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
@@ -2434,6 +2699,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
@@ -2450,6 +2719,10 @@ 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
@@ -2474,6 +2747,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
@@ -2510,10 +2791,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
@@ -2582,6 +2859,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
@@ -2614,6 +2895,10 @@ 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
@@ -2674,6 +2959,174 @@ 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_combo.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_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_listc.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_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
+
+SOURCE=..\include\wx\xtistrm.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\xtixml.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\zipstrm.h
 # End Source File
 # Begin Source File
@@ -2694,6 +3147,14 @@ SOURCE=..\include\wx\msw\app.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\apptbase.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\apptrait.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\bitmap.h
 # End Source File
 # Begin Source File
@@ -2802,6 +3263,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
@@ -2854,14 +3319,6 @@ SOURCE=..\include\wx\msw\helpbest.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\helpchm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\msw\helpwin.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\msw\icon.h
 # End Source File
 # Begin Source File
@@ -3022,6 +3479,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
@@ -3090,10 +3551,6 @@ SOURCE=..\include\wx\msw\treectrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\wave.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\msw\window.h
 # End Source File
 # Begin Source File
@@ -3186,10 +3643,18 @@ SOURCE=..\include\wx\generic\notebook.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\generic\numdlgg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\generic\panelg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\generic\printps.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\generic\prntdlgg.h
 # End Source File
 # Begin Source File