regenerated

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 79fca9669b669eed08d4d950dbfe6907fd2feb02..062ed2e6e2e8e49bb7edecdbd4ed9c2a773b8009 100644 (file)
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -966,7 +966,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_notebook.obj \
        $(OBJS)\monolib_access.obj \
        $(OBJS)\monolib_ownerdrw.obj \
-       $(OBJS)\monolib_penwin.obj \
        $(OBJS)\monolib_printdlg.obj \
        $(OBJS)\monolib_printwin.obj \
        $(OBJS)\monolib_radiobox.obj \
@@ -1346,7 +1345,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_notebook.obj \
        $(OBJS)\coredll_access.obj \
        $(OBJS)\coredll_ownerdrw.obj \
-       $(OBJS)\coredll_penwin.obj \
        $(OBJS)\coredll_printdlg.obj \
        $(OBJS)\coredll_printwin.obj \
        $(OBJS)\coredll_radiobox.obj \
@@ -1726,7 +1724,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_notebook.obj \
        $(OBJS)\corelib_access.obj \
        $(OBJS)\corelib_ownerdrw.obj \
-       $(OBJS)\corelib_penwin.obj \
        $(OBJS)\corelib_printdlg.obj \
        $(OBJS)\corelib_printwin.obj \
        $(OBJS)\corelib_radiobox.obj \
@@ -2106,7 +2103,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_notebook.obj \
        $(OBJS)\monodll_access.obj \
        $(OBJS)\monodll_ownerdrw.obj \
-       $(OBJS)\monodll_penwin.obj \
        $(OBJS)\monodll_printdlg.obj \
        $(OBJS)\monodll_printwin.obj \
        $(OBJS)\monodll_radiobox.obj \
@@ -3836,9 +3832,6 @@ $(OBJS)\coredll_pen.obj: ..\..\src\msw\pen.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
-$(OBJS)\coredll_penwin.obj: ..\..\src\msw\penwin.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -4944,9 +4937,6 @@ $(OBJS)\corelib_pen.obj: ..\..\src\msw\pen.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
-$(OBJS)\corelib_penwin.obj: ..\..\src\msw\penwin.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
@@ -6436,9 +6426,6 @@ $(OBJS)\monodll_pen.obj: ..\..\src\msw\pen.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
-$(OBJS)\monodll_penwin.obj: ..\..\src\msw\penwin.cpp
-       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -7883,9 +7870,6 @@ $(OBJS)\monolib_pen.obj: ..\..\src\msw\pen.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
-$(OBJS)\monolib_penwin.obj: ..\..\src\msw\penwin.cpp
-       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**

diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 30b109fd31e93601a4846648277bdeb318f3809e..9abf92d8d5bfd290cdaeee4391c4ce73d9607210 100644 (file)
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -945,7 +945,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_notebook.o \
        $(OBJS)\monolib_access.o \
        $(OBJS)\monolib_ownerdrw.o \
-       $(OBJS)\monolib_penwin.o \
        $(OBJS)\monolib_printdlg.o \
        $(OBJS)\monolib_printwin.o \
        $(OBJS)\monolib_radiobox.o \
@@ -1329,7 +1328,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_notebook.o \
        $(OBJS)\coredll_access.o \
        $(OBJS)\coredll_ownerdrw.o \
-       $(OBJS)\coredll_penwin.o \
        $(OBJS)\coredll_printdlg.o \
        $(OBJS)\coredll_printwin.o \
        $(OBJS)\coredll_radiobox.o \
@@ -1713,7 +1711,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_notebook.o \
        $(OBJS)\corelib_access.o \
        $(OBJS)\corelib_ownerdrw.o \
-       $(OBJS)\corelib_penwin.o \
        $(OBJS)\corelib_printdlg.o \
        $(OBJS)\corelib_printwin.o \
        $(OBJS)\corelib_radiobox.o \
@@ -2097,7 +2094,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_notebook.o \
        $(OBJS)\monodll_access.o \
        $(OBJS)\monodll_ownerdrw.o \
-       $(OBJS)\monodll_penwin.o \
        $(OBJS)\monodll_printdlg.o \
        $(OBJS)\monodll_printwin.o \
        $(OBJS)\monodll_radiobox.o \
@@ -3962,9 +3958,6 @@ $(OBJS)\coredll_pen.o: ..\..\src\msw\pen.cpp
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
 endif
 
-$(OBJS)\coredll_penwin.o: ..\..\src\msw\penwin.cpp
-       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_popupcmn.o: ..\..\src\common\popupcmn.cpp
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
@@ -5170,9 +5163,6 @@ $(OBJS)\corelib_pen.o: ..\..\src\msw\pen.cpp
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
 endif
 
