Changed version to 2.5.1

[wxWidgets.git] / src / wxWindows.dsp

diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index b96d4eb66a1d0e29ac7a7a11f482a9018dfd2838..8a3d521ede746586ce28bec7d6090b977fa63c52 100644 (file)
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -26,6 +26,7 @@ CFG=wxWindows - Win32 Debug
 !MESSAGE "wxWindows - Win32 Debug DLL" (based on "Win32 (x86) Dynamic-Link Library")
 !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 
 
 # Begin Project
@@ -48,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 "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /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
@@ -59,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"
 
@@ -77,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 "WIN32" /D "_DEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /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
@@ -88,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"
 
@@ -105,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 "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "_UNICODE" /D "UNICODE" /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
@@ -130,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 "WIN32" /D "_DEBUG" /D "__WXDEBUG__" /D WINVER=0x0400 /D "STRICT" /D "_UNICODE" /D "UNICODE" /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
@@ -156,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 "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /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
@@ -167,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"
 
@@ -185,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 "WIN32" /D "_DEBUG" /D WINVER=0x0400 /D "STRICT" /D "WXMAKINGDLL" /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
@@ -196,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"
 
@@ -213,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 "WIN32" /D "NDEBUG" /D WINVER=0x0400 /D "STRICT" /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
@@ -238,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 "WIN32" /D "_DEBUG" /D "__WXDEBUG__" /D WINVER=0x0400 /D "STRICT" /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
@@ -249,6 +250,31 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\lib\wxmswd.lib"
 
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release With Debug Info"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "wxWindows___Win32_Release_With_Debug_Info"
+# PROP BASE Intermediate_Dir "wxWindows___Win32_Release_With_Debug_Info"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ReleaseDebug"
+# 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" /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
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\lib\wxmsw.lib"
+# ADD LIB32 /nologo /out:"..\lib\wxmsw.lib"
+
 !ENDIF 
 
 # Begin Target
@@ -261,6 +287,7 @@ LIB32=link.exe -lib
 # Name "wxWindows - Win32 Debug DLL"
 # Name "wxWindows - Win32 Release"
 # Name "wxWindows - Win32 Debug"
+# Name "wxWindows - Win32 Release With Debug Info"
 # Begin Group "Common Files"
 
 # PROP Default_Filter ""
@@ -270,6 +297,10 @@ SOURCE=.\common\accesscmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\appbase.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\appcmn.cpp
 # End Source File
 # Begin Source File
@@ -282,6 +313,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
@@ -443,6 +482,14 @@ SOURCE=.\common\filesys.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\fldlgcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\common\fmapbase.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\fontcmn.cpp
 # End Source File
 # Begin Source File
@@ -555,6 +602,10 @@ SOURCE=.\common\imagxpm.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\init.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\intl.cpp
 # End Source File
 # Begin Source File
@@ -651,6 +702,10 @@ SOURCE=.\common\regex.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\rendcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\rgncmn.cpp
 # End Source File
 # Begin Source File
@@ -687,6 +742,10 @@ SOURCE=.\common\statbar.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\stopwatch.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\strconv.cpp
 # End Source File
 # Begin Source File
@@ -788,6 +847,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
@@ -840,10 +911,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
@@ -856,10 +939,18 @@ SOURCE=.\generic\panelg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\printps.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\progdlgg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\renderg.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\sashwin.cpp
 # End Source File
 # Begin Source File
@@ -868,6 +959,10 @@ SOURCE=.\generic\scrlwing.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\selstore.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\spinctlg.cpp
 # End Source File
 # Begin Source File
@@ -884,10 +979,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
@@ -904,6 +995,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
@@ -994,45 +1093,17 @@ 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
+SOURCE=.\msw\accel.cpp
 # End Source File
-# End Group
 # Begin Source File
 
-SOURCE=.\msw\accel.cpp
+SOURCE=.\msw\app.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\app.cpp
+SOURCE=.\msw\basemsw.cpp
 # End Source File
 # Begin Source File
 
