undoing last change, widgets sample had slider label offset

[wxWidgets.git] / src / wxWindows.dsp

diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index 68683ae901df2edcba9caea84c9e1a01d0995de4..ae50411cfb8280961f4ea348a2196e99df9c72d4 100644 (file)
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -2,8 +2,8 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
 
 CFG=wxWindows - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -26,14 +26,13 @@ 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
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
 
 !IF  "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
 
@@ -48,18 +47,21 @@ RSC=rc.exe
 # PROP Intermediate_Dir "../ReleaseUnicodeDll"
 # PROP Ignore_Export_Lib 0
 # 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
+RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /i "../include" /d "NDEBUG"
 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.3 /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"
 
@@ -74,18 +76,21 @@ LINK32=link.exe
 # PROP Intermediate_Dir "../DebugUnicodeDll"
 # PROP Ignore_Export_Lib 0
 # 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
+RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /i "../include" /d "_DEBUG"
 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 /pdbtype:sept /out:"../lib/wxmsw250ud.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\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.3 /dll /debug /machine:I386 /pdbtype:sept /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"
 
@@ -99,8 +104,10 @@ LINK32=link.exe
 # PROP Output_Dir "../lib"
 # PROP Intermediate_Dir "../ReleaseUnicode"
 # 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
 BSC32=bscmake.exe
@@ -122,8 +129,10 @@ LIB32=link.exe -lib
 # PROP Output_Dir "../lib"
 # PROP Intermediate_Dir "../DebugUnicode"
 # 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
 BSC32=bscmake.exe
@@ -146,18 +155,21 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "../ReleaseDll"
 # PROP Ignore_Export_Lib 0
 # 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
+RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /i "../include" /d "NDEBUG"
 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.3 /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"
 
@@ -172,18 +184,21 @@ LINK32=link.exe
 # PROP Intermediate_Dir "../DebugDll"
 # PROP Ignore_Export_Lib 0
 # 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
+RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /i "../include" /d "_DEBUG"
 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 /pdbtype:sept /out:"../lib/wxmsw250d.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\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.3 /dll /debug /machine:I386 /pdbtype:sept /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"
 
@@ -197,8 +212,10 @@ LINK32=link.exe
 # PROP Output_Dir "../lib"
 # PROP Intermediate_Dir "../Release"
 # 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
 BSC32=bscmake.exe
@@ -220,8 +237,10 @@ LIB32=link.exe -lib
 # PROP Output_Dir "../lib"
 # PROP Intermediate_Dir "../Debug"
 # 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
 BSC32=bscmake.exe
@@ -231,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
@@ -243,11 +287,24 @@ 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 Source File
+
+SOURCE="This project is deprecated, please see install.txt"
+# End Source File
 # Begin Group "Common Files"
 
 # PROP Default_Filter ""
 # Begin Source File
 
+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
@@ -260,6 +317,14 @@ SOURCE=.\common\artstd.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\bmpbase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\common\bookctrl.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\choiccmn.cpp
 # End Source File
 # Begin Source File
@@ -304,6 +369,10 @@ SOURCE=.\common\ctrlsub.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\datacmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\datetime.cpp
 # End Source File
 # Begin Source File
@@ -352,6 +421,10 @@ SOURCE=.\common\docview.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\dpycmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\dseldlg.cpp
 # End Source File
 # Begin Source File
@@ -380,6 +453,11 @@ SOURCE=.\common\event.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\extended.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\fddlgcmn.cpp
 # End Source File
 # Begin Source File
@@ -408,6 +486,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
@@ -440,6 +526,10 @@ SOURCE=.\common\gaugecmn.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\gbsizer.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\gdicmn.cpp
 # End Source File
 # Begin Source File
@@ -520,6 +610,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
@@ -584,10 +678,6 @@ SOURCE=.\common\object.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\odbc.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\common\paper.cpp
 # End Source File
 # Begin Source File
@@ -620,7 +710,11 @@ SOURCE=.\common\regex.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\resource.cpp
+SOURCE=.\common\rendcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\common\rgncmn.cpp
 # End Source File
 # Begin Source File
 