-$(OBJS)\corelib_penwin.o: ..\..\src\msw\penwin.cpp
-       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_popupcmn.o: ..\..\src\common\popupcmn.cpp
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
@@ -6762,9 +6752,6 @@ $(OBJS)\monodll_pen.o: ..\..\src\msw\pen.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
 endif
 
-$(OBJS)\monodll_penwin.o: ..\..\src\msw\penwin.cpp
-       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_popupcmn.o: ..\..\src\common\popupcmn.cpp
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -8309,9 +8296,6 @@ $(OBJS)\monolib_pen.o: ..\..\src\msw\pen.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 endif
 
-$(OBJS)\monolib_penwin.o: ..\..\src\msw\penwin.cpp
-       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_popupcmn.o: ..\..\src\common\popupcmn.cpp
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 3f0fc58573cb4376949ce750db1984060c8cc485..2517d29b4d554eadfe097c02548c11a529a98b6f 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1280,7 +1280,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_notebook.obj \
        $(OBJS)\monolib_access.obj \
        $(OBJS)\monolib_ownerdrw.obj \
-       $(OBJS)\monolib_penwin.obj \
        $(OBJS)\monolib_printdlg.obj \
        $(OBJS)\monolib_printwin.obj \
        $(OBJS)\monolib_radiobox.obj \
@@ -1660,7 +1659,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_notebook.obj \
        $(OBJS)\coredll_access.obj \
        $(OBJS)\coredll_ownerdrw.obj \
-       $(OBJS)\coredll_penwin.obj \
        $(OBJS)\coredll_printdlg.obj \
        $(OBJS)\coredll_printwin.obj \
        $(OBJS)\coredll_radiobox.obj \
@@ -2040,7 +2038,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_notebook.obj \
        $(OBJS)\corelib_access.obj \
        $(OBJS)\corelib_ownerdrw.obj \
-       $(OBJS)\corelib_penwin.obj \
        $(OBJS)\corelib_printdlg.obj \
        $(OBJS)\corelib_printwin.obj \
        $(OBJS)\corelib_radiobox.obj \
@@ -2420,7 +2417,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_notebook.obj \
        $(OBJS)\monodll_access.obj \
        $(OBJS)\monodll_ownerdrw.obj \
-       $(OBJS)\monodll_penwin.obj \
        $(OBJS)\monodll_printdlg.obj \
        $(OBJS)\monodll_printwin.obj \
        $(OBJS)\monodll_radiobox.obj \
@@ -4396,9 +4392,6 @@ $(OBJS)\coredll_pen.obj: ..\..\src\msw\pen.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
-$(OBJS)\coredll_penwin.obj: ..\..\src\msw\penwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -5504,9 +5497,6 @@ $(OBJS)\corelib_pen.obj: ..\..\src\msw\pen.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
-$(OBJS)\corelib_penwin.obj: ..\..\src\msw\penwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
@@ -6996,9 +6986,6 @@ $(OBJS)\monodll_pen.obj: ..\..\src\msw\pen.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
-$(OBJS)\monodll_penwin.obj: ..\..\src\msw\penwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -8443,9 +8430,6 @@ $(OBJS)\monolib_pen.obj: ..\..\src\msw\pen.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
-$(OBJS)\monolib_penwin.obj: ..\..\src\msw\penwin.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**

diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 5c38aea912839745c96cf13c1b9160a1ac614a68..d44ac1d113cdb3f217631703a4dd36d642b2f95a 100644 (file)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -241,7 +241,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_notebook.obj &
        $(OBJS)\monolib_access.obj &
        $(OBJS)\monolib_ownerdrw.obj &
-       $(OBJS)\monolib_penwin.obj &
        $(OBJS)\monolib_printdlg.obj &
        $(OBJS)\monolib_printwin.obj &
        $(OBJS)\monolib_radiobox.obj &
@@ -626,7 +625,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_notebook.obj &
        $(OBJS)\coredll_access.obj &
        $(OBJS)\coredll_ownerdrw.obj &
-       $(OBJS)\coredll_penwin.obj &
        $(OBJS)\coredll_printdlg.obj &
        $(OBJS)\coredll_printwin.obj &
        $(OBJS)\coredll_radiobox.obj &
@@ -1011,7 +1009,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_notebook.obj &
        $(OBJS)\corelib_access.obj &
        $(OBJS)\corelib_ownerdrw.obj &