@@ -1088,6 +1159,10 @@ SOURCE=.\msw\control.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\crashrpt.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\cursor.cpp
 # End Source File
 # Begin Source File
@@ -1295,19 +1370,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\penwin.cpp
+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
+
+SOURCE=.\msw\palette.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\pen.cpp
 # End Source File
 # Begin Source File
 
@@ -1343,6 +1442,10 @@ SOURCE=.\msw\registry.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\renderer.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\scrolbar.cpp
 # End Source File
 # Begin Source File
@@ -1435,6 +1538,10 @@ SOURCE=.\msw\utilsexc.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\utilsgui.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\uxtheme.cpp
 # End Source File
 # Begin Source File
@@ -1450,6 +1557,14 @@ SOURCE=.\msw\wave.cpp
 SOURCE=.\msw\window.cpp
 # End Source File
 # End Group
+# Begin Group "Other Sources"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\xml\xml.cpp
+# End Source File
+# End Group
 # Begin Group "Headers"
 
 # PROP Default_Filter ""
@@ -1540,6 +1655,16 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
+!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release With Debug Info"
+
+# Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath)
+InputPath=..\include\wx\msw\setup.h
+
+"../lib/msw/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       copy "$(InputPath)" ..\lib\msw\wx\setup.h
+
+# End Custom Build
+
 !ENDIF 
 
 # End Source File
@@ -1557,14 +1682,30 @@ 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
 
+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
@@ -1573,6 +1714,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
@@ -1689,10 +1834,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
@@ -1729,6 +1870,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
@@ -1817,6 +1962,10 @@ 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\fdrepdlg.h
 # End Source File
 # Begin Source File
@@ -1853,6 +2002,10 @@ SOURCE=..\include\wx\filesys.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\fmappriv.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\font.h
 # End Source File
 # Begin Source File
@@ -1933,6 +2086,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
@@ -1941,10 +2098,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
@@ -1953,6 +2118,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
@@ -1997,6 +2166,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
@@ -2045,6 +2218,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
@@ -2117,6 +2294,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
@@ -2177,6 +2358,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
@@ -2201,6 +2406,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
@@ -2217,6 +2426,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
@@ -2225,6 +2446,10 @@ SOURCE=..\include\wx\scrolwin.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\selstore.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\settings.h
 # End Source File
 # Begin Source File
@@ -2285,6 +2510,10 @@ SOURCE=..\include\wx\statusbr.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
@@ -2317,10 +2546,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
@@ -2421,10 +2646,22 @@ SOURCE=..\include\wx\version.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
@@ -2445,31 +2682,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
 
@@ -2489,11 +2734,15 @@ SOURCE=..\include\wx\msw\accel.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\access.h
+SOURCE=..\include\wx\msw\app.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\app.h
+SOURCE=..\include\wx\msw\apptbase.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\apptrait.h
 # End Source File
 # Begin Source File
 
@@ -2525,6 +2774,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
@@ -2549,6 +2802,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
@@ -2637,6 +2894,14 @@ SOURCE=..\include\wx\msw\glcanvas.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\gnuwin32\winresrc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\msw\gsockmsw.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\helpbest.h
 # End Source File
 # Begin Source File
@@ -2717,6 +2982,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
@@ -2761,6 +3062,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
@@ -2847,6 +3152,14 @@ SOURCE=..\include\wx\msw\window.h
 
 SOURCE=..\include\wx\msw\winundef.h
 # End Source File
+# Begin Source File
+
+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"
 
@@ -2861,10 +3174,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
@@ -2881,18 +3190,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
@@ -2909,7 +3210,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
 
@@ -2925,11 +3226,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
 
@@ -2941,10 +3238,6 @@ SOURCE=..\include\wx\generic\notebook.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\generic\paletteg.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\generic\panelg.h
 # End Source File
 # Begin Source File
@@ -2981,18 +3274,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
@@ -3045,6 +3326,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