]> git.saurik.com Git - wxWidgets.git/blobdiff - build/bakefiles/files.bkl
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
more visible banner after installation
[wxWidgets.git] / build / bakefiles / files.bkl
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index d9f031a353f9e615b56ac5d026b83dff9c2b4d18..f4ef59f44af9166f72e5d2a00afe677ea1576ee1 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -2,6 +2,13 @@
 <!-- $Id$ -->
 <makefile>
 
 <!-- $Id$ -->
 <makefile>
 
+<!--
+
+IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
+
+-->
+
+
 <!-- ======================================================================
                                        FILES
 
 <!-- ======================================================================
                                        FILES
 
@@ -31,7 +38,6 @@
 
 
 
 
 
 
-
 <!-- ====================================================================== -->
 <!--                               wxBase                                   -->
 <!-- ====================================================================== -->
 <!-- ====================================================================== -->
 <!--                               wxBase                                   -->
 <!-- ====================================================================== -->
@@ -39,7 +45,6 @@
 <set var="BASE_UNIX_SRC" hints="files">
     src/unix/baseunix.cpp
     src/unix/dir.cpp
 <set var="BASE_UNIX_SRC" hints="files">
     src/unix/baseunix.cpp
     src/unix/dir.cpp
-    src/unix/gsocket.c
     src/unix/mimetype.cpp
     src/unix/snglinst.cpp
     src/unix/threadpsx.cpp
     src/unix/mimetype.cpp
     src/unix/snglinst.cpp
     src/unix/threadpsx.cpp
@@ -48,14 +53,16 @@
     src/unix/utilsunx.cpp
 </set>
 <set var="BASE_UNIX_HDR" hints="files">
     src/unix/utilsunx.cpp
 </set>
 <set var="BASE_UNIX_HDR" hints="files">
-    wx/unix/gsockunx.h
+    wx/unix/apptbase.h
+    wx/unix/apptrait.h
+    wx/unix/execute.h
     wx/unix/mimetype.h
     wx/unix/mimetype.h
+    wx/unix/pipe.h
 </set>
 
 <set var="BASE_WIN32_SRC" hints="files">
 </set>
 
 <set var="BASE_WIN32_SRC" hints="files">
-    src/msw/gsocket.c
-    src/msw/gsockmsw.c
     src/msw/basemsw.cpp
     src/msw/basemsw.cpp
+    src/msw/crashrpt.cpp
     src/msw/dde.cpp
     src/msw/dir.cpp
     src/msw/mimetype.cpp
     src/msw/dde.cpp
     src/msw/dir.cpp
     src/msw/mimetype.cpp
@@ -65,7 +72,6 @@
     src/msw/thread.cpp
     src/msw/utils.cpp
     src/msw/utilsexc.cpp
     src/msw/thread.cpp
     src/msw/utils.cpp
     src/msw/utilsexc.cpp
-    src/msw/crashrpt.cpp
 </set>
 <set var="BASE_AND_GUI_WIN32_SRC" hints="files">
     src/msw/main.cpp
 </set>
 <set var="BASE_AND_GUI_WIN32_SRC" hints="files">
     src/msw/main.cpp
@@ -73,19 +79,21 @@
     src/msw/volume.cpp
 </set>
 <set var="BASE_WIN32_HDR" hints="files">
     src/msw/volume.cpp
 </set>
 <set var="BASE_WIN32_HDR" hints="files">
+    wx/msw/apptrait.h
+    wx/msw/apptbase.h
+    wx/msw/chkconf.h
+    wx/msw/crashrpt.h
     wx/msw/dde.h
     wx/msw/gccpriv.h
     wx/msw/mimetype.h
     wx/msw/winundef.h
     wx/msw/dde.h
     wx/msw/gccpriv.h
     wx/msw/mimetype.h
     wx/msw/winundef.h
+    wx/msw/wrapcctl.h
     wx/msw/wrapwin.h
     wx/msw/wrapwin.h
-    wx/msw/chkconf.h
-    wx/msw/crashrpt.h
 </set>
 
 <set var="BASE_DARWIN_SRC" hints="files">
     src/unix/baseunix.cpp
     src/unix/dir.cpp
 </set>
 
 <set var="BASE_DARWIN_SRC" hints="files">
     src/unix/baseunix.cpp
     src/unix/dir.cpp
-    src/unix/gsocket.c
     src/unix/mimetype.cpp
     src/unix/snglinst.cpp
     src/unix/threadpsx.cpp
     src/unix/mimetype.cpp
     src/unix/snglinst.cpp
     src/unix/threadpsx.cpp
@@ -97,13 +105,16 @@
 </set>
 
 <set var="BASE_MAC_SRC" hints="files">
 </set>
 
 <set var="BASE_MAC_SRC" hints="files">
-    src/unix/baseunix.cpp
     src/mac/dirmac.cpp
     src/mac/dirmac.cpp
-    src/mac/gsocket.c
     src/mac/mimetmac.cpp
     src/mac/mimetmac.cpp
-    src/mac/utils.cpp
+    src/unix/baseunix.cpp
     src/mac/utilsexc.cpp
 </set>
     src/mac/utilsexc.cpp
 </set>
+
+<set var="BASE_AND_GUI_MAC_SRC" hints="files">
+    src/mac/utils.cpp
+</set>
+
 <set var="BASE_MAC_HDR" hints="files">
 </set>
 
 <set var="BASE_MAC_HDR" hints="files">
 </set>
 
@@ -124,8 +135,6 @@
     src/common/config.cpp
     src/common/datetime.cpp
     src/common/datstrm.cpp
     src/common/config.cpp
     src/common/datetime.cpp
     src/common/datstrm.cpp
-    src/common/db.cpp
-    src/common/dbtable.cpp
     src/common/dircmn.cpp
     src/common/dynarray.cpp
     src/common/dynlib.cpp
     src/common/dircmn.cpp
     src/common/dynarray.cpp
     src/common/dynlib.cpp
@@ -139,12 +148,9 @@
     src/common/filename.cpp
     src/common/filesys.cpp
     src/common/fmapbase.cpp
     src/common/filename.cpp
     src/common/filesys.cpp
     src/common/fmapbase.cpp
-    src/common/fs_inet.cpp
     src/common/fs_zip.cpp
     src/common/fs_zip.cpp
-    src/common/ftp.cpp
     src/common/hash.cpp
     src/common/hashmap.cpp
     src/common/hash.cpp
     src/common/hashmap.cpp
-    src/common/http.cpp
     src/common/init.cpp
     src/common/intl.cpp
     src/common/ipcbase.cpp
     src/common/init.cpp
     src/common/intl.cpp
     src/common/ipcbase.cpp
@@ -157,13 +163,7 @@
     src/common/mstream.cpp
     src/common/object.cpp
     src/common/process.cpp
     src/common/mstream.cpp
     src/common/object.cpp
     src/common/process.cpp
-    src/common/protocol.cpp
     src/common/regex.cpp
     src/common/regex.cpp
-    src/common/sckaddr.cpp
-    src/common/sckfile.cpp
-    src/common/sckipc.cpp
-    src/common/sckstrm.cpp
-    src/common/socket.cpp
     src/common/stopwatch.cpp
     src/common/strconv.cpp
     src/common/stream.cpp
     src/common/stopwatch.cpp
     src/common/strconv.cpp
     src/common/stream.cpp
@@ -174,7 +174,6 @@
     src/common/tokenzr.cpp
     src/common/txtstrm.cpp
     src/common/unzip.c
     src/common/tokenzr.cpp
     src/common/txtstrm.cpp
     src/common/unzip.c
-    src/common/url.cpp
     src/common/variant.cpp
     src/common/wfstream.cpp
     src/common/wxchar.cpp
     src/common/variant.cpp
     src/common/wfstream.cpp
     src/common/wxchar.cpp
@@ -188,15 +187,12 @@
     src/common/utilscmn.cpp
 </set>
 <set var="BASE_CMN_HDR" hints="files">
     src/common/utilscmn.cpp
 </set>
 <set var="BASE_CMN_HDR" hints="files">
+    wx/afterstd.h
+    wx/app.h
     wx/apptrait.h
     wx/apptrait.h
-    wx/beforestd.h
-    wx/containr.h
-    wx/msgout.h
-    wx/types.h
-    wx/init.h
     wx/arrimpl.cpp
     wx/arrimpl.cpp
-    wx/listimpl.cpp
-    wx/app.h
+    wx/arrstr.h
+    wx/beforestd.h
     wx/buffer.h
     wx/build.h
     wx/chkconf.h
     wx/buffer.h
     wx/build.h
     wx/chkconf.h
@@ -204,18 +200,15 @@
     wx/cmdline.h
     wx/confbase.h
     wx/config.h
     wx/cmdline.h
     wx/confbase.h
     wx/config.h
+    wx/containr.h
     wx/datetime.h
     wx/datetime.inl
     wx/datstrm.h
     wx/datetime.h
     wx/datetime.inl
     wx/datstrm.h
-    wx/db.h
-    wx/dbkeyg.h
-    wx/dbtable.h
     wx/dde.h
     wx/debug.h
     wx/defs.h
     wx/dir.h
     wx/dynarray.h
     wx/dde.h
     wx/debug.h
     wx/defs.h
     wx/dir.h
     wx/dynarray.h
-    wx/arrstr.h
     wx/dynlib.h
     wx/dynload.h
     wx/encconv.h
     wx/dynlib.h
     wx/dynload.h
     wx/encconv.h
@@ -229,13 +222,13 @@
     wx/filesys.h
     wx/fontenc.h
     wx/fontmap.h
     wx/filesys.h
     wx/fontenc.h
     wx/fontmap.h
-    wx/fs_inet.h
-    wx/fs_zip.h
     wx/fs_mem.h
     wx/fs_mem.h
-    wx/gsocket.h
+    wx/fs_zip.h
     wx/hash.h
     wx/hashmap.h
     wx/hash.h
     wx/hashmap.h
+    wx/hashset.h
     wx/iconloc.h
     wx/iconloc.h
+    wx/init.h
     wx/intl.h
     wx/iosfwrap.h
     wx/ioswrap.h
     wx/intl.h
     wx/iosfwrap.h
     wx/ioswrap.h
@@ -244,24 +237,24 @@
     wx/isql.h
     wx/isqlext.h
     wx/list.h
     wx/isql.h
     wx/isqlext.h
     wx/list.h
+    wx/listimpl.cpp
     wx/log.h
     wx/longlong.h
     wx/math.h
     wx/log.h
     wx/longlong.h
     wx/math.h
-    wx/memory.h
     wx/memconf.h
     wx/memconf.h
+    wx/memory.h
     wx/memtext.h
     wx/mimetype.h
     wx/module.h
     wx/msgout.h
     wx/memtext.h
     wx/mimetype.h
     wx/module.h
     wx/msgout.h
+    wx/msgout.h
     wx/mstream.h
     wx/object.h
     wx/platform.h
     wx/process.h
     wx/mstream.h
     wx/object.h
     wx/platform.h
     wx/process.h
+    wx/ptr_scpd.h
     wx/regex.h
     wx/regex.h
-    wx/sckaddr.h
-    wx/sckipc.h
-    wx/sckstrm.h
-    wx/socket.h
+    wx/scopeguard.h
     wx/snglinst.h
     wx/stopwatch.h
     wx/strconv.h
     wx/snglinst.h
     wx/stopwatch.h
     wx/strconv.h
@@ -272,9 +265,10 @@
     wx/textfile.h
     wx/thread.h
     wx/thrimpl.cpp
     wx/textfile.h
     wx/thread.h
     wx/thrimpl.cpp