-       $(OBJS)\corelib_penwin.obj &
        $(OBJS)\corelib_printdlg.obj &
        $(OBJS)\corelib_printwin.obj &
        $(OBJS)\corelib_radiobox.obj &
@@ -1396,7 +1393,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_notebook.obj &
        $(OBJS)\monodll_access.obj &
        $(OBJS)\monodll_ownerdrw.obj &
-       $(OBJS)\monodll_penwin.obj &
        $(OBJS)\monodll_printdlg.obj &
        $(OBJS)\monodll_printwin.obj &
        $(OBJS)\monodll_radiobox.obj &
@@ -4054,9 +4050,6 @@ $(OBJS)\coredll_pen.obj :  .AUTODEPEND ..\..\src\msw\pen.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
-$(OBJS)\coredll_penwin.obj :  .AUTODEPEND ..\..\src\msw\penwin.cpp
-       $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-
 !ifeq USE_GUI 1
 $(OBJS)\coredll_popupcmn.obj :  .AUTODEPEND ..\..\src\common\popupcmn.cpp
        $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -5262,9 +5255,6 @@ $(OBJS)\corelib_pen.obj :  .AUTODEPEND ..\..\src\msw\pen.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
-$(OBJS)\corelib_penwin.obj :  .AUTODEPEND ..\..\src\msw\penwin.cpp
-       $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-
 !ifeq USE_GUI 1
 $(OBJS)\corelib_popupcmn.obj :  .AUTODEPEND ..\..\src\common\popupcmn.cpp
        $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -6854,9 +6844,6 @@ $(OBJS)\monodll_pen.obj :  .AUTODEPEND ..\..\src\msw\pen.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
-$(OBJS)\monodll_penwin.obj :  .AUTODEPEND ..\..\src\msw\penwin.cpp
-       $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-
 !ifeq USE_GUI 1
 $(OBJS)\monodll_popupcmn.obj :  .AUTODEPEND ..\..\src\common\popupcmn.cpp
        $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -8401,9 +8388,6 @@ $(OBJS)\monolib_pen.obj :  .AUTODEPEND ..\..\src\msw\pen.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
-$(OBJS)\monolib_penwin.obj :  .AUTODEPEND ..\..\src\msw\penwin.cpp
-       $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-
 !ifeq USE_GUI 1
 $(OBJS)\monolib_popupcmn.obj :  .AUTODEPEND ..\..\src\common\popupcmn.cpp
        $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<

diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp
index d430207172c292f57da73c77ae877f3e1cbed8f6..b8fc363359e8507671a27ce1e5759e83154d4eaa 100644 (file)
--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -911,6 +911,14 @@ InputPath=..\include\wx\msw\setup.h
 # PROP Default_Filter ""
 # 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\chkconf.h
 # End Source File
 # Begin Source File
@@ -1091,6 +1099,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\iconloc.h
 # End Source File
 # Begin Source File
@@ -1183,10 +1195,18 @@ SOURCE=..\..\include\wx\process.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\ptr_scpd.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\regex.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\scopeguard.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\snglinst.h
 # End Source File
 # Begin Source File
@@ -1223,6 +1243,10 @@ SOURCE=..\..\include\wx\thread.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\timer.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\tokenzr.h
 # End Source File
 # Begin Source File

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index fedb50e0251458b604565983050933ea62f6bf4d..4cd819b08bd247c1b592c29540c9ca883408a3f8 100644 (file)
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -2742,69 +2742,6 @@ SOURCE=..\..\src\msw\pen.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\msw\penwin.cpp
-
-!IF  "$(CFG)" == "core - Win32 Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Universal Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Debug"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Unicode Release"
-
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\msw\popupwin.cpp
 # End Source File
 # Begin Source File
@@ -7229,7 +7166,7 @@ SOURCE=..\..\src\univ\winuniv.cpp
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\accel.h
+SOURCE=..\..\include\wx\xpmhand.hinclude\wx\msw\accel.h
 # End Source File
 # Begin Source File
 
@@ -7261,6 +7198,10 @@ SOURCE=..\..\include\wx\msw\button.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\msw\gnuwin32\winresrc.hinclude\wx\calctrl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\msw\caret.h
 # End Source File
 # Begin Source File
@@ -7393,6 +7334,10 @@ SOURCE=..\..\include\wx\msw\gdiobj.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\msw\glcanvas.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\msw\helpbest.h
 # End Source File
 # Begin Source File
@@ -7417,6 +7362,10 @@ SOURCE=..\..\include\wx\msw\iniconf.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\msw\joystick.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\msw\listbox.h
 # End Source File
 # Begin Source File
@@ -7557,6 +7506,10 @@ SOURCE=..\..\include\wx\msw\tabctrl.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\msw\taskbar.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\msw\tbar95.h
 # End Source File
 # Begin Source File
@@ -7593,11 +7546,11 @@ SOURCE=..\..\include\wx\msw\ole\uuid.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\window.h
+SOURCE=..\..\include\wx\msw\wave.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\msw\gnuwin32\winresrc.h
+SOURCE=..\..\include\wx\msw\window.h
 # End Source File
 # End Group
 # Begin Group "Generic Headers"
@@ -7609,6 +7562,14 @@ SOURCE=..\..\include\wx\generic\accel.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\xpmhand.hinclude\wx\generic\accel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\calctrl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\generic\choicdgg.h
 # End Source File
 # Begin Source File
@@ -7645,10 +7606,30 @@ SOURCE=..\..\include\wx\generic\fontdlgg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\generic\grid.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\gridctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\gridsel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\helpext.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\generic\imaglist.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\generic\laywin.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\generic\listctrl.h
 # End Source File
 # Begin Source File
@@ -7681,6 +7662,10 @@ SOURCE=..\..\include\wx\generic\progdlgg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\generic\sashwin.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\generic\scrolwin.h
 # End Source File
 # Begin Source File
@@ -7689,6 +7674,10 @@ SOURCE=..\..\include\wx\generic\spinctlg.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\generic\splash.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\generic\splitter.h
 # End Source File
 # Begin Source File
@@ -7711,6 +7700,10 @@ SOURCE=..\..\include\wx\generic\timer.h
 
 SOURCE=..\..\include\wx\generic\treectlg.h
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\wizard.h
+# End Source File
 # End Group
 # Begin Group "wxUniv Headers"
 
@@ -7729,6 +7722,10 @@ SOURCE=..\..\include\wx\univ\button.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\univ\window.hinclude\wx\calctrl.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\univ\checkbox.h
 # End Source File
 # Begin Source File
@@ -7859,9 +7856,65 @@ SOURCE=..\..\include\wx\univ\toolbar.h
 
 SOURCE=..\..\include\wx\univ\toplevel.h
 # End Source File
+# End Group
+# Begin Group "wxHTML Headers"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\include\wx\html\forcelnk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\html\helpctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\html\helpdata.h
+# End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\univ\window.h
+SOURCE=..\..\include\wx\html\helpfrm.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\html\htmlcell.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\html\htmldefs.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\html\htmlfilt.h
+# End Source File
+# Begin Source File
+
+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
+
+SOURCE=..\..\include\wx\html\htmlwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\html\htmprint.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\html\m_templ.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\html\winpars.h
 # End Source File
 # End Group
 # Begin Group "Common Headers"
@@ -7969,10 +8022,30 @@ SOURCE=..\..\include\wx\dataobj.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\db.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dbgrid.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dbkeyg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dbtable.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\dc.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\dcbuffer.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\dcclient.h
 # End Source File
 # Begin Source File
@@ -8097,6 +8170,10 @@ SOURCE=..\..\include\wx\glcanvas.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\grid.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\help.h
 # End Source File
 # Begin Source File
@@ -8113,6 +8190,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
@@ -8165,10 +8246,18 @@ SOURCE=..\..\include\wx\imagxpm.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\joystick.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\layout.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\laywin.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\listbase.h
 # End Source File
 # Begin Source File
@@ -8281,6 +8370,10 @@ SOURCE=..\..\include\wx\renderer.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\sashwin.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\scopeguard.h
 # End Source File
 # Begin Source File
@@ -8317,6 +8410,10 @@ SOURCE=..\..\include\wx\spinctrl.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\splash.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\splitter.h
 # End Source File
 # Begin Source File
@@ -8353,6 +8450,10 @@ SOURCE=..\..\include\wx\tabctrl.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\taskbar.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\tbarbase.h
 # End Source File
 # Begin Source File
@@ -8373,7 +8474,7 @@ SOURCE=..\..\include\wx\tglbtn.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\timer.h
+SOURCE=..\..\include\wx\tipdlg.h
 # End Source File
 # Begin Source File
 
@@ -8425,15 +8526,23 @@ SOURCE=..\..\include\wx\vscroll.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\wave.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\window.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\xpmdecod.h
+SOURCE=..\..\include\wx\wizard.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\wxhtml.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\xpmhand.h
+SOURCE=..\..\include\wx\xpmdecod.h
 # End Source File
 # End Group
 # End Target