call SetInitialBestSize(), not SetBestSize(), when setting the best size initially

[wxWidgets.git] / src / wxWindows.dsp

diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index e154731b56abe99fe303608ab9cb183cfe1cef23..bcf80104a0b8e6f14dd2d9695291ddcf50fd3701 100644 (file)
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -27,7 +27,6 @@ CFG=wxWindows - Win32 Debug
 !MESSAGE "wxWindows - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "wxWindows - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE "wxWindows - Win32 Release With Debug Info" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxWindows - Win32 Release Unicode With Debug Info" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -50,7 +49,7 @@ CFG=wxWindows - Win32 Debug
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GX /O2 /I "../lib/mswdllu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdllu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -79,7 +78,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /GX /Zi /Od /I "../lib/mswdllud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdllud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -107,7 +106,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GX /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
@@ -132,7 +131,7 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W4 /GX /Zi /Od /I "../lib/mswud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
@@ -158,7 +157,7 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GX /O2 /I "../lib/mswdll" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdll" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -187,7 +186,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /GX /Zi /Od /I "../lib/mswdlld" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdlld" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -215,7 +214,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GX /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
@@ -240,7 +239,7 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W4 /GX /Zi /Od /I "../lib/mswd" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswd" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
@@ -265,7 +264,7 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
-# ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W4 /Zi /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
@@ -276,31 +275,6 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\lib\wxmsw.lib"
 # ADD LIB32 /nologo /out:"..\lib\wxmsw.lib"
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode With Debug Info"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "wxWindows___Win32_Release_Unicode_With_Debug_Info"
-# PROP BASE Intermediate_Dir "wxWindows___Win32_Release_Unicode_With_Debug_Info"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "wxWindows___Win32_Release_Unicode_With_Debug_Info"
-# PROP Intermediate_Dir "wxWindows___Win32_Release_Unicode_With_Debug_Info"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W4 /GX /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
-# ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\lib\wxmswu.lib"
-# ADD LIB32 /nologo /out:"..\lib\wxmswu.lib"
-
 !ENDIF 
 
 # Begin Target
@@ -314,7 +288,10 @@ LIB32=link.exe -lib
 # Name "wxWindows - Win32 Release"
 # Name "wxWindows - Win32 Debug"
 # Name "wxWindows - Win32 Release With Debug Info"
-# Name "wxWindows - Win32 Release Unicode With Debug Info"
+# Begin Source File
+
+SOURCE="This project is deprecated, please see install.txt"
+# End Source File
 # Begin Group "Common Files"
 
 # PROP Default_Filter ""
@@ -918,10 +895,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
@@ -1138,18 +1111,10 @@ SOURCE=.\msw\accel.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\ole\access.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\msw\app.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\ole\automtn.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\msw\basemsw.cpp
 # End Source File
 # Begin Source File
@@ -1218,10 +1183,6 @@ SOURCE=.\msw\data.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\ole\dataobj.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\msw\dc.cpp
 # End Source File
 # Begin Source File
@@ -1274,14 +1235,6 @@ SOURCE=.\msw\dragimag.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\dummy.cpp
 # ADD CPP /Yc"wx/wxprec.h"
 # End Source File
@@ -1429,10 +1382,34 @@ SOURCE=.\msw\notebook.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\ole\access.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\automtn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\dataobj.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\dropsrc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\ole\droptgt.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\ole\oleutils.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\ole\uuid.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\ownerdrw.cpp
 # End Source File
 # Begin Source File
@@ -1497,6 +1474,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
@@ -1565,19 +1546,19 @@ SOURCE=.\msw\treectrl.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\utils.cpp
+SOURCE=.\msw\urlmsw.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\utilsexc.cpp
+SOURCE=.\msw\utils.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\utilsgui.cpp
+SOURCE=.\msw\utilsexc.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\msw\ole\uuid.cpp
+SOURCE=.\msw\utilsgui.cpp
 # End Source File
 # Begin Source File
 
@@ -1589,10 +1570,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
@@ -1704,16 +1681,6 @@ InputPath=..\include\wx\msw\setup.h
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "wxWindows - Win32 Release Unicode With Debug Info"
-
-# Begin Custom Build - Creating ..\lib\mswu\wx\setup.h from $(InputPath)
-InputPath=..\include\wx\msw\setup.h
-
-"../lib/mswu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy "$(InputPath)" ..\lib\mswu\wx\setup.h
-
-# End Custom Build
-
 !ENDIF 
 
 # End Source File
@@ -1803,6 +1770,10 @@ SOURCE=..\include\wx\checklst.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\chkconf.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\choicdlg.h
 # End Source File
 # Begin Source File
@@ -1939,6 +1910,10 @@ SOURCE=..\include\wx\debug.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\defs.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\dialog.h
 # End Source File
 # Begin Source File
@@ -2023,15 +1998,15 @@ SOURCE=..\include\wx\fdrepdlg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\ffile.h
+SOURCE=..\include\wx\features.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\file.h
+SOURCE=..\include\wx\ffile.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\protocol\file.h
+SOURCE=..\include\wx\file.h
 # End Source File
 # Begin Source File
 
@@ -2099,10 +2074,6 @@ SOURCE=..\include\wx\fs_zip.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\protocol\ftp.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\gauge.h
 # End Source File
 # Begin Source File
@@ -2175,10 +2146,6 @@ SOURCE=..\include\wx\htmllbox.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\protocol\http.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\icon.h
 # End Source File
 # Begin Source File
@@ -2375,6 +2342,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
@@ -2399,6 +2370,10 @@ SOURCE=..\include\wx\pen.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\platform.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\popupwin.h
 # End Source File
 # Begin Source File
@@ -2423,6 +2398,18 @@ 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
@@ -2523,6 +2510,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
@@ -2695,6 +2686,10 @@ SOURCE=..\include\wx\vector.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\version.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\vidmode.h
 # End Source File
 # Begin Source File
@@ -2735,6 +2730,10 @@ SOURCE=..\include\wx\wx.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\wxchar.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\wxhtml.h
 # End Source File
 # Begin Source File
@@ -2783,10 +2782,6 @@ SOURCE=..\include\wx\msw\accel.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\ole\access.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\msw\app.h
 # End Source File
 # Begin Source File
@@ -2799,10 +2794,6 @@ SOURCE=..\include\wx\msw\apptrait.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\ole\automtn.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\msw\bitmap.h
 # End Source File
 # Begin Source File
@@ -2831,6 +2822,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
@@ -2863,18 +2858,6 @@ SOURCE=..\include\wx\msw\cursor.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\ole\dataform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\msw\ole\dataobj.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\msw\ole\dataobj2.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\msw\dc.h
 # End Source File
 # Begin Source File
@@ -2915,14 +2898,6 @@ SOURCE=..\include\wx\msw\dragimag.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\ole\dropsrc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\msw\ole\droptgt.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\msw\enhmeta.h
 # End Source File
 # Begin Source File
@@ -2951,6 +2926,10 @@ SOURCE=..\include\wx\msw\gauge95.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\msw\gccpriv.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\msw\gdiimage.h
 # End Source File
 # Begin Source File
@@ -2963,6 +2942,10 @@ 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
@@ -3047,10 +3030,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
@@ -3107,6 +3122,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
@@ -3175,22 +3194,10 @@ SOURCE=..\include\wx\msw\treectrl.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\include\wx\msw\ole\uuid.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
 
-SOURCE=..\include\wx\msw\gnuwin32\winresrc.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\include\wx\msw\winundef.h
 # End Source File
 # Begin Source File
@@ -3279,6 +3286,10 @@ SOURCE=..\include\wx\generic\notebook.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\include\wx\generic\numdlgg.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\wx\generic\panelg.h
 # End Source File
 # Begin Source File
@@ -3390,46 +3401,6 @@ SOURCE=..\include\wx\html\m_templ.h
 SOURCE=..\include\wx\html\winpars.h
 # End Source File
 # End Group
-# Begin Group "C-Only"
-
-# PROP Default_Filter ""
-# Begin Group "msw No. 1"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\include\wx\msw\chkconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\msw\gccpriv.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\include\wx\chkconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\defs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\features.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\platform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\version.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\wx\wxchar.h
-# End Source File
-# End Group
 # End Group
 # End Target
 # End Project