+    wx/timer.h
     wx/tokenzr.h
     wx/txtstrm.h
     wx/tokenzr.h
     wx/txtstrm.h
-    wx/url.h
+    wx/types.h
     wx/utils.h
     wx/variant.h
     wx/vector.h
     wx/utils.h
     wx/variant.h
     wx/vector.h
@@ -286,8 +280,70 @@
     wx/wxprec.h
     wx/zipstrm.h
     wx/zstream.h
     wx/wxprec.h
     wx/zipstrm.h
     wx/zstream.h
-    wx/protocol/protocol.h
+</set>
+
+
+<!-- ====================================================================== -->
+<!--                          wxNet (part of wxBase)                        -->
+<!-- ====================================================================== -->
+
+<set var="NET_UNIX_SRC" hints="files">
+    src/unix/gsocket.c
+</set>
+<set var="NET_UNIX_HDR" hints="files">
+    wx/unix/gsockunx.h
+</set>
+
+<set var="NET_WIN32_SRC" hints="files">
+    src/msw/gsocket.c
+</set>
+<set var="NET_WIN32_HDR" hints="files">
+    wx/msw/gsockmsw.h
+</set>
+
+<set var="NET_DARWIN_SRC" hints="files">
+    src/unix/gsocket.c
+</set>
+<set var="NET_DARWIN_HDR" hints="files">
+    wx/unix/gsockunx.h
+</set>
+
+<set var="NET_MAC_SRC" hints="files">
+    src/mac/gsocket.c
+</set>
+<set var="NET_MAC_HDR" hints="files">
+    wx/mac/gsockmac.h
+</set>
+
+<set var="NET_OS2_SRC" hints="files">
+</set>
+<set var="NET_OS2_HDR" hints="files">
+</set>
+
+<set var="NET_CMN_SRC" hints="files">
+    src/common/fs_inet.cpp
+    src/common/ftp.cpp
+    src/common/http.cpp
+    src/common/protocol.cpp
+    src/common/sckaddr.cpp
+    src/common/sckfile.cpp
+    src/common/sckipc.cpp
+    src/common/sckstrm.cpp
+    src/common/socket.cpp
+    src/common/url.cpp
+</set>
+<set var="NET_CMN_HDR" hints="files">
+    wx/fs_inet.h
+    wx/gsocket.h
+    wx/protocol/file.h
+    wx/protocol/ftp.h
     wx/protocol/http.h
     wx/protocol/http.h
+    wx/protocol/protocol.h
+    wx/sckaddr.h
+    wx/sckipc.h
+    wx/sckstrm.h
+    wx/socket.h
+    wx/url.h
 </set>
 
 
 </set>
 
 
@@ -297,40 +353,8 @@
 <!-- ====================================================================== -->
 
 <set var="GUI_CMN_SRC" hints="files">
 <!-- ====================================================================== -->
 
 <set var="GUI_CMN_SRC" hints="files">
-    src/generic/busyinfo.cpp
-    src/generic/calctrl.cpp
-    src/generic/choicdgg.cpp
-    src/generic/dcbuffer.cpp
-    src/generic/dcpsg.cpp
-    src/generic/dirctrlg.cpp
-    src/generic/dragimgg.cpp
-    src/generic/grid.cpp
-    src/generic/gridctrl.cpp
-    src/generic/gridsel.cpp
-    src/generic/helpext.cpp
-    src/generic/laywin.cpp
-    src/generic/logg.cpp
-    src/generic/numdlgg.cpp
-    src/generic/panelg.cpp
-    src/generic/progdlgg.cpp
-    src/generic/renderg.cpp
-    src/generic/sashwin.cpp
-    src/generic/scrlwing.cpp
-    src/generic/selstore.cpp
-    src/generic/spinctlg.cpp
-    src/generic/splash.cpp
-    src/generic/splitter.cpp
-    src/generic/tbarsmpl.cpp
-    src/generic/textdlgg.cpp
-    src/generic/tipdlg.cpp
-    src/generic/tipwin.cpp
-    src/generic/treectlg.cpp
-    src/generic/vlbox.cpp
-    src/generic/vscroll.cpp
-    src/generic/wizard.cpp
-    src/common/appcmn.cpp
-    src/common/fontmap.cpp
     src/common/accesscmn.cpp
     src/common/accesscmn.cpp
+    src/common/appcmn.cpp
     src/common/artprov.cpp
     src/common/artstd.cpp
     src/common/bmpbase.cpp
     src/common/artprov.cpp
     src/common/artstd.cpp
     src/common/bmpbase.cpp
@@ -343,7 +367,6 @@
     src/common/ctrlcmn.cpp
     src/common/ctrlsub.cpp
     src/common/datacmn.cpp
     src/common/ctrlcmn.cpp
     src/common/ctrlsub.cpp
     src/common/datacmn.cpp
-    src/common/dbgrid.cpp
     src/common/dcbase.cpp
     src/common/dlgcmn.cpp
     src/common/dndcmn.cpp
     src/common/dcbase.cpp
     src/common/dlgcmn.cpp
     src/common/dndcmn.cpp
@@ -356,9 +379,8 @@
     src/common/fddlgcmn.cpp
     src/common/fldlgcmn.cpp
     src/common/fontcmn.cpp
     src/common/fddlgcmn.cpp
     src/common/fldlgcmn.cpp
     src/common/fontcmn.cpp
+    src/common/fontmap.cpp
     src/common/framecmn.cpp
     src/common/framecmn.cpp
-    src/common/timercmn.cpp
-    src/common/toplvcmn.cpp
     src/common/gaugecmn.cpp
     src/common/gdicmn.cpp
     src/common/geometry.cpp
     src/common/gaugecmn.cpp
     src/common/gdicmn.cpp
     src/common/geometry.cpp
@@ -368,6 +390,7 @@
     src/common/imagall.cpp
     src/common/imagbmp.cpp
     src/common/image.cpp
     src/common/imagall.cpp
     src/common/imagbmp.cpp
     src/common/image.cpp
+    src/common/imagfill.cpp
     src/common/imaggif.cpp
     src/common/imagiff.cpp
     src/common/imagjpeg.cpp
     src/common/imaggif.cpp
     src/common/imagiff.cpp
     src/common/imagjpeg.cpp
@@ -376,7 +399,6 @@
     src/common/imagpnm.cpp
     src/common/imagtiff.cpp
     src/common/imagxpm.cpp
     src/common/imagpnm.cpp
     src/common/imagtiff.cpp
     src/common/imagxpm.cpp
-    src/common/imagfill.cpp
     src/common/layout.cpp
     src/common/lboxcmn.cpp
     src/common/matrix.cpp
     src/common/layout.cpp
     src/common/lboxcmn.cpp
     src/common/matrix.cpp
@@ -387,111 +409,125 @@
     src/common/prntbase.cpp
     src/common/quantize.cpp
     src/common/radiocmn.cpp
     src/common/prntbase.cpp
     src/common/quantize.cpp
     src/common/radiocmn.cpp
+    src/common/rendcmn.cpp
     src/common/rgncmn.cpp
     src/common/settcmn.cpp
     src/common/sizer.cpp
     src/common/statbar.cpp
     src/common/tbarbase.cpp
     src/common/textcmn.cpp
     src/common/rgncmn.cpp
     src/common/settcmn.cpp
     src/common/sizer.cpp
     src/common/statbar.cpp
     src/common/tbarbase.cpp
     src/common/textcmn.cpp
+    src/common/timercmn.cpp
+    src/common/toplvcmn.cpp
     src/common/treebase.cpp
     src/common/valgen.cpp
     src/common/validate.cpp
     src/common/valtext.cpp
     src/common/wincmn.cpp
     src/common/xpmdecod.cpp
     src/common/treebase.cpp
     src/common/valgen.cpp
     src/common/validate.cpp
     src/common/valtext.cpp
     src/common/wincmn.cpp
     src/common/xpmdecod.cpp
+    src/generic/busyinfo.cpp
+    src/generic/choicdgg.cpp
+    src/generic/dcpsg.cpp
+    src/generic/dirctrlg.cpp
+    src/generic/dragimgg.cpp
+    src/generic/logg.cpp
+    src/generic/numdlgg.cpp
+    src/generic/panelg.cpp
+    src/generic/progdlgg.cpp
+    src/generic/printps.cpp
+    src/generic/renderg.cpp
+    src/generic/scrlwing.cpp
+    src/generic/selstore.cpp
+    src/generic/spinctlg.cpp
+    src/generic/splitter.cpp
+    src/generic/textdlgg.cpp
+    src/generic/tipwin.cpp
+    src/generic/treectlg.cpp
+    src/generic/vlbox.cpp
+    src/generic/vscroll.cpp
 </set>
 <set var="GUI_CMN_HDR" hints="files">
 </set>
 <set var="GUI_CMN_HDR" hints="files">
-    wx/gdicmn.h
+    wx/bmpbuttn.h
+    wx/brush.h
+    wx/button.h
+    wx/checkbox.h
+    wx/checklst.h
+    wx/choicdlg.h
+    wx/choice.h
+    wx/cmndata.h
+    wx/combobox.h
+    wx/control.h
+    wx/ctrlsub.h
     wx/cursor.h
     wx/cursor.h
-    wx/window.h
-    wx/panel.h
-    wx/frame.h
     wx/dc.h
     wx/dcclient.h
     wx/dcmemory.h
     wx/dcprint.h
     wx/dcscreen.h
     wx/dc.h
     wx/dcclient.h
     wx/dcmemory.h
     wx/dcprint.h
     wx/dcscreen.h
-    wx/button.h
-    wx/menu.h
-    wx/pen.h
-    wx/brush.h
-    wx/palette.h
-    wx/icon.h
     wx/dialog.h
     wx/dialog.h
-    wx/timer.h
-    wx/settings.h
-    wx/msgdlg.h
-    wx/cmndata.h
-    wx/control.h
-    wx/ctrlsub.h
-    wx/bmpbuttn.h
-    wx/checkbox.h
-    wx/checklst.h
-    wx/choice.h
-    wx/scrolbar.h
-    wx/stattext.h
-    wx/statbmp.h
-    wx/statbox.h
-    wx/listbox.h
-    wx/radiobox.h
-    wx/radiobut.h
-    wx/renderer.h
-    wx/textctrl.h
-    wx/slider.h
-    wx/gauge.h
-    wx/scrolwin.h
     wx/dirdlg.h
     wx/dirdlg.h
-    wx/toolbar.h
-    wx/combobox.h
-    wx/layout.h
-    wx/sizer.h
-    wx/mdi.h
-    wx/statusbr.h
-    wx/scrolbar.h
-    wx/choicdlg.h
-    wx/textdlg.h
+    wx/dragimag.h
     wx/filedlg.h
     wx/filedlg.h
-    wx/validate.h
-    wx/valtext.h
-    wx/selstore.h
+    wx/frame.h
+    wx/gauge.h
+    wx/gdicmn.h
     wx/generic/accel.h
     wx/generic/accel.h
-    wx/generic/calctrl.h
     wx/generic/choicdgg.h
     wx/generic/colrdlgg.h
     wx/generic/dcpsg.h
     wx/generic/dirctrlg.h
     wx/generic/choicdgg.h
     wx/generic/colrdlgg.h
     wx/generic/dcpsg.h
     wx/generic/dirctrlg.h
-    wx/generic/fontdlgg.h
+    wx/generic/dragimgg.h
     wx/generic/filedlgg.h
     wx/generic/filedlgg.h
-    wx/generic/grid.h
-    wx/generic/gridctrl.h
-    wx/generic/grid.h
-    wx/generic/helpext.h
-    wx/generic/logg.h
-    wx/helphtml.h
+    wx/generic/fontdlgg.h
     wx/generic/imaglist.h
     wx/generic/imaglist.h