@@ -656,6 +750,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
@@ -672,6 +770,10 @@ SOURCE=.\common\sysopt.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\taskbarcmn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\tbarbase.cpp
 # End Source File
 # Begin Source File
@@ -708,6 +810,11 @@ SOURCE=.\common\txtstrm.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\common\unzip.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
 SOURCE=.\common\url.cpp
 # End Source File
 # Begin Source File
@@ -744,37 +851,27 @@ SOURCE=.\common\wxchar.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\wxexpr.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\common\xpmdecod.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\zipstrm.cpp
+SOURCE=.\common\xti.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\zstream.cpp
+SOURCE=.\common\xtistrm.cpp
 # End Source File
-
 # Begin Source File
 
-SOURCE=.\common\extended.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\common\xtixml.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\unzip.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\common\zipstrm.cpp
 # End Source File
-
 # Begin Source File
 
-SOURCE=.\common\dosyacc.c
-# ADD CPP /W1 /D "USE_DEFINE" /D "IDE_INVOKED"
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\common\zstream.cpp
 # End Source File
 # End Group
 # Begin Group "Generic Files"
@@ -794,10 +891,6 @@ SOURCE=.\generic\choicdgg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\dcbuffer.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\generic\dcpsg.cpp
 # End Source File
 # Begin Source File
@@ -822,10 +915,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
@@ -838,19 +943,19 @@ SOURCE=.\generic\panelg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\progdlgg.cpp
+SOURCE=.\generic\printps.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\prop.cpp
+SOURCE=.\generic\prntdlgg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\propform.cpp
+SOURCE=.\generic\progdlgg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\proplist.cpp
+SOURCE=.\generic\renderg.cpp
 # End Source File
 # Begin Source File
 
@@ -862,6 +967,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
@@ -878,10 +987,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
@@ -898,13 +1003,16 @@ SOURCE=.\generic\treectlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\treelay.cpp
+SOURCE=.\generic\vlbox.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\generic\wizard.cpp
+SOURCE=.\generic\vscroll.cpp
 # End Source File
+# Begin Source File
 
+SOURCE=.\generic\wizard.cpp
+# End Source File
 # End Group
 # Begin Group "wxHTML Files"
 
@@ -989,23 +1097,21 @@ SOURCE=.\html\m_tables.cpp
 
 SOURCE=.\html\winpars.cpp
 # End Source File
-
 # End Group
 # Begin Group "MSW Files"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\msw\dummy.cpp
-# ADD CPP /Yc"wx/wxprec.h"
+SOURCE=.\msw\accel.cpp
 # End Source File
 # 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
 
@@ -1061,7 +1167,7 @@ SOURCE=.\msw\control.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\curico.cpp
+SOURCE=.\msw\crashrpt.cpp
 # End Source File
 # Begin Source File
 
@@ -1109,15 +1215,15 @@ SOURCE=.\msw\dib.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\dibutils.cpp
+SOURCE=.\msw\dir.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\dir.cpp
+SOURCE=.\msw\dirdlg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\dirdlg.cpp
+SOURCE=.\msw\display.cpp
 # End Source File
 # Begin Source File
 
@@ -1125,6 +1231,11 @@ SOURCE=.\msw\dragimag.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\dummy.cpp
+# ADD CPP /Yc"wx/wxprec.h"
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\enhmeta.cpp
 # End Source File
 # Begin Source File
@@ -1177,6 +1288,14 @@ SOURCE=.\msw\glcanvas.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\gsocket.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\gsockmsw.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\helpbest.cpp
 # End Source File
 # Begin Source File
@@ -1257,19 +1376,43 @@ SOURCE=.\msw\notebook.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\ownerdrw.cpp
+SOURCE=.\msw\ole\access.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\palette.cpp
+SOURCE=.\msw\ole\automtn.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\pen.cpp
+SOURCE=.\msw\ole\dataobj.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\dropsrc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\droptgt.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\oleutils.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\uuid.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ownerdrw.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\palette.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\penwin.cpp
+SOURCE=.\msw\pen.cpp
 # End Source File
 # Begin Source File
 
@@ -1305,6 +1448,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
@@ -1321,6 +1468,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
@@ -1389,65 +1540,40 @@ 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\volume.cpp
+SOURCE=.\msw\utilsexc.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\wave.cpp
+SOURCE=.\msw\utilsgui.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\window.cpp
+SOURCE=.\msw\uxtheme.cpp
 # End Source File
-
 # Begin Source File
 
-SOURCE=.\msw\gsocket.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\msw\volume.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\gsockmsw.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\msw\window.cpp
 # End Source File
-
-# Begin Group "OLE Files"
+# End Group
+# Begin Group "Other Sources"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\msw\ole\automtn.cpp
+SOURCE=.\xml\xml.cpp
 # End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\dataobj.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\dropsrc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\droptgt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\oleutils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\msw\ole\uuid.cpp
-# End Source File
-
-# End Group
 # End Group
 # Begin Group "Headers"
 
@@ -1458,7 +1584,9 @@ SOURCE=.\msw\ole\uuid.cpp
 # 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
 
@@ -1466,7 +1594,9 @@ InputPath=..\include\wx\msw\setup.h
        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
 
@@ -1474,7 +1604,9 @@ InputPath=..\include\wx\msw\setup.h
        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
 
@@ -1482,7 +1614,9 @@ InputPath=..\include\wx\msw\setup.h
        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
 
@@ -1490,7 +1624,9 @@ InputPath=..\include\wx\msw\setup.h
        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
 
@@ -1498,7 +1634,9 @@ InputPath=..\include\wx\msw\setup.h
        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
 
@@ -1506,7 +1644,9 @@ InputPath=..\include\wx\msw\setup.h
        copy "$(InputPath)" ..\lib\mswdlld\wx\setup.h
 
 # End Custom Build
+
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Release"
+
 # Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\msw\setup.h
 
@@ -1514,7 +1654,9 @@ InputPath=..\include\wx\msw\setup.h
        copy "$(InputPath)" ..\lib\msw\wx\setup.h
 
 # End Custom Build
+
 !ELSEIF  "$(CFG)" == "wxWindows - Win32 Debug"
+
 # Begin Custom Build - Creating ..\lib\mswd\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\msw\setup.h
 
@@ -1522,7 +1664,19 @@ InputPath=..\include\wx\msw\setup.h
        copy "$(InputPath)" ..\lib\mswd\wx\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
 # End Group
 # Begin Group "Common"
@@ -1534,14 +1688,34 @@ SOURCE=..\include\wx\accel.h
 # End Source File
 # Begin Source File
 
+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
@@ -1550,6 +1724,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
@@ -1662,18 +1840,10 @@ SOURCE=..\include\wx\dataobj.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\date.h
-# End Source File
-# Begin Source File
-
 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
@@ -1710,6 +1880,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
@@ -1754,6 +1928,14 @@ SOURCE=..\include\wx\dirdlg.h
 # End Source File
 # Begin Source File
 
+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
@@ -1790,11 +1972,19 @@ SOURCE=..\include\wx\encconv.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\encinfo.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\event.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\expr.h
+SOURCE=..\include\wx\evtloop.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\except.h
 # End Source File
 # Begin Source File
 
@@ -1834,6 +2024,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
@@ -1878,6 +2072,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
@@ -1914,6 +2112,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
@@ -1930,6 +2132,10 @@ 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
@@ -1938,6 +2144,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
@@ -1982,6 +2192,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
@@ -2030,6 +2244,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
@@ -2046,6 +2264,10 @@ SOURCE=..\include\wx\longlong.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\math.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\matrix.h
 # End Source File
 # Begin Source File
@@ -2098,6 +2320,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
@@ -2106,11 +2332,11 @@ SOURCE=..\include\wx\notebook.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\object.h
+SOURCE=..\include\wx\numdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\odbc.h
+SOURCE=..\include\wx\object.h
 # End Source File
 # Begin Source File
 
@@ -2162,15 +2388,27 @@ SOURCE=..\include\wx\progdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\prop.h
+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\propform.h
+SOURCE=..\include\wx\protocol\protocol.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\proplist.h
+SOURCE=..\include\wx\ptr_scpd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\ptr_scpd.h
 # End Source File
 # Begin Source File
 
@@ -2186,6 +2424,10 @@ SOURCE=..\include\wx\radiobut.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\rawbmp.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\regex.h
 # End Source File
 # Begin Source File
@@ -2194,7 +2436,7 @@ SOURCE=..\include\wx\region.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\resource.h
+SOURCE=..\include\wx\renderer.h
 # End Source File
 # Begin Source File
 
@@ -2214,6 +2456,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
@@ -2222,6 +2476,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
@@ -2242,6 +2500,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
@@ -2282,6 +2544,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
@@ -2314,10 +2580,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
@@ -2342,10 +2604,6 @@ SOURCE=..\include\wx\thread.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\time.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\timer.h
 # End Source File
 # Begin Source File
@@ -2422,10 +2680,26 @@ SOURCE=..\include\wx\version.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\vidmode.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\vlbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\wx\vms_x_fix.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\volume.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\vscroll.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\wave.h
 # End Source File
 # Begin Source File
@@ -2446,35 +2720,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\wxhtml.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\wx_cw_cm.h
+SOURCE=..\include\wx\wxprec.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\wx_cw_d.h
+SOURCE=..\include\wx\xml\xml.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\wxchar.h
+SOURCE=..\include\wx\xpmdecod.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\wxexpr.h
+SOURCE=..\include\wx\xpmhand.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\wxhtml.h
+SOURCE=..\include\wx\xti.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\wxprec.h
+SOURCE=..\include\wx\xtistrm.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\xpmdecod.h
+SOURCE=..\include\wx\xtixml.h
 # End Source File
 # Begin Source File
 
@@ -2484,7 +2762,6 @@ SOURCE=..\include\wx\zipstrm.h
 
 SOURCE=..\include\wx\zstream.h
 # End Source File
-
 # End Group
 # Begin Group "MSW"
 
@@ -2499,6 +2776,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
@@ -2527,6 +2812,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
@@ -2551,11 +2840,7 @@ SOURCE=..\include\wx\msw\control.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\curico.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\msw\curicop.h
+SOURCE=..\include\wx\msw\crashrpt.h
 # End Source File
 # Begin Source File
 
@@ -2595,10 +2880,6 @@ SOURCE=..\include\wx\msw\dib.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\dibutils.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\msw\dirdlg.h
 # End Source File
 # Begin Source File
@@ -2635,10 +2916,6 @@ SOURCE=..\include\wx\msw\gauge95.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\gaugemsw.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\msw\gccpriv.h
 # End Source File
 # Begin Source File
@@ -2655,6 +2932,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
@@ -2735,6 +3020,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
@@ -2779,6 +3100,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
@@ -2787,6 +3112,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
@@ -2855,17 +3184,20 @@ SOURCE=..\include\wx\msw\treectrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\wave.h
+SOURCE=..\include\wx\msw\window.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\window.h
+SOURCE=..\include\wx\msw\winundef.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\winundef.h
+SOURCE=..\include\wx\msw\wrapcctl.h
 # End Source File
+# Begin Source File
 
+SOURCE=..\include\wx\msw\wrapwin.h
+# End Source File
 # End Group
 # Begin Group "Generic"
 
@@ -2880,10 +3212,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
@@ -2900,18 +3228,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
@@ -2928,7 +3248,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
 
@@ -2936,10 +3256,6 @@ SOURCE=..\include\wx\generic\helpext.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\generic\helphtml.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\generic\imaglist.h
 # End Source File
 # Begin Source File
@@ -2948,11 +3264,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
 
@@ -2964,7 +3276,7 @@ SOURCE=..\include\wx\generic\notebook.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\generic\paletteg.h
+SOURCE=..\include\wx\generic\numdlgg.h
 # End Source File
 # Begin Source File
 
@@ -3004,18 +3316,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
@@ -3030,7 +3330,6 @@ SOURCE=..\include\wx\generic\treectlg.h
 
 SOURCE=..\include\wx\generic\wizard.h
 # End Source File
-
 # End Group
 # Begin Group "HTML"
 
@@ -3069,6 +3368,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
@@ -3087,7 +3390,6 @@ SOURCE=..\include\wx\html\m_templ.h
 
 SOURCE=..\include\wx\html\winpars.h
 # End Source File
-
 # End Group
 # End Group
 # End Target