-    wx/generic/laywin.h
+    wx/generic/logg.h
     wx/generic/msgdlgg.h
     wx/generic/notebook.h
     wx/generic/panelg.h
     wx/generic/prntdlgg.h
     wx/generic/msgdlgg.h
     wx/generic/notebook.h
     wx/generic/panelg.h
     wx/generic/prntdlgg.h
+    wx/generic/printps.h
     wx/generic/progdlgg.h
     wx/generic/progdlgg.h
-    wx/generic/sashwin.h
     wx/generic/scrolwin.h
     wx/generic/spinctlg.h
     wx/generic/scrolwin.h
     wx/generic/spinctlg.h
-    wx/generic/splash.h
     wx/generic/splitter.h
     wx/generic/textdlgg.h
     wx/generic/timer.h
     wx/generic/splitter.h
     wx/generic/textdlgg.h
     wx/generic/timer.h
-    wx/generic/wizard.h
     wx/generic/treectlg.h
     wx/generic/treectlg.h
+    wx/helphtml.h
+    wx/icon.h
+    wx/layout.h
+    wx/listbox.h
+    wx/mdi.h
+    wx/menu.h
+    wx/msgdlg.h
+    wx/palette.h
+    wx/panel.h
+    wx/pen.h
+    wx/radiobox.h
+    wx/radiobut.h
+    wx/renderer.h
+    wx/scrolbar.h
+    wx/scrolbar.h
+    wx/scrolwin.h
+    wx/selstore.h
+    wx/settings.h
+    wx/sizer.h
+    wx/slider.h
+    wx/statbmp.h
+    wx/statbox.h
+    wx/stattext.h
+    wx/statusbr.h
+    wx/textctrl.h
+    wx/textdlg.h
+    wx/toolbar.h
+    wx/validate.h
+    wx/valtext.h
+    wx/window.h
 
     wx/accel.h
     wx/access.h
 
     wx/accel.h
     wx/access.h
-    wx/afterstd.h
     wx/artprov.h
     wx/bitmap.h
     wx/busyinfo.h
     wx/artprov.h
     wx/bitmap.h
     wx/busyinfo.h
-    wx/calctrl.h
     wx/caret.h
     wx/clipbrd.h
     wx/cmdproc.h
     wx/caret.h
     wx/clipbrd.h
     wx/cmdproc.h
@@ -499,8 +535,6 @@
     wx/colour.h
     wx/cshelp.h
     wx/dataobj.h
     wx/colour.h
     wx/cshelp.h
     wx/dataobj.h
-    wx/dbgrid.h
-    wx/dcbuffer.h
     wx/dcmirror.h
     wx/dcps.h
     wx/dialup.h
     wx/dcmirror.h
     wx/dcps.h
     wx/dialup.h
@@ -509,7 +543,6 @@
     wx/dnd.h
     wx/docmdi.h
     wx/docview.h
     wx/dnd.h
     wx/docmdi.h
     wx/docview.h
-    wx/dragimag.h
     wx/effects.h
     wx/evtloop.h
     wx/fdrepdlg.h
     wx/effects.h
     wx/evtloop.h
     wx/fdrepdlg.h
@@ -522,7 +555,6 @@
     wx/geometry.h
     wx/gifdecod.h
     wx/glcanvas.h
     wx/geometry.h
     wx/gifdecod.h
     wx/glcanvas.h
-    wx/grid.h
     wx/help.h
     wx/helpbase.h
     wx/helpwin.h
     wx/help.h
     wx/helpbase.h
     wx/helpwin.h
@@ -538,8 +570,6 @@
     wx/imagpnm.h
     wx/imagtiff.h
     wx/imagxpm.h
     wx/imagpnm.h
     wx/imagtiff.h
     wx/imagxpm.h
-    wx/joystick.h
-    wx/laywin.h
     wx/listbase.h
     wx/listctrl.h
     wx/matrix.h
     wx/listbase.h
     wx/listctrl.h
     wx/matrix.h
@@ -558,21 +588,16 @@
     wx/quantize.h
     wx/rawbmp.h
     wx/region.h
     wx/quantize.h
     wx/rawbmp.h
     wx/region.h
-    wx/sashwin.h
     wx/scopeguard.h
     wx/spinbutt.h
     wx/spinctrl.h
     wx/scopeguard.h
     wx/spinbutt.h
     wx/spinctrl.h
-    wx/splash.h
     wx/splitter.h
     wx/stack.h
     wx/statline.h
     wx/tab.h
     wx/tabctrl.h
     wx/splitter.h
     wx/stack.h
     wx/statline.h
     wx/tab.h
     wx/tabctrl.h
-    wx/taskbar.h
     wx/tbarbase.h
     wx/tbarbase.h
-    wx/tbarsmpl.h
     wx/tglbtn.h
     wx/tglbtn.h
-    wx/tipdlg.h
     wx/tipwin.h
     wx/tooltip.h
     wx/toplevel.h
     wx/tipwin.h
     wx/tooltip.h
     wx/toplevel.h
@@ -582,14 +607,8 @@
     wx/vlbox.h
     wx/vms_x_fix.h
     wx/vscroll.h
     wx/vlbox.h
     wx/vms_x_fix.h
     wx/vscroll.h
-    wx/wave.h
-    wx/wizard.h
     wx/xpmdecod.h
     wx/xpmhand.h
     wx/xpmdecod.h
     wx/xpmhand.h
-
-    wx/generic/dragimgg.h
-    wx/generic/gridsel.h
-
 </set>
 
 
 </set>
 
 
@@ -598,21 +617,16 @@
 <!-- ====================================================================== -->
 
 <set var="XWIN_LOWLEVEL_SRC" hints="files">
 <!-- ====================================================================== -->
 
 <set var="XWIN_LOWLEVEL_SRC" hints="files">
+    src/generic/caret.cpp
+    src/unix/dialup.cpp
     src/unix/fontenum.cpp
     src/unix/fontutil.cpp
     src/unix/utilsx11.cpp
     src/unix/fontenum.cpp
     src/unix/fontutil.cpp
     src/unix/utilsx11.cpp
-    src/common/taskbarcmn.cpp
-    src/unix/taskbarx11.cpp
-    src/generic/printps.cpp
-    src/generic/caret.cpp
-    src/unix/dialup.cpp
 </set>
 <set var="XWIN_LOWLEVEL_HDR" hints="files">
 </set>
 <set var="XWIN_LOWLEVEL_HDR" hints="files">
+    wx/generic/caret.h
     wx/unix/fontutil.h
     wx/unix/utilsx11.h
     wx/unix/fontutil.h
     wx/unix/utilsx11.h
-    wx/unix/taskbarx11.h
-    wx/generic/printps.h
-    wx/generic/caret.h
 </set>
 
 
 </set>
 
 
@@ -622,8 +636,7 @@
 
 <set var="GTK_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)
 
 <set var="GTK_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)
-    src/gtk/gsockgtk.c
-    src/gtk/win_gtk.c
+    src/generic/paletteg.cpp
     src/gtk/app.cpp
     src/gtk/bitmap.cpp
     src/gtk/brush.cpp
     src/gtk/app.cpp
     src/gtk/bitmap.cpp
     src/gtk/brush.cpp
@@ -639,19 +652,21 @@
     src/gtk/dnd.cpp
     src/gtk/evtloop.cpp
     src/gtk/font.cpp
     src/gtk/dnd.cpp
     src/gtk/evtloop.cpp
     src/gtk/font.cpp
-    src/gtk/toplevel.cpp
     src/gtk/gdiobj.cpp
     src/gtk/gdiobj.cpp
+    src/gtk/gsockgtk.c
     src/gtk/icon.cpp
     src/gtk/main.cpp
     src/gtk/pen.cpp
     src/gtk/popupwin.cpp
     src/gtk/region.cpp
     src/gtk/icon.cpp
     src/gtk/main.cpp
     src/gtk/pen.cpp
     src/gtk/popupwin.cpp
     src/gtk/region.cpp
+    src/gtk/renderer.cpp
     src/gtk/settings.cpp
     src/gtk/timer.cpp
     src/gtk/tooltip.cpp
     src/gtk/settings.cpp
     src/gtk/timer.cpp
     src/gtk/tooltip.cpp
+    src/gtk/toplevel.cpp
     src/gtk/utilsgtk.cpp
     src/gtk/utilsgtk.cpp
+    src/gtk/win_gtk.c
     src/gtk/window.cpp
     src/gtk/window.cpp
-    src/generic/paletteg.cpp
 </set>
 <set var="GTK_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
 </set>
 <set var="GTK_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
@@ -659,17 +674,17 @@
 </set>
 <set var="GTK_SRC" hints="files">
     <!-- Generic implementations used by wxGTK: -->
 </set>
 <set var="GTK_SRC" hints="files">
     <!-- Generic implementations used by wxGTK: -->
-    src/generic/imaglist.cpp
+    src/generic/accel.cpp
     src/generic/colrdlgg.cpp
     src/generic/colrdlgg.cpp
-    src/generic/listctrl.cpp
-    src/generic/filedlgg.cpp
     src/generic/dirdlgg.cpp
     src/generic/dirdlgg.cpp
-    src/generic/prntdlgg.cpp
-    src/generic/accel.cpp
-    src/generic/msgdlgg.cpp
     src/generic/fdrepdlg.cpp
     src/generic/fdrepdlg.cpp
-    src/generic/tabg.cpp
+    src/generic/filedlgg.cpp
+    src/generic/imaglist.cpp
+    src/generic/listctrl.cpp
+    src/generic/msgdlgg.cpp
+    src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
     src/generic/statusbr.cpp
+    src/generic/tabg.cpp
     <!-- GTK+ specific files: -->
     src/gtk/bmpbuttn.cpp
     src/gtk/button.cpp
     <!-- GTK+ specific files: -->
     src/gtk/bmpbuttn.cpp
     src/gtk/button.cpp
@@ -682,7 +697,6 @@
     src/gtk/fontdlg.cpp
     src/gtk/frame.cpp
     src/gtk/gauge.cpp
     src/gtk/fontdlg.cpp
     src/gtk/frame.cpp
     src/gtk/gauge.cpp
-    src/gtk/joystick.cpp
     src/gtk/listbox.cpp
     src/gtk/mdi.cpp
     src/gtk/menu.cpp
     src/gtk/listbox.cpp
     src/gtk/mdi.cpp
     src/gtk/menu.cpp
@@ -691,7 +705,6 @@
     src/gtk/notebook.cpp
     src/gtk/radiobox.cpp
     src/gtk/radiobut.cpp
     src/gtk/notebook.cpp
     src/gtk/radiobox.cpp
     src/gtk/radiobut.cpp
-    src/gtk/renderer.cpp
     src/gtk/scrolbar.cpp
     src/gtk/scrolwin.cpp
     src/gtk/slider.cpp
     src/gtk/scrolbar.cpp
     src/gtk/scrolwin.cpp
     src/gtk/slider.cpp
@@ -705,9 +718,13 @@
     src/gtk/textctrl.cpp
     src/gtk/tglbtn.cpp
     src/gtk/utilsres.cpp
     src/gtk/textctrl.cpp
     src/gtk/tglbtn.cpp
     src/gtk/utilsres.cpp
-    src/gtk/wave.cpp
 </set>
 <set var="GTK_HDR" hints="files">
 </set>
 <set var="GTK_HDR" hints="files">
+    wx/generic/dirdlgg.h
+    wx/generic/fdrepdlg.h
+    wx/generic/listctrl.h
+    wx/generic/statusbr.h
+    wx/generic/tabg.h
     wx/gtk/accel.h
     wx/gtk/app.h
     wx/gtk/bitmap.h
     wx/gtk/accel.h
     wx/gtk/app.h
     wx/gtk/bitmap.h
@@ -735,11 +752,9 @@
     wx/gtk/font.h
     wx/gtk/fontdlg.h
     wx/gtk/frame.h
     wx/gtk/font.h
     wx/gtk/fontdlg.h
     wx/gtk/frame.h
-    wx/gtk/toplevel.h
     wx/gtk/gauge.h
     wx/gtk/gdiobj.h
     wx/gtk/icon.h
     wx/gtk/gauge.h
     wx/gtk/gdiobj.h
     wx/gtk/icon.h
-    wx/gtk/joystick.h
     wx/gtk/listbox.h
     wx/gtk/mdi.h
     wx/gtk/menu.h
     wx/gtk/listbox.h
     wx/gtk/mdi.h
     wx/gtk/menu.h
@@ -766,15 +781,10 @@
     wx/gtk/tglbtn.h
     wx/gtk/timer.h
     wx/gtk/tooltip.h
     wx/gtk/tglbtn.h
     wx/gtk/timer.h
     wx/gtk/tooltip.h
+    wx/gtk/toplevel.h
     wx/gtk/treectrl.h
     wx/gtk/treectrl.h
-    wx/gtk/wave.h
     wx/gtk/win_gtk.h
     wx/gtk/window.h
     wx/gtk/win_gtk.h
     wx/gtk/window.h
-    wx/generic/fdrepdlg.h
-    wx/generic/tabg.h
-    wx/generic/dirdlgg.h
-    wx/generic/statusbr.h
-    wx/generic/listctrl.h
 </set>
 
 
 </set>
 
 
@@ -784,17 +794,16 @@
 
 <set var="MOTIF_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)
 
 <set var="MOTIF_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)
-    src/x11/region.cpp
-    src/x11/pen.cpp
-    src/x11/brush.cpp
     src/x11/bitmap.cpp
     src/x11/bitmap.cpp
+    src/x11/brush.cpp
+    src/x11/pen.cpp
+    src/x11/region.cpp
     src/x11/utilsx.cpp
 </set>
 <set var="MOTIF_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
 </set>
 <set var="MOTIF_SRC" hints="files">
     src/x11/utilsx.cpp
 </set>
 <set var="MOTIF_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
 </set>
 <set var="MOTIF_SRC" hints="files">
-    src/motif/gsockmot.c
     src/motif/accel.cpp
     src/motif/app.cpp
     src/motif/bmpbuttn.cpp
     src/motif/accel.cpp
     src/motif/app.cpp
     src/motif/bmpbuttn.cpp
@@ -822,6 +831,7 @@
     src/motif/frame.cpp
     src/motif/gauge.cpp
     src/motif/gdiobj.cpp
     src/motif/frame.cpp
     src/motif/gauge.cpp
     src/motif/gdiobj.cpp
+    src/motif/gsockmot.c
     src/motif/icon.cpp
     src/motif/listbox.cpp
     src/motif/main.cpp
     src/motif/icon.cpp
     src/motif/listbox.cpp
     src/motif/main.cpp
@@ -840,26 +850,37 @@
     src/motif/statbmp.cpp
     src/motif/statbox.cpp
     src/motif/stattext.cpp
     src/motif/statbmp.cpp
     src/motif/statbox.cpp
     src/motif/stattext.cpp
-    src/motif/toolbar.cpp
     src/motif/textctrl.cpp
     src/motif/timer.cpp
     src/motif/textctrl.cpp
     src/motif/timer.cpp
+    src/motif/toolbar.cpp
     src/motif/toplevel.cpp
     src/motif/utils.cpp
     src/motif/window.cpp
     <!-- Generic files used by wxMotif: -->
     src/motif/toplevel.cpp
     src/motif/utils.cpp
     src/motif/window.cpp
     <!-- Generic files used by wxMotif: -->
+    src/generic/colrdlgg.cpp
+    src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp
     src/generic/fdrepdlg.cpp
-    src/generic/listctrl.cpp
+    src/generic/fontdlgg.cpp
     src/generic/imaglist.cpp
     src/generic/imaglist.cpp
+    src/generic/listctrl.cpp
     src/generic/notebook.cpp
     src/generic/notebook.cpp
-    src/generic/fontdlgg.cpp
-    src/generic/colrdlgg.cpp
-    src/generic/statline.cpp
-    src/generic/tabg.cpp
-    src/generic/dirdlgg.cpp
     src/generic/prntdlgg.cpp
     src/generic/prntdlgg.cpp
+    src/generic/statline.cpp
     src/generic/statusbr.cpp
     src/generic/statusbr.cpp
+    src/generic/tabg.cpp
 </set>
 <set var="MOTIF_HDR" hints="files">
 </set>
 <set var="MOTIF_HDR" hints="files">
+    wx/generic/colrdlgg.h
+    wx/generic/dirdlgg.h
+    wx/generic/fdrepdlg.h
+    wx/generic/fontdlgg.h
+    wx/generic/imaglist.h
+    wx/generic/listctrl.h
+    wx/generic/notebook.h
+    wx/generic/prntdlgg.h
+    wx/generic/statline.h
+    wx/generic/statusbr.h
+    wx/generic/tabg.h
     wx/motif/accel.h
     wx/motif/app.h
     wx/motif/bmpbuttn.h
     wx/motif/accel.h
     wx/motif/app.h
     wx/motif/bmpbuttn.h
@@ -913,17 +934,6 @@
     wx/motif/toolbar.h
     wx/motif/toplevel.h
     wx/motif/window.h
     wx/motif/toolbar.h
     wx/motif/toplevel.h
     wx/motif/window.h
-    wx/generic/fdrepdlg.h
-    wx/generic/listctrl.h
-    wx/generic/imaglist.h
-    wx/generic/notebook.h
-    wx/generic/fontdlgg.h
-    wx/generic/colrdlgg.h
-    wx/generic/statline.h
-    wx/generic/tabg.h
-    wx/generic/dirdlgg.h
-    wx/generic/prntdlgg.h
-    wx/generic/statusbr.h
 </set>
 
 
 </set>
 
 
@@ -934,8 +944,7 @@
 
 <set var="X11_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)
 
 <set var="X11_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)
-    src/x11/gsockx11.c
-    src/x11/nanox.c
+    src/generic/timer.cpp
     src/x11/app.cpp
     src/x11/bitmap.cpp
     src/x11/brush.cpp
     src/x11/app.cpp
     src/x11/bitmap.cpp
     src/x11/brush.cpp
@@ -951,10 +960,11 @@
     src/x11/evtloop.cpp
     src/x11/font.cpp
     src/x11/gdiobj.cpp
     src/x11/evtloop.cpp
     src/x11/font.cpp
     src/x11/gdiobj.cpp
+    src/x11/gsockx11.c
     src/x11/icon.cpp
     src/x11/icon.cpp
-    src/x11/joystick.cpp
     src/x11/main.cpp
     src/x11/minifram.cpp
     src/x11/main.cpp
     src/x11/minifram.cpp
+    src/x11/nanox.c
     src/x11/palette.cpp
     src/x11/pen.cpp
     src/x11/popupwin.cpp
     src/x11/palette.cpp
     src/x11/pen.cpp
     src/x11/popupwin.cpp
@@ -965,10 +975,10 @@
     src/x11/utils.cpp
     src/x11/utilsx.cpp
     src/x11/window.cpp
     src/x11/utils.cpp
     src/x11/utilsx.cpp
     src/x11/window.cpp
-    src/generic/timer.cpp
 </set>
 <set var="X11_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
 </set>
 <set var="X11_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
+    src/generic/timer.h
     wx/x11/app.h
     wx/x11/bitmap.h
     wx/x11/brush.h
     wx/x11/app.h
     wx/x11/bitmap.h
     wx/x11/brush.h
@@ -987,7 +997,6 @@
     wx/x11/font.h
     wx/x11/gdiobj.h
     wx/x11/icon.h
     wx/x11/font.h
     wx/x11/gdiobj.h
     wx/x11/icon.h
-    wx/x11/joystick.h
     wx/x11/minifram.h
     wx/x11/palette.h
     wx/x11/pen.h
     wx/x11/minifram.h
     wx/x11/palette.h
     wx/x11/pen.h
@@ -999,7 +1008,6 @@
     wx/x11/textctrl.h
     wx/x11/toplevel.h
     wx/x11/window.h
     wx/x11/textctrl.h
     wx/x11/toplevel.h
     wx/x11/window.h
-    src/generic/timer.h
 </set>
 
 
 </set>
 
 
@@ -1033,37 +1041,36 @@
     src/msw/fontutil.cpp
     src/msw/gdiimage.cpp
     src/msw/gdiobj.cpp
     src/msw/fontutil.cpp
     src/msw/gdiimage.cpp
     src/msw/gdiobj.cpp
+    src/msw/gsockmsw.c
     src/msw/helpchm.cpp
     src/msw/helpwin.cpp
     src/msw/icon.cpp
     src/msw/helpchm.cpp
     src/msw/helpwin.cpp
     src/msw/icon.cpp
-    src/msw/joystick.cpp
     src/msw/minifram.cpp
     src/msw/minifram.cpp
+    src/msw/ole/automtn.cpp
+    src/msw/ole/dataobj.cpp
+    src/msw/ole/dropsrc.cpp
+    src/msw/ole/droptgt.cpp
+    src/msw/ole/oleutils.cpp
+    src/msw/ole/uuid.cpp
     src/msw/palette.cpp
     src/msw/pen.cpp
     src/msw/popupwin.cpp
     src/msw/palette.cpp
     src/msw/pen.cpp
     src/msw/popupwin.cpp
+    src/msw/printdlg.cpp
+    src/msw/printwin.cpp
     src/msw/region.cpp
     src/msw/region.cpp
+    src/msw/renderer.cpp
     src/msw/settings.cpp
     src/msw/settings.cpp
-    src/common/taskbarcmn.cpp
-    src/msw/taskbar.cpp
     src/msw/timer.cpp
     src/msw/tooltip.cpp
     src/msw/toplevel.cpp
     src/msw/utilsgui.cpp
     src/msw/timer.cpp
     src/msw/tooltip.cpp
     src/msw/toplevel.cpp
     src/msw/utilsgui.cpp
-    src/msw/wave.cpp
+    src/msw/uxtheme.cpp
     src/msw/window.cpp
     src/msw/window.cpp
-    src/msw/ole/automtn.cpp
-    src/msw/ole/dataobj.cpp
-    src/msw/ole/dropsrc.cpp
-    src/msw/ole/droptgt.cpp
-    src/msw/ole/oleutils.cpp
-    src/msw/ole/uuid.cpp
 </set>
 <set var="MSW_LOWLEVEL_HDR" hints="files">
 </set>
 <set var="MSW_SRC" hints="files">
     src/generic/statusbr.cpp
 </set>
 <set var="MSW_LOWLEVEL_HDR" hints="files">
 </set>
 <set var="MSW_SRC" hints="files">
     src/generic/statusbr.cpp
-    src/msw/uxtheme.cpp
-    src/msw/ole/access.cpp
     src/msw/accel.cpp
     src/msw/bmpbuttn.cpp
     src/msw/button.cpp
     src/msw/accel.cpp
     src/msw/bmpbuttn.cpp
     src/msw/button.cpp
@@ -1091,13 +1098,10 @@
     src/msw/msgdlg.cpp
     src/msw/nativdlg.cpp
     src/msw/notebook.cpp
     src/msw/msgdlg.cpp
     src/msw/nativdlg.cpp
     src/msw/notebook.cpp
+    src/msw/ole/access.cpp
     src/msw/ownerdrw.cpp
     src/msw/ownerdrw.cpp
-    src/msw/penwin.cpp
-    src/msw/printdlg.cpp
-    src/msw/printwin.cpp
     src/msw/radiobox.cpp
     src/msw/radiobut.cpp
     src/msw/radiobox.cpp
     src/msw/radiobut.cpp
-    src/msw/renderer.cpp
     src/msw/scrolbar.cpp
     src/msw/slider95.cpp
     src/msw/spinbutt.cpp
     src/msw/scrolbar.cpp
     src/msw/slider95.cpp
     src/msw/spinbutt.cpp
@@ -1148,12 +1152,12 @@
     wx/msw/gauge95.h
     wx/msw/gdiimage.h
     wx/msw/gdiobj.h
     wx/msw/gauge95.h
     wx/msw/gdiimage.h
     wx/msw/gdiobj.h
+    wx/msw/helpbest.h
     wx/msw/helpchm.h
     wx/msw/helpwin.h
     wx/msw/icon.h
     wx/msw/imaglist.h
     wx/msw/iniconf.h
     wx/msw/helpchm.h
     wx/msw/helpwin.h
     wx/msw/icon.h
     wx/msw/imaglist.h
     wx/msw/iniconf.h
-    wx/msw/joystick.h
     wx/msw/listbox.h
     wx/msw/listctrl.h
     wx/msw/mdi.h
     wx/msw/listbox.h
     wx/msw/listctrl.h
     wx/msw/mdi.h
@@ -1166,6 +1170,15 @@
     wx/msw/mslu.h
     wx/msw/msvcrt.h
     wx/msw/notebook.h
     wx/msw/mslu.h
     wx/msw/msvcrt.h
     wx/msw/notebook.h
+    wx/msw/ole/access.h
+    wx/msw/ole/automtn.h
+    wx/msw/ole/dataform.h
+    wx/msw/ole/dataobj.h
+    wx/msw/ole/dataobj2.h
+    wx/msw/ole/dropsrc.h
+    wx/msw/ole/droptgt.h
+    wx/msw/ole/oleutils.h
+    wx/msw/ole/uuid.h
     wx/msw/palette.h
     wx/msw/pen.h
     wx/msw/printdlg.h
     wx/msw/palette.h
     wx/msw/pen.h
     wx/msw/printdlg.h
@@ -1180,15 +1193,14 @@
     wx/msw/setup0.h
     wx/msw/slider95.h
     wx/msw/slidrmsw.h
     wx/msw/setup0.h
     wx/msw/slider95.h
     wx/msw/slidrmsw.h
-    wx/msw/spinctrl.h
     wx/msw/spinbutt.h
     wx/msw/spinbutt.h
+    wx/msw/spinctrl.h
     wx/msw/statbmp.h
     wx/msw/statbox.h
     wx/msw/statbr95.h
     wx/msw/statline.h
     wx/msw/stattext.h
     wx/msw/tabctrl.h
     wx/msw/statbmp.h
     wx/msw/statbox.h
     wx/msw/statbr95.h
     wx/msw/statline.h
     wx/msw/stattext.h
     wx/msw/tabctrl.h
-    wx/msw/taskbar.h
     wx/msw/tbar95.h
     wx/msw/tbarmsw.h
     wx/msw/textctrl.h
     wx/msw/tbar95.h
     wx/msw/tbarmsw.h
     wx/msw/textctrl.h
@@ -1197,26 +1209,17 @@
     wx/msw/tooltip.h
     wx/msw/toplevel.h
     wx/msw/treectrl.h
     wx/msw/tooltip.h
     wx/msw/toplevel.h
     wx/msw/treectrl.h
-    wx/msw/wave.h
     wx/msw/window.h
     wx/msw/window.h
-    wx/msw/ole/access.h
-    wx/msw/ole/automtn.h
-    wx/msw/ole/dataform.h
-    wx/msw/ole/dataobj.h
-    wx/msw/ole/dataobj2.h
-    wx/msw/ole/dropsrc.h
-    wx/msw/ole/droptgt.h
-    wx/msw/ole/oleutils.h
-    wx/msw/ole/uuid.h
-    wx/msw/helpbest.h
 
     <!-- Resources must be installed together with headers: -->
 
     <!-- Resources must be installed together with headers: -->
-    wx/msw/wx.rc
-    wx/msw/wx.manifest
     wx/msw/gnuwin32/winresrc.h
     wx/msw/gnuwin32/winresrc.h
+    wx/msw/wx.manifest
+    wx/msw/wx.rc
+    <!-- bitmaps -->
     wx/msw/colours.bmp
     wx/msw/csquery.bmp
     wx/msw/disable.bmp
     wx/msw/colours.bmp
     wx/msw/csquery.bmp
     wx/msw/disable.bmp
+    <!-- cursors -->
     wx/msw/blank.cur
     wx/msw/bullseye.cur
     wx/msw/clock.cur
     wx/msw/blank.cur
     wx/msw/bullseye.cur
     wx/msw/clock.cur
@@ -1233,6 +1236,7 @@
     wx/msw/roller.cur
     wx/msw/size.cur
     wx/msw/watch1.cur
     wx/msw/roller.cur
     wx/msw/size.cur
     wx/msw/watch1.cur
+    <!-- icons -->
     wx/msw/cdrom.ico
     wx/msw/child.ico
     wx/msw/computer.ico
     wx/msw/cdrom.ico
     wx/msw/child.ico
     wx/msw/computer.ico
@@ -1256,35 +1260,37 @@
 <!-- ====================================================================== -->
 
 <set var="MGL_LOWLEVEL_SRC" hints="files">
 <!-- ====================================================================== -->
 
 <set var="MGL_LOWLEVEL_SRC" hints="files">
-    src/mgl/colour.cpp
-    src/mgl/dc.cpp
-    src/mgl/gdiobj.cpp
-    src/mgl/palette.cpp
-    src/mgl/region.cpp
-    src/mgl/brush.cpp
-    src/mgl/pen.cpp
-    src/mgl/font.cpp
-    src/mgl/data.cpp
-    src/mgl/fontenum.cpp
-    src/mgl/fontutil.cpp
-    src/mgl/evtloop.cpp
+    src/generic/caret.cpp
+    src/generic/timer.cpp
     src/mgl/app.cpp
     src/mgl/bitmap.cpp
     src/mgl/app.cpp
     src/mgl/bitmap.cpp
-    src/mgl/dirmgl.cpp
+    src/mgl/brush.cpp
     src/mgl/clipbrd.cpp
     src/mgl/clipbrd.cpp
+    src/mgl/colour.cpp
     src/mgl/cursor.cpp
     src/mgl/cursor.cpp
+    src/mgl/data.cpp
+    src/mgl/dc.cpp
     src/mgl/dcclient.cpp
     src/mgl/dcmemory.cpp
     src/mgl/dcscreen.cpp
     src/mgl/dcclient.cpp
     src/mgl/dcmemory.cpp
     src/mgl/dcscreen.cpp
-    src/mgl/toplevel.cpp
+    src/mgl/dirmgl.cpp
+    src/mgl/evtloop.cpp
+    src/mgl/font.cpp
+    src/mgl/fontenum.cpp
+    src/mgl/fontutil.cpp
+    src/mgl/gdiobj.cpp
     src/mgl/icon.cpp
     src/mgl/icon.cpp
+    src/mgl/palette.cpp
+    src/mgl/pen.cpp
+    src/mgl/region.cpp
     src/mgl/settings.cpp
     src/mgl/settings.cpp
-    src/mgl/window.cpp
+    src/mgl/toplevel.cpp
     src/mgl/utils.cpp
     src/mgl/utils.cpp
-    src/generic/timer.cpp
-    src/generic/caret.cpp
+    src/mgl/window.cpp
 </set>
 <set var="MGL_LOWLEVEL_HDR" hints="files">
 </set>
 <set var="MGL_LOWLEVEL_HDR" hints="files">
+    wx/generic/caret.h
+    wx/generic/timer.h
     wx/mgl/app.h
     wx/mgl/bitmap.h
     wx/mgl/brush.h
     wx/mgl/app.h
     wx/mgl/bitmap.h
     wx/mgl/brush.h
@@ -1306,8 +1312,6 @@
     wx/mgl/region.h
     wx/mgl/toplevel.h
     wx/mgl/window.h
     wx/mgl/region.h
     wx/mgl/toplevel.h
     wx/mgl/window.h
-    wx/generic/timer.h
-    wx/generic/caret.h
 </set>
 
 
 </set>
 
 
@@ -1320,6 +1324,7 @@
 <set var="OS2_LOWLEVEL_HDR" hints="files">
 </set>
 <set var="OS2_SRC" hints="files">
 <set var="OS2_LOWLEVEL_HDR" hints="files">
 </set>
 <set var="OS2_SRC" hints="files">
+    src/generic/caret.cpp
     src/os2/accel.cpp
     src/os2/app.cpp
     src/os2/bitmap.cpp
     src/os2/accel.cpp
     src/os2/app.cpp
     src/os2/bitmap.cpp
@@ -1352,10 +1357,11 @@
     src/os2/gauge.cpp
     src/os2/gdiimage.cpp
     src/os2/gdiobj.cpp
     src/os2/gauge.cpp
     src/os2/gdiimage.cpp
     src/os2/gdiobj.cpp
+    src/os2/gsocket.c
+    src/os2/gsockpm.c
     src/os2/helpwin.cpp
     src/os2/icon.cpp
     src/os2/iniconf.cpp
     src/os2/helpwin.cpp
     src/os2/icon.cpp
     src/os2/iniconf.cpp
-    src/os2/joystick.cpp
     src/os2/listbox.cpp
     src/os2/main.cpp
     src/os2/menu.cpp
     src/os2/listbox.cpp
     src/os2/main.cpp
     src/os2/menu.cpp
@@ -1383,89 +1389,83 @@
     src/os2/stattext.cpp
     src/os2/tabctrl.cpp
     src/os2/textctrl.cpp
     src/os2/stattext.cpp
     src/os2/tabctrl.cpp
     src/os2/textctrl.cpp
-    src/os2/timer.cpp
     src/os2/thread.cpp
     src/os2/thread.cpp
+    src/os2/timer.cpp
     src/os2/toolbar.cpp
     src/os2/tooltip.cpp
     src/os2/toplevel.cpp
     src/os2/toolbar.cpp
     src/os2/tooltip.cpp
     src/os2/toplevel.cpp
-    src/os2/wave.cpp
     src/os2/window.cpp
     src/os2/window.cpp
-    src/os2/gsocket.c
-    src/os2/gsockpm.c
-    src/generic/caret.cpp
 </set>
 <set var="OS2_HDR" hints="files">
 </set>
 <set var="OS2_HDR" hints="files">
+    wx/generic/caret.h
     wx/os2/accel.h
     wx/os2/accel.h
-    wx/os2/dataobj.h
-    wx/os2/helpwin.h
-    wx/os2/pngread.h
-    wx/os2/statline.h
     wx/os2/app.h
     wx/os2/app.h
-    wx/os2/dataobj2.h
-    wx/os2/icon.h
-    wx/os2/stattext.h
     wx/os2/bitmap.h
     wx/os2/bitmap.h
+    wx/os2/bmpbuttn.h
+    wx/os2/brush.h
+    wx/os2/button.h
+    wx/os2/checkbox.h
+    wx/os2/checklst.h
+    wx/os2/choice.h
+    wx/os2/clipbrd.h
+    wx/os2/colour.h
+    wx/os2/combobox.h
+    wx/os2/control.h
+    wx/os2/cursor.h
+    wx/os2/dataform.h
+    wx/os2/dataobj.h
+    wx/os2/dataobj2.h
     wx/os2/dc.h
     wx/os2/dc.h
-    wx/os2/tabctrl.h
     wx/os2/dcclient.h
     wx/os2/dcclient.h
-    wx/os2/print.h
-    wx/os2/bmpbuttn.h
     wx/os2/dcmemory.h
     wx/os2/dcmemory.h
-    wx/os2/iniconf.h
-    wx/os2/private.h
-    wx/os2/textctrl.h
-    wx/os2/brush.h
     wx/os2/dcprint.h
     wx/os2/dcprint.h
-    wx/os2/joystick.h
-    wx/os2/timer.h
     wx/os2/dcscreen.h
     wx/os2/dcscreen.h
-    wx/os2/listbox.h
-    wx/os2/button.h
     wx/os2/dialog.h
     wx/os2/dialog.h
-    wx/os2/radiobox.h
-    wx/os2/toolbar.h
-    wx/os2/checkbox.h
-    wx/os2/radiobut.h
-    wx/os2/tooltip.h
-    wx/os2/checklst.h
     wx/os2/dnd.h
     wx/os2/dnd.h
+    wx/os2/filedlg.h
+    wx/os2/font.h
+    wx/os2/fontdlg.h
+    wx/os2/frame.h
+    wx/os2/gauge.h
+    wx/os2/gdiimage.h
+    wx/os2/gdiobj.h
+    wx/os2/gsockos2.h
+    wx/os2/helpwin.h
+    wx/os2/icon.h
+    wx/os2/iniconf.h
+    wx/os2/listbox.h
     wx/os2/menu.h
     wx/os2/menu.h
-    wx/os2/region.h
     wx/os2/menuitem.h
     wx/os2/menuitem.h
-    wx/os2/choice.h
-    wx/os2/filedlg.h
     wx/os2/metafile.h
     wx/os2/metafile.h
-    wx/os2/scrolbar.h
-    wx/os2/wave.h
-    wx/os2/clipbrd.h
-    wx/os2/font.h
     wx/os2/minifram.h
     wx/os2/minifram.h
+    wx/os2/msgdlg.h
+    wx/os2/notebook.h
+    wx/os2/palette.h
+    wx/os2/pen.h
+    wx/os2/pnghand.h
+    wx/os2/pngread.h
+    wx/os2/print.h
+    wx/os2/private.h
+    wx/os2/radiobox.h
+    wx/os2/radiobut.h
+    wx/os2/region.h
+    wx/os2/scrolbar.h
     wx/os2/settings.h
     wx/os2/settings.h
-    wx/os2/window.h
-    wx/os2/fontdlg.h
-    wx/os2/msgdlg.h
-    wx/os2/colour.h
-    wx/os2/frame.h
     wx/os2/setup0.h
     wx/os2/setup0.h
-    wx/os2/combobox.h
-    wx/os2/gauge.h
-    wx/os2/notebook.h
-    wx/os2/control.h
-    wx/os2/gdiimage.h
-    wx/os2/palette.h
     wx/os2/slider.h
     wx/os2/slider.h
-    wx/os2/cursor.h
-    wx/os2/gdiobj.h
     wx/os2/spinbutt.h
     wx/os2/spinbutt.h
-    wx/os2/gsockos2.h
-    wx/os2/pen.h
     wx/os2/spinctrl.h
     wx/os2/statbmp.h
     wx/os2/spinctrl.h
     wx/os2/statbmp.h
-    wx/os2/dataform.h
-    wx/os2/pnghand.h
     wx/os2/statbox.h
     wx/os2/statbox.h
+    wx/os2/statline.h
+    wx/os2/stattext.h
+    wx/os2/tabctrl.h
+    wx/os2/textctrl.h
+    wx/os2/timer.h
+    wx/os2/toolbar.h
+    wx/os2/tooltip.h
     wx/os2/toplevel.h
     wx/os2/toplevel.h
-    wx/generic/caret.h
+    wx/os2/window.h
 </set>
 
 
 </set>
 
 
@@ -1514,7 +1514,6 @@
     src/mac/gauge.cpp
     src/mac/gdiobj.cpp
     src/mac/icon.cpp
     src/mac/gauge.cpp
     src/mac/gdiobj.cpp
     src/mac/icon.cpp
-    src/mac/joystick.cpp
     src/mac/listbox.cpp
     src/mac/macnotfy.cpp
     src/mac/mdi.cpp
     src/mac/listbox.cpp
     src/mac/macnotfy.cpp
     src/mac/mdi.cpp
@@ -1522,6 +1521,7 @@
     src/mac/menuitem.cpp
     src/mac/metafile.cpp
     src/mac/minifram.cpp
     src/mac/menuitem.cpp
     src/mac/metafile.cpp
     src/mac/minifram.cpp
+    src/mac/morefilex/MoreFilesX.c
     src/mac/msgdlg.cpp
     src/mac/notebmac.cpp
     src/mac/palette.cpp
     src/mac/msgdlg.cpp
     src/mac/notebmac.cpp
     src/mac/palette.cpp
@@ -1546,26 +1546,24 @@
     src/mac/textctrl.cpp
     src/mac/thread.cpp
     src/mac/timer.cpp
     src/mac/textctrl.cpp
     src/mac/thread.cpp
     src/mac/timer.cpp
-    src/mac/toplevel.cpp
     src/mac/toolbar.cpp
     src/mac/tooltip.cpp
     src/mac/toolbar.cpp
     src/mac/tooltip.cpp
+    src/mac/toplevel.cpp
     src/mac/uma.cpp
     src/mac/uma.cpp
-    src/mac/wave.cpp
     src/mac/window.cpp
     src/mac/window.cpp
-    src/mac/morefilex/MoreFilesX.c
     <!-- Generic implementations used by wxMac: -->
     <!-- Generic implementations used by wxMac: -->
-    src/generic/statusbr.cpp
+    src/generic/caret.cpp
+    src/generic/fdrepdlg.cpp
+    src/generic/fontdlgg.cpp
     src/generic/imaglist.cpp
     src/generic/listctrl.cpp
     src/generic/imaglist.cpp
     src/generic/listctrl.cpp
-    src/generic/fdrepdlg.cpp
+    src/generic/prntdlgg.cpp
+    src/generic/statusbr.cpp
     src/generic/tabg.cpp
     src/generic/tabg.cpp
-    src/generic/fontdlgg.cpp
-    src/generic/caret.cpp
     <!-- Unix files used by wxMac: -->
     src/unix/snglinst.cpp
 </set>
 <set var="MAC_HDR" hints="files">
     <!-- Unix files used by wxMac: -->
     src/unix/snglinst.cpp
 </set>
 <set var="MAC_HDR" hints="files">
-    wx/mac/chkconf.h
     wx/mac/accel.h
     wx/mac/aga.h
     wx/mac/app.h
     wx/mac/accel.h
     wx/mac/aga.h
     wx/mac/app.h
@@ -1575,6 +1573,7 @@
     wx/mac/button.h
     wx/mac/checkbox.h
     wx/mac/checklst.h
     wx/mac/button.h
     wx/mac/checkbox.h
     wx/mac/checklst.h
+    wx/mac/chkconf.h
     wx/mac/choice.h
     wx/mac/clipbrd.h
     wx/mac/colordlg.h
     wx/mac/choice.h
     wx/mac/clipbrd.h
     wx/mac/colordlg.h
@@ -1603,7 +1602,6 @@
     wx/mac/helpxxxx.h
     wx/mac/icon.h
     wx/mac/imaglist.h
     wx/mac/helpxxxx.h
     wx/mac/icon.h
     wx/mac/imaglist.h
-    wx/mac/joystick.h
     wx/mac/listbox.h
     wx/mac/listctrl.h
     wx/mac/macnotfy.h
     wx/mac/listbox.h
     wx/mac/listctrl.h
     wx/mac/macnotfy.h
@@ -1643,16 +1641,15 @@
     wx/mac/toplevel.h
     wx/mac/treectrl.h
     wx/mac/uma.h
     wx/mac/toplevel.h
     wx/mac/treectrl.h
     wx/mac/uma.h
-    wx/mac/wave.h
     wx/mac/window.h
     <!-- Generic implementations used by wxMac: -->
     wx/mac/window.h
     <!-- Generic implementations used by wxMac: -->
-    wx/generic/statusbr.h
+    wx/generic/caret.h
+    wx/generic/fdrepdlg.h
     wx/generic/fontdlgg.h
     wx/generic/imaglist.h
     wx/generic/listctrl.h
     wx/generic/fontdlgg.h
     wx/generic/imaglist.h
     wx/generic/listctrl.h
-    wx/generic/fdrepdlg.h
+    wx/generic/statusbr.h
     wx/generic/tabg.h
     wx/generic/tabg.h
-    wx/generic/caret.h
 </set>
 
 
 </set>
 
 
@@ -1674,24 +1671,27 @@
     src/cocoa/NSView.mm
     src/cocoa/NSWindow.mm
     src/cocoa/app.mm
     src/cocoa/NSView.mm
     src/cocoa/NSWindow.mm
     src/cocoa/app.mm
-    src/cocoa/bmpbuttn.mm
     src/cocoa/bitmap.mm
     src/cocoa/bitmap.mm
+    src/cocoa/bmpbuttn.mm
     src/cocoa/brush.mm
     src/cocoa/button.mm
     src/cocoa/checkbox.mm
     src/cocoa/checklst.mm
     src/cocoa/choice.mm
     src/cocoa/brush.mm
     src/cocoa/button.mm
     src/cocoa/checkbox.mm
     src/cocoa/checklst.mm
     src/cocoa/choice.mm
+    src/cocoa/clipbrd.mm
     src/cocoa/colour.mm
     src/cocoa/combobox.mm
     src/cocoa/control.mm
     src/cocoa/cursor.mm
     src/cocoa/data.cpp
     src/cocoa/colour.mm
     src/cocoa/combobox.mm
     src/cocoa/control.mm
     src/cocoa/cursor.mm
     src/cocoa/data.cpp
+    src/cocoa/dataobj.mm
     src/cocoa/dc.mm
     src/cocoa/dcclient.mm
     src/cocoa/dcmemory.mm
     src/cocoa/dcscreen.cpp
     src/cocoa/dialog.mm
     src/cocoa/font.cpp
     src/cocoa/dc.mm
     src/cocoa/dcclient.mm
     src/cocoa/dcmemory.mm
     src/cocoa/dcscreen.cpp
     src/cocoa/dialog.mm
     src/cocoa/font.cpp
+    src/cocoa/fontenum.mm
     src/cocoa/fontutil.cpp
     src/cocoa/frame.mm
     src/cocoa/gauge.mm
     src/cocoa/fontutil.cpp
     src/cocoa/frame.mm
     src/cocoa/gauge.mm
@@ -1701,7 +1701,7 @@
     src/cocoa/main.cpp
     src/cocoa/menu.mm
     src/cocoa/menuitem.mm
     src/cocoa/main.cpp
     src/cocoa/menu.mm
     src/cocoa/menuitem.mm
-    src/cocoa/pen.cpp
+    src/cocoa/pen.mm
     src/cocoa/radiobox.mm
     src/cocoa/radiobut.mm
     src/cocoa/region.cpp
     src/cocoa/radiobox.mm
     src/cocoa/radiobut.mm
     src/cocoa/region.cpp
@@ -1718,22 +1718,22 @@
     src/cocoa/utilsexc.cpp
     src/cocoa/window.mm
     <!-- Generic implementations used by wxCocoa: -->
     src/cocoa/utilsexc.cpp
     src/cocoa/window.mm
     <!-- Generic implementations used by wxCocoa: -->
-    src/generic/statusbr.cpp
-    src/generic/imaglist.cpp
-    src/generic/listctrl.cpp
-    src/generic/fdrepdlg.cpp
-    src/generic/tabg.cpp
-    src/generic/fontdlgg.cpp
+    src/generic/accel.cpp
+    src/generic/caret.cpp
     src/generic/colrdlgg.cpp
     src/generic/colrdlgg.cpp
-    src/generic/msgdlgg.cpp
     src/generic/dirdlgg.cpp
     src/generic/dirdlgg.cpp
+    src/generic/fdrepdlg.cpp
     src/generic/filedlgg.cpp
     src/generic/filedlgg.cpp
+    src/generic/fontdlgg.cpp
+    src/generic/imaglist.cpp
+    src/generic/listctrl.cpp
+    src/generic/mdig.cpp
+    src/generic/msgdlgg.cpp
     src/generic/notebook.cpp
     src/generic/notebook.cpp
-    src/generic/accel.cpp
     src/generic/paletteg.cpp
     src/generic/paletteg.cpp
+    src/generic/statusbr.cpp
+    src/generic/tabg.cpp
     src/generic/timer.cpp
     src/generic/timer.cpp
-    src/generic/caret.cpp
-    src/generic/mdig.cpp
 </set>
 <set var="COCOA_HDR" hints="files">
     wx/cocoa/NSBox.h
 </set>
 <set var="COCOA_HDR" hints="files">
     wx/cocoa/NSBox.h
@@ -1754,10 +1754,14 @@
     wx/cocoa/checkbox.h
     wx/cocoa/checklst.h
     wx/cocoa/choice.h
     wx/cocoa/checkbox.h
     wx/cocoa/checklst.h
     wx/cocoa/choice.h
+    wx/cocoa/clipbrd.h
     wx/cocoa/colour.h
     wx/cocoa/combobox.h
     wx/cocoa/control.h
     wx/cocoa/cursor.h
     wx/cocoa/colour.h
     wx/cocoa/combobox.h
     wx/cocoa/control.h
     wx/cocoa/cursor.h
+    wx/cocoa/dataform.h
+    wx/cocoa/dataobj.h
+    wx/cocoa/dataobj2.h
     wx/cocoa/dc.h
     wx/cocoa/dcclient.h
     wx/cocoa/dcmemory.h
     wx/cocoa/dc.h
     wx/cocoa/dcclient.h
     wx/cocoa/dcmemory.h
@@ -1784,15 +1788,15 @@
     wx/cocoa/toplevel.h
     wx/cocoa/window.h
     <!-- Generic implementations used by wxCocoa: -->
     wx/cocoa/toplevel.h
     wx/cocoa/window.h
     <!-- Generic implementations used by wxCocoa: -->
-    wx/generic/statusbr.h
+    wx/generic/caret.h
+    wx/generic/fdrepdlg.h
     wx/generic/fontdlgg.h
     wx/generic/imaglist.h
     wx/generic/listctrl.h
     wx/generic/fontdlgg.h
     wx/generic/imaglist.h
     wx/generic/listctrl.h
-    wx/generic/fdrepdlg.h
-    wx/generic/tabg.h
-    wx/generic/caret.h
     wx/generic/mdig.h
     wx/generic/paletteg.h
     wx/generic/mdig.h
     wx/generic/paletteg.h
+    wx/generic/statusbr.h
+    wx/generic/tabg.h
 </set>
 
 
 </set>
 
 
@@ -1804,20 +1808,23 @@
 
 <set var="UNIV_THEMES_SRC" hints="files">
     src/univ/themes/gtk.cpp
 
 <set var="UNIV_THEMES_SRC" hints="files">
     src/univ/themes/gtk.cpp
-    src/univ/themes/win32.cpp
     src/univ/themes/metal.cpp
     src/univ/themes/metal.cpp
-</set>
-
-<!-- don't ask... wxX11 must have something extra I guess -->
-<set var="UNIV_TEXTCTRL">
-    <if cond="TOOLKIT=='X11'">src/x11/textctrl.cpp</if>
-    <if cond="TOOLKIT=='MGL'">src/univ/textctrl.cpp</if>
-    <if cond="TOOLKIT=='GTK'">src/univ/textctrl.cpp</if>
-    <if cond="TOOLKIT=='MSW'">src/univ/textctrl.cpp</if>
+    src/univ/themes/win32.cpp
 </set>
 
 <set var="UNIV_SRC" hints="files">
 </set>
 
 <set var="UNIV_SRC" hints="files">
-    $(UNIV_TEXTCTRL)
+    src/generic/accel.cpp
+    src/generic/colrdlgg.cpp
+    src/generic/dirdlgg.cpp
+    src/generic/fdrepdlg.cpp
+    src/generic/filedlgg.cpp
+    src/generic/fontdlgg.cpp
+    src/generic/imaglist.cpp
+    src/generic/listctrl.cpp
+    src/generic/mdig.cpp
+    src/generic/msgdlgg.cpp
+    src/generic/prntdlgg.cpp
+    src/generic/tabg.cpp
     src/univ/bmpbuttn.cpp
     src/univ/button.cpp
     src/univ/checkbox.cpp
     src/univ/bmpbuttn.cpp
     src/univ/button.cpp
     src/univ/checkbox.cpp
@@ -1826,9 +1833,9 @@
     src/univ/colschem.cpp
     src/univ/combobox.cpp
     src/univ/control.cpp
     src/univ/colschem.cpp
     src/univ/combobox.cpp
     src/univ/control.cpp
+    src/univ/ctrlrend.cpp
     src/univ/dialog.cpp
     src/univ/framuniv.cpp
     src/univ/dialog.cpp
     src/univ/framuniv.cpp
-    src/univ/topluniv.cpp
     src/univ/gauge.cpp
     src/univ/inpcons.cpp
     src/univ/inphand.cpp
     src/univ/gauge.cpp
     src/univ/inpcons.cpp
     src/univ/inphand.cpp
@@ -1837,7 +1844,6 @@
     src/univ/notebook.cpp
     src/univ/radiobox.cpp
     src/univ/radiobut.cpp
     src/univ/notebook.cpp
     src/univ/radiobox.cpp
     src/univ/radiobut.cpp
-    src/univ/renderer.cpp
     src/univ/scrarrow.cpp
     src/univ/scrolbar.cpp
     src/univ/scrthumb.cpp
     src/univ/scrarrow.cpp
     src/univ/scrolbar.cpp
     src/univ/scrthumb.cpp
@@ -1848,23 +1854,21 @@
     src/univ/statline.cpp
     src/univ/stattext.cpp
     src/univ/statusbr.cpp
     src/univ/statline.cpp
     src/univ/stattext.cpp
     src/univ/statusbr.cpp
-    src/univ/toolbar.cpp
+    src/univ/textctrl.cpp
     src/univ/theme.cpp
     src/univ/theme.cpp
+    src/univ/toolbar.cpp
+    src/univ/topluniv.cpp
     src/univ/winuniv.cpp
     src/univ/winuniv.cpp
-    src/generic/mdig.cpp
-    src/generic/imaglist.cpp
-    src/generic/colrdlgg.cpp
-    src/generic/listctrl.cpp
-    src/generic/filedlgg.cpp
-    src/generic/dirdlgg.cpp
-    src/generic/prntdlgg.cpp
-    src/generic/accel.cpp
-    src/generic/msgdlgg.cpp
-    src/generic/fdrepdlg.cpp
-    src/generic/fontdlgg.cpp
-    src/generic/tabg.cpp
 </set>
 <set var="UNIV_HDR" hints="files">
 </set>
 <set var="UNIV_HDR" hints="files">
+    wx/generic/accel.h
+    wx/generic/dirdlgg.h
+    wx/generic/fdrepdlg.h
+    wx/generic/fontdlgg.h
+    wx/generic/listctrl.h
+    wx/generic/mdig.h
+    wx/generic/statusbr.h
+    wx/generic/tabg.h
     wx/univ/app.h
     wx/univ/bmpbuttn.h
     wx/univ/button.h
     wx/univ/app.h
     wx/univ/bmpbuttn.h
     wx/univ/button.h
@@ -1876,7 +1880,6 @@
     wx/univ/control.h
     wx/univ/dialog.h
     wx/univ/frame.h
     wx/univ/control.h
     wx/univ/dialog.h
     wx/univ/frame.h
-    wx/univ/toplevel.h
     wx/univ/gauge.h
     wx/univ/inpcons.h
     wx/univ/inphand.h
     wx/univ/gauge.h
     wx/univ/inpcons.h
     wx/univ/inphand.h
@@ -1891,7 +1894,6 @@
     wx/univ/scrolbar.h
     wx/univ/scrthumb.h
     wx/univ/scrtimer.h
     wx/univ/scrolbar.h
     wx/univ/scrthumb.h
     wx/univ/scrtimer.h
-    wx/univ/setup.h
     wx/univ/slider.h
     wx/univ/spinbutt.h
     wx/univ/statbmp.h
     wx/univ/slider.h
     wx/univ/spinbutt.h
     wx/univ/statbmp.h
@@ -1902,18 +1904,94 @@
     wx/univ/textctrl.h
     wx/univ/theme.h
     wx/univ/toolbar.h
     wx/univ/textctrl.h
     wx/univ/theme.h
     wx/univ/toolbar.h
+    wx/univ/toplevel.h
     wx/univ/window.h
     wx/univ/window.h
-    wx/generic/mdig.h
-    wx/generic/fdrepdlg.h
-    wx/generic/fontdlgg.h
-    wx/generic/tabg.h
-    wx/generic/dirdlgg.h
-    wx/generic/statusbr.h
-    wx/generic/accel.h
-    wx/generic/listctrl.h
 </set>
 
 
 </set>
 
 
+<!-- ====================================================================== -->
+<!--                               wxAdvanced                               -->
+<!-- ====================================================================== -->
+
+<set var="ADVANCED_CMN_SRC" hints="files">
+    src/generic/calctrl.cpp
+    src/generic/dcbuffer.cpp
+    src/generic/grid.cpp
+    src/generic/gridctrl.cpp
+    src/generic/gridsel.cpp
+    src/generic/helpext.cpp
+    src/generic/laywin.cpp
+    src/generic/sashwin.cpp
+    src/generic/splash.cpp
+    src/generic/tipdlg.cpp
+    src/generic/wizard.cpp
+</set>
+
+<set var="ADVANCED_CMN_HDR" hints="files">
+    wx/calctrl.h
+    wx/dcbuffer.h
+    wx/generic/calctrl.h
+    wx/generic/grid.h
+    wx/generic/gridctrl.h
+    wx/generic/gridsel.h
+    wx/generic/helpext.h
+    wx/generic/laywin.h
+    wx/generic/sashwin.h
+    wx/generic/splash.h
+    wx/generic/wizard.h
+    wx/grid.h
+    wx/joystick.h
+    wx/laywin.h
+    wx/sashwin.h
+    wx/splash.h
+    wx/taskbar.h
+    wx/tipdlg.h
+    wx/wave.h
+    wx/wizard.h
+</set>
+
+<set var="ADVANCED_MSW_SRC" hints="files">
+    src/common/taskbarcmn.cpp
+    src/msw/joystick.cpp
+    src/msw/taskbar.cpp
+    src/msw/wave.cpp
+</set>
+<set var="ADVANCED_MSW_HDR" hints="files">
+    wx/msw/joystick.h
+    wx/msw/taskbar.h
+    wx/msw/wave.h
+</set>
+
+<set var="ADVANCED_MAC_SRC" hints="files">
+    src/mac/joystick.cpp
+    src/mac/wave.cpp
+</set>
+<set var="ADVANCED_MAC_HDR" hints="files">
+    wx/mac/joystick.h
+    wx/mac/wave.h
+</set>
+
+<set var="ADVANCED_OS2_SRC" hints="files">
+    src/os2/joystick.cpp
+    src/os2/wave.cpp
+</set>
+<set var="ADVANCED_OS2_HDR" hints="files">
+    wx/os2/joystick.h
+    wx/os2/wave.h
+</set>
+
+<set var="ADVANCED_UNIX_SRC" hints="files">
+    src/common/taskbarcmn.cpp
+    src/unix/joystick.cpp
+    src/unix/taskbarx11.cpp
+    src/unix/wave.cpp
+</set>
+<set var="ADVANCED_UNIX_HDR" hints="files">
+    wx/unix/joystick.h
+    wx/unix/taskbarx11.h
+    wx/unix/wave.h
+</set>
+
 
 <!-- ====================================================================== -->
 <!--                               wxHTML                                   -->
 
 <!-- ====================================================================== -->
 <!--                               wxHTML                                   -->
@@ -1926,31 +2004,30 @@
 </set>
 <set var="HTML_SRC" hints="files">
     $(HTML_SRC_PLATFORM)
 </set>
 <set var="HTML_SRC" hints="files">
     $(HTML_SRC_PLATFORM)
+    src/html/helpctrl.cpp
     src/html/helpdata.cpp
     src/html/helpfrm.cpp
     src/html/helpdata.cpp
     src/html/helpfrm.cpp
-    src/html/helpctrl.cpp
     src/html/htmlcell.cpp
     src/html/htmlfilt.cpp
     src/html/htmlpars.cpp
     src/html/htmltag.cpp
     src/html/htmlwin.cpp
     src/html/htmlcell.cpp
     src/html/htmlfilt.cpp
     src/html/htmlpars.cpp
     src/html/htmltag.cpp
     src/html/htmlwin.cpp
-    src/html/winpars.cpp
+    src/html/htmprint.cpp
+    src/html/m_dflist.cpp
     src/html/m_fonts.cpp
     src/html/m_hline.cpp
     src/html/m_image.cpp
     src/html/m_layout.cpp
     src/html/m_links.cpp
     src/html/m_list.cpp
     src/html/m_fonts.cpp
     src/html/m_hline.cpp
     src/html/m_image.cpp
     src/html/m_layout.cpp
     src/html/m_links.cpp
     src/html/m_list.cpp
-    src/html/m_dflist.cpp
     src/html/m_pre.cpp
     src/html/m_pre.cpp
-    src/html/m_tables.cpp
     src/html/m_style.cpp
     src/html/m_style.cpp
-    src/html/htmprint.cpp
+    src/html/m_tables.cpp
+    src/html/winpars.cpp
     <!-- wxHTML users: -->
     src/generic/htmllbox.cpp
 </set>
 <set var="HTML_HDR" hints="files">
     <!-- wxHTML users: -->
     src/generic/htmllbox.cpp
 </set>
 <set var="HTML_HDR" hints="files">
-    wx/wxhtml.h
     wx/html/forcelnk.h
     wx/html/helpctrl.h
     wx/html/helpdata.h
     wx/html/forcelnk.h
     wx/html/helpctrl.h
     wx/html/helpdata.h
@@ -1965,11 +2042,13 @@
     wx/html/htmprint.h
     wx/html/m_templ.h
     wx/html/winpars.h
     wx/html/htmprint.h
     wx/html/m_templ.h
     wx/html/winpars.h
+    wx/wxhtml.h
     <!-- wxHTML users: -->
     wx/htmllbox.h
 </set>
 
 
     <!-- wxHTML users: -->
     wx/htmllbox.h
 </set>
 
 
+
 <!-- ====================================================================== -->
 <!--                               XML classes                              -->
 <!-- ====================================================================== -->
 <!-- ====================================================================== -->
 <!--                               XML classes                              -->
 <!-- ====================================================================== -->
@@ -2004,10 +2083,35 @@
 
 
 
 
 
 
+<!-- ====================================================================== -->
+<!--                              ODBD classes                              -->
+<!-- ====================================================================== -->
+
+<set var="ODBC_SRC" hints="files">
+    src/common/db.cpp
+    src/common/dbtable.cpp
+</set>
+<set var="ODBC_HDR" hints="files">
+    wx/db.h
+    wx/dbkeyg.h
+    wx/dbtable.h
+</set>
+
+<set var="DBGRID_SRC" hints="files">
+    src/common/dbgrid.cpp
+</set>
+<set var="DBGRID_HDR" hints="files">
+    wx/dbgrid.h
+</set>
+
+
+
 <!-- ====================================================================== -->
 <!--                    Define sources for specific libraries:              -->
 <!-- ====================================================================== -->
 
 <!-- ====================================================================== -->
 <!--                    Define sources for specific libraries:              -->
 <!-- ====================================================================== -->
 
+    <!-- wxBase files: -->
+
     <!-- Nested if would be nicer, but this works -->
     <set var="BASE_MACOSX_SRC" hints="files">
         <if cond="TOOLKIT=='MAC'">$(BASE_MAC_SRC)</if>
     <!-- Nested if would be nicer, but this works -->
     <set var="BASE_MACOSX_SRC" hints="files">
         <if cond="TOOLKIT=='MAC'">$(BASE_MAC_SRC)</if>
@@ -2020,6 +2124,9 @@
         <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC)</if>
         <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_SRC)</if>
     </set>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC)</if>
         <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_SRC)</if>
     </set>
+    <set var="BASE_AND_GUI_TOOLKIT_SRC" hints="files">
+        <if cond="TOOLKIT=='MAC'">$(BASE_AND_GUI_MAC_SRC)</if>
+    </set>
     <set var="BASE_AND_GUI_PLATFORM_SRC" hints="files">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_AND_GUI_UNIX_SRC)</if>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
     <set var="BASE_AND_GUI_PLATFORM_SRC" hints="files">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_AND_GUI_UNIX_SRC)</if>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
@@ -2036,10 +2143,37 @@
         $(BASE_CMN_SRC) $(BASE_PLATFORM_SRC)
     </set>
     <set var="BASE_AND_GUI_SRC" hints="files">
         $(BASE_CMN_SRC) $(BASE_PLATFORM_SRC)
     </set>
     <set var="BASE_AND_GUI_SRC" hints="files">
-        $(BASE_AND_GUI_CMN_SRC) $(BASE_AND_GUI_PLATFORM_SRC)
+        $(BASE_AND_GUI_CMN_SRC)
+        $(BASE_AND_GUI_PLATFORM_SRC) $(BASE_AND_GUI_TOOLKIT_SRC)
+    </set>
+
+
+    <!-- wxNet files: -->
+    <set var="NET_MACOSX_SRC" hints="files">
+        <if cond="TOOLKIT=='MAC'">$(NET_MAC_SRC)</if>
+        <if cond="TOOLKIT=='COCOA'">$(NET_DARWIN_SRC)</if>
+        <if cond="TOOLKIT=='GTK'">$(NET_DARWIN_SRC)</if>
+        <!-- FIXME: TOOLKIT!='MAC' is what we really want -->
+    </set>
+    <set var="NET_PLATFORM_SRC" hints="files">
+        <if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_SRC)</if>
+        <if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_SRC)</if>
+        <if cond="PLATFORM_MACOSX=='1'">$(NET_MACOSX_SRC)</if>
+    </set>
+    <set var="NET_PLATFORM_HDR" hints="files">
+        <if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_HDR)</if>
+        <if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_HDR)</if>
+        <if cond="TOOLKIT=='MAC'">$(NET_MAC_HDR)</if>
+        <if cond="TOOLKIT=='COCOA'">$(NET_DARWIN_HDR)</if>
+    </set>
+
+    <set var="NET_SRC" hints="files">
+        $(NET_CMN_SRC) $(NET_PLATFORM_SRC)
     </set>
 
 
     </set>
 
 
+    <!-- GUI sources: -->
+
     <set var="LOWLEVEL_SRC" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
     <set var="LOWLEVEL_SRC" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
@@ -2087,21 +2221,65 @@
         </if>
     </set>
 
         </if>
     </set>
 
+    <!-- wxAdvanced files: -->
+    <set var="ADVANCED_PLATFORM_SRC" hints="files">
+        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC)</if>
+        <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_SRC)</if>
+        <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC)</if>
+        <if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_SRC)</if>
+        <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
+        <if cond="TOOLKIT=='OS2'">$(ADVANCED_OS2_SRC)</if>
+    </set>
+    <set var="ADVANCED_PLATFORM_HDR" hints="files">
+        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR)</if>
+        <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_HDR)</if>
+        <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR)</if>
+        <if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_HDR)</if>
+        <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
+        <if cond="TOOLKIT=='OS2'">$(ADVANCED_OS2_HDR)</if>
+    </set>
+    <set var="ADVANCED_SRC">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC)</set>
+    <set var="ADVANCED_HDR">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR)</set>
+
+
+
+    <set var="GUI_CORE_HEADERS" hints="files">
+        <if cond="USE_GUI=='1' and WXUNIV=='0'">$(GUI_HDR)</if>
+        <if cond="USE_GUI=='1' and WXUNIV=='1'">$(UNIV_HDR)</if>
+    </set>
 
     <set var="ALL_GUI_HEADERS" hints="files">
 
     <set var="ALL_GUI_HEADERS" hints="files">
-        <if cond="USE_GUI=='1' and WXUNIV=='0'">
-            $(GUI_CMN_HDR) $(LOWLEVEL_HDR) $(GUI_HDR)
-        </if>
-        <if cond="USE_GUI=='1' and WXUNIV=='1'">
-            $(GUI_CMN_HDR) $(LOWLEVEL_HDR) $(UNIV_HDR)
+        <if cond="USE_GUI=='1'">
+            $(GUI_CMN_HDR)
+            $(LOWLEVEL_HDR)
+            $(GUI_CORE_HEADERS)
+            $(ADVANCED_HDR) $(HTML_HDR)
+            $(OPENGL_HDR) $(DBGRID_HDR)
         </if>
     </set>
 
         </if>
     </set>
 
-    <set var="ALL_HEADERS" hints="files">
+
+    <set var="ALL_BASE_HEADERS" make_var="1" hints="files">
         $(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
         $(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
-        $(ALL_GUI_HEADERS)
-        $(HTML_HDR) $(XML_HDR)
-        $(OPENGL_HDR)
+        $(NET_CMN_HDR) $(NET_PLATFORM_HDR)
+        $(XML_HDR) $(ODBC_HDR)
+    </set>
+
+    <set var="ALL_HEADERS" make_var="1" hints="files">
+        $(ALL_BASE_HEADERS) $(ALL_GUI_HEADERS)
+    </set>
+
+    <set var="ALL_BASE_SOURCES" make_var="1" hints="files">
+        $(BASE_CMN_SRC)
+        $(BASE_UNIX_SRC) $(BASE_WIN32_SRC) $(BASE_MAC_SRC) $(BASE_DARWIN_SRC)
+        $(BASE_OS2_SRC)
+        $(BASE_AND_GUI_CMN_SRC)
+        $(BASE_AND_GUI_UNIX_SRC)
+        $(BASE_AND_GUI_MAC_SRC)
+        $(BASE_AND_GUI_DARWIN_SRC)
+        $(BASE_AND_GUI_WIN32_SRC)
+        $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_MAC_SRC)
+        $(XML_SRC) $(ODBC_SRC)
     </set>
 
 </makefile>
     </set>
 
 </makefile>
wxWidgets (Impactor)