BIG CHANGE: added parsing of base classes; now CompareClasses() is much smarter since...

[wxWidgets.git] / build / bakefiles / files.bkl
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl

index 303084e59eb85ec8d7bd088ad0902a15eded3148..a42a93fe19e9efa2cb466b6820802d4b35c7f8ae 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -53,27 +53,68 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
  <!--                               UNIX                                     -->
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
  <!--                               UNIX                                     -->
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
-<set var="BASE_UNIX_SRC" hints="files">
-    src/unix/baseunix.cpp
+
+<!-- Files used on all Unix systems, including Darwin -->
+<set var="BASE_UNIX_AND_DARWIN_SRC" hints="files">
+    src/common/fdiodispatcher.cpp
+    src/common/selectdispatcher.cpp
+    src/unix/epolldispatcher.cpp
+    src/unix/appunix.cpp
+    src/unix/evtloopunix.cpp
      src/unix/dir.cpp
      src/unix/dlunix.cpp
      src/unix/dir.cpp
      src/unix/dlunix.cpp
-    src/unix/mimetype.cpp
      src/unix/snglinst.cpp
      src/unix/snglinst.cpp
-    src/unix/stackwalk.cpp
      src/unix/stdpaths.cpp
      src/unix/stdpaths.cpp
+    src/unix/timerunx.cpp
      src/unix/threadpsx.cpp
      src/unix/threadpsx.cpp
-</set>
-<set var="BASE_AND_GUI_UNIX_SRC" hints="files">
+    src/unix/stackwalk.cpp
      src/unix/utilsunx.cpp
  </set>
      src/unix/utilsunx.cpp
  </set>
-<set var="BASE_UNIX_HDR" hints="files">
+
+<set var="BASE_UNIX_AND_DARWIN_HDR" hints="files">
+    wx/private/fdiodispatcher.h
+    wx/private/selectdispatcher.h
+    wx/unix/app.h
      wx/unix/apptbase.h
      wx/unix/apptrait.h
      wx/unix/apptbase.h
      wx/unix/apptrait.h
-    wx/unix/execute.h
-    wx/unix/mimetype.h
+    wx/unix/chkconf.h
+    wx/unix/evtloop.h
      wx/unix/pipe.h
      wx/unix/pipe.h
-    wx/unix/stackwalk.h
      wx/unix/stdpaths.h
      wx/unix/stdpaths.h
+    wx/unix/stackwalk.h
+    wx/unix/tls.h
+</set>
+
+<!--
+    Files used on all Unix systems, including Darwin with any port but wxMac
+    (this is really an aberration, we should also use these files for wxMac,
+     it's not done because of some OS 9 support leftovers only now)
+ -->
+<set var="BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC" hints="files">
+    $(BASE_UNIX_AND_DARWIN_SRC)
+    src/unix/mimetype.cpp
+</set>
+
+<set var="BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR" hints="files">
+    $(BASE_UNIX_AND_DARWIN_HDR)
+    wx/unix/execute.h
+    wx/unix/mimetype.h
+    wx/unix/private.h
+</set>
+
+<!--
+    Files used on all non-Darwin Unix systems (because Darwin provides other,
+    better, native equivalents of the functionality they implement (e.g.
+    CFSocket instead of BSD sockets) or doesn't provide it at all (epoll,
+    backtrace())
+ -->
+<set var="BASE_UNIX_SRC" hints="files">
+    $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)
+    src/common/gsocketiohandler.cpp
+</set>
+<set var="BASE_UNIX_HDR" hints="files">
+    $(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR)
+    wx/private/gsocketiohandler.h
  </set>
  
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
  </set>
  
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
@@ -87,16 +128,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/msw/dir.cpp
      src/msw/dlmsw.cpp
      src/msw/mimetype.cpp
      src/msw/dir.cpp
      src/msw/dlmsw.cpp
      src/msw/mimetype.cpp
+    src/msw/power.cpp
      src/msw/regconf.cpp
      src/msw/registry.cpp
      src/msw/snglinst.cpp
      src/msw/stackwalk.cpp
      src/msw/stdpaths.cpp
      src/msw/thread.cpp
      src/msw/regconf.cpp
      src/msw/registry.cpp
      src/msw/snglinst.cpp
      src/msw/stackwalk.cpp
      src/msw/stdpaths.cpp
      src/msw/thread.cpp
+    src/msw/timer.cpp
      src/msw/utils.cpp
      src/msw/utilsexc.cpp
  </set>
  <set var="BASE_AND_GUI_WIN32_SRC" hints="files">
      src/msw/utils.cpp
      src/msw/utilsexc.cpp
  </set>
  <set var="BASE_AND_GUI_WIN32_SRC" hints="files">
+    src/msw/evtloop.cpp
      src/msw/main.cpp
      src/msw/mslu.cpp
      src/msw/volume.cpp
      src/msw/main.cpp
      src/msw/mslu.cpp
      src/msw/volume.cpp
@@ -112,10 +156,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/msw/dde.h
      wx/msw/debughlp.h
      wx/msw/gccpriv.h
      wx/msw/dde.h
      wx/msw/debughlp.h
      wx/msw/gccpriv.h
+    wx/msw/libraries.h
      wx/msw/mimetype.h
      wx/msw/mimetype.h
+    wx/msw/mslu.h
+    wx/msw/private.h
+    wx/msw/regconf.h
+    wx/msw/registry.h
+    wx/msw/seh.h
      wx/msw/stackwalk.h
      wx/msw/stackwalk.h
+    wx/msw/stdpaths.h
      wx/msw/winundef.h
      wx/msw/wrapcctl.h
      wx/msw/winundef.h
      wx/msw/wrapcctl.h
+    wx/msw/wrapcdlg.h
      wx/msw/wrapwin.h
  </set>
  <set var="BASE_WINCE_HDR" hints="files">
      wx/msw/wrapwin.h
  </set>
  <set var="BASE_WINCE_HDR" hints="files">
@@ -129,80 +181,51 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <!--                                Mac                                     -->
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
  
  <!--                                Mac                                     -->
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
  
-<!-- Used on Mac OS CarbonLib, Mac OS X wxMac base, and Mac OS X darwin base -->
+<!-- Used on Mac OS X wxMac base, and Mac OS X darwin base -->
  <set var="BASE_COREFOUNDATION_SRC" hints="files">
  <set var="BASE_COREFOUNDATION_SRC" hints="files">
-    src/mac/corefoundation/cfstring.cpp
-    src/mac/corefoundation/hid.cpp
-    src/mac/corefoundation/stdpaths_cf.cpp
+    src/osx/core/cfstring.cpp
+    src/osx/core/gsockosx.cpp
+    src/osx/core/stdpaths_cf.cpp
+    src/osx/core/strconv_cf.cpp
+    src/osx/core/utilsexc_base.cpp
  </set>
  <set var="BASE_COREFOUNDATION_HDR" hints="files">
  </set>
  <set var="BASE_COREFOUNDATION_HDR" hints="files">
-    wx/mac/corefoundation/cfstring.h
-    wx/mac/corefoundation/hid.h
-    wx/mac/corefoundation/stdpaths.h
-</set>
-
-<!-- Base files used by Carbon on OS X and CarbonLib (not true Classic) -->
-<!-- FIXME: Maybe this ought to be named BASE_MAC_CARBON_SRC  -->
-<set var="BASE_MAC_SRC" hints="files">
-    src/mac/carbon/dirmac.cpp
-    src/mac/carbon/mimetmac.cpp
-    src/mac/carbon/utilsexc.cpp
-    src/mac/carbon/thread.cpp
-    src/mac/carbon/macnotfy.cpp
-    <!-- One would think MoreFilesX is only for OS X but it seems to
-         apply to CarbonLib as well (FSRefMakeFSSpec) -->
-    src/mac/carbon/morefilex/MoreFilesX.c
+    wx/osx/core/cfdataref.h
+    wx/osx/core/cfref.h
+    wx/osx/core/cfstring.h
+    wx/osx/core/hid.h
+    wx/osx/core/private.h
+    wx/osx/core/stdpaths.h
+    wx/osx/core/private/strconv_cf.h
+</set>
+
+<!-- Base files used by OS X ports (not Carbon) -->
+<set var="BASE_OSX_SHARED_SRC" hints="files">
+    src/osx/core/mimetype.cpp
      $(BASE_COREFOUNDATION_SRC)
      $(BASE_COREFOUNDATION_SRC)
+    $(BASE_UNIX_AND_DARWIN_SRC)
  </set>
  </set>
-<set var="BASE_MAC_HDR" hints="files">
+<set var="BASE_OSX_SHARED_HDR" hints="files">
      $(BASE_COREFOUNDATION_HDR)
      $(BASE_COREFOUNDATION_HDR)
+    $(BASE_UNIX_AND_DARWIN_HDR)
  </set>
  </set>
-<!-- Base and GUI files used by both OS X and CarbonLib -->
-<set var="BASE_AND_GUI_MAC_SRC" hints="files">
-    src/mac/carbon/utils.cpp
-    src/mac/carbon/uma.cpp
-</set>
-
-<!-- Base files used by Classic (not CarbonLib or OS X builds) -->
-<!-- set var="BASE_MAC_CLASSIC_SRC">
-</set -->
-<!-- set var="BASE_MAC_CLASSIC_HDR">
-</set -->
-
-<!-- Base files used only by CarbonLib builds (not Classic or OS X) -->
-<set var="BASE_MAC_CARBONLIB_SRC" hints="files">
-    src/mac/carbon/morefile/DirectoryCopy.c
-    src/mac/carbon/morefile/FSpCompat.c
-    src/mac/carbon/morefile/FileCopy.c
-    src/mac/carbon/morefile/FullPath.c
-    src/mac/carbon/morefile/IterateDirectory.c
-    src/mac/carbon/morefile/MoreDesktopMgr.c
-    src/mac/carbon/morefile/MoreFiles.c
-    src/mac/carbon/morefile/MoreFilesExtras.c
-    src/mac/carbon/morefile/Search.c
-</set>
-<!-- set var="BASE_MAC_CARBONLIB_HDR" hints="files">
-</set -->
-
-<!-- Base files used only by OS X builds (not CarbonLib or Classic)  -->
-<set var="BASE_MACOSX_WXMAC_SRC" hints="files">
-    $(BASE_MAC_SRC)
-    src/unix/baseunix.cpp
-    src/unix/dlunix.cpp
-    src/unix/stdpaths.cpp
+<!-- Base and GUI files used by OS X -->
+<set var="BASE_AND_GUI_OSX_CARBON_SRC" hints="files">
+    src/osx/carbon/utils.cpp
+    src/osx/carbon/uma.cpp
  </set>
  </set>
-<set var="BASE_MACOSX_WXMAC_HDR" hints="files">
-    $(BASE_MAC_HDR)
-    wx/unix/stdpaths.h
+
+<set var="BASE_AND_GUI_OSX_COCOA_SRC" hints="files">
+    src/osx/cocoa/utils.mm
  </set>
  
  <!-- Base files used by non-wxMac OS X builds -->
  </set>
  
  <!-- Base files used by non-wxMac OS X builds -->
-<set var="BASE_MACOSX_NOTWXMAC_SRC" hints="files">
-    $(BASE_UNIX_SRC)
+<set var="BASE_OSX_NOTWXMAC_SRC" hints="files">
+    $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)
      $(BASE_COREFOUNDATION_SRC)
  </set>
      $(BASE_COREFOUNDATION_SRC)
  </set>
-<set var="BASE_MACOSX_NOTWXMAC_HDR" hints="files">
-    $(BASE_UNIX_HDR)
+<set var="BASE_OSX_NOTWXMAC_HDR" hints="files">
+    $(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR)
      $(BASE_COREFOUNDATION_HDR)
  </set>
  
      $(BASE_COREFOUNDATION_HDR)
  </set>
  
@@ -211,6 +234,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
  
  <set var="BASE_OS2_SRC" hints="files">
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
  
  <set var="BASE_OS2_SRC" hints="files">
+    src/common/fdiodispatcher.cpp
+    src/common/selectdispatcher.cpp
+    src/common/gsocketiohandler.cpp
+    src/unix/appunix.cpp
+    src/unix/evtloopunix.cpp
+    src/unix/timerunx.cpp
      src/os2/dir.cpp
      src/os2/mimetype.cpp
      src/os2/stdpaths.cpp
      src/os2/dir.cpp
      src/os2/mimetype.cpp
      src/os2/stdpaths.cpp
@@ -221,10 +250,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <set var="BASE_AND_GUI_OS2_SRC" hints="files">
  </set>
  <set var="BASE_OS2_HDR" hints="files">
  <set var="BASE_AND_GUI_OS2_SRC" hints="files">
  </set>
  <set var="BASE_OS2_HDR" hints="files">
+    wx/private/fdiodispatcher.h
+    wx/private/selectdispatcher.h
+    wx/private/gsocketiohandler.h
+    wx/unix/app.h
      wx/os2/apptbase.h
      wx/os2/apptrait.h
      wx/os2/apptbase.h
      wx/os2/apptrait.h
+    wx/unix/evtloop.h
      wx/os2/mimetype.h
      wx/os2/mimetype.h
+    wx/os2/private.h
      wx/os2/stdpaths.h
      wx/os2/stdpaths.h
+    wx/os2/chkconf.h
+    wx/os2/wxrsc.h
  </set>
  
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
  </set>
  
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
@@ -236,6 +273,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/palmos/dir.cpp
      src/palmos/prefconf.cpp
      src/palmos/snglinst.cpp
      src/palmos/dir.cpp
      src/palmos/prefconf.cpp
      src/palmos/snglinst.cpp
+    src/palmos/stdall.c
      src/palmos/thread.cpp
      src/palmos/utils.cpp
      src/palmos/utilsexc.cpp
      src/palmos/thread.cpp
      src/palmos/utils.cpp
      src/palmos/utilsexc.cpp
@@ -251,18 +289,39 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/palmos/apptrait.h
      wx/palmos/chkconf.h
      wx/palmos/mimetype.h
      wx/palmos/apptrait.h
      wx/palmos/chkconf.h
      wx/palmos/mimetype.h
+    wx/palmos/missing.h
      wx/palmos/stdpaths.h
  </set>
  
      wx/palmos/stdpaths.h
  </set>
  
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+<!--                               MSDOS                                    -->
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+
+<set var="BASE_MSDOS_SRC" hints="files">
+    src/msdos/dir.cpp
+    src/msdos/mimetype.cpp
+    src/msdos/utilsdos.cpp
+</set>
+<set var="BASE_AND_GUI_MSDOS_SRC" hints="files">
+</set>
+<set var="BASE_MSDOS_HDR" hints="files">
+    wx/msdos/mimetype.h
+</set>
+
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
  <!--                              Common                                    -->
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
  <set var="BASE_CMN_SRC" hints="files">
      src/common/appbase.cpp
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
  <!--                              Common                                    -->
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
  <set var="BASE_CMN_SRC" hints="files">
      src/common/appbase.cpp
+    src/common/arcall.cpp
+    src/common/arcfind.cpp
      src/common/archive.cpp
      src/common/archive.cpp
+    src/common/arrstr.cpp
+    src/common/base64.cpp
      src/common/clntdata.cpp
      src/common/cmdline.cpp
      src/common/config.cpp
      src/common/clntdata.cpp
      src/common/cmdline.cpp
      src/common/config.cpp
+    src/common/convauto.cpp
      src/common/datetime.cpp
      src/common/datstrm.cpp
      src/common/dircmn.cpp
      src/common/datetime.cpp
      src/common/datstrm.cpp
      src/common/dircmn.cpp
@@ -270,15 +329,20 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/common/dynlib.cpp
      src/common/dynload.cpp
      src/common/encconv.cpp
      src/common/dynlib.cpp
      src/common/dynload.cpp
      src/common/encconv.cpp
+    src/common/evtloopcmn.cpp
      src/common/extended.c
      src/common/ffile.cpp
      src/common/file.cpp
      src/common/extended.c
      src/common/ffile.cpp
      src/common/file.cpp
+    src/common/fileback.cpp
      src/common/fileconf.cpp
      src/common/filefn.cpp
      src/common/filename.cpp
      src/common/filesys.cpp
      src/common/fileconf.cpp
      src/common/filefn.cpp
      src/common/filename.cpp
      src/common/filesys.cpp
+    src/common/filtall.cpp
+    src/common/filtfind.cpp
      src/common/fmapbase.cpp
      src/common/fmapbase.cpp
-    src/common/fs_zip.cpp
+    src/common/fs_arc.cpp
+    src/common/fs_filter.cpp
      src/common/hash.cpp
      src/common/hashmap.cpp
      src/common/init.cpp
      src/common/hash.cpp
      src/common/hashmap.cpp
      src/common/init.cpp
@@ -292,6 +356,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/common/module.cpp
      src/common/mstream.cpp
      src/common/object.cpp
      src/common/module.cpp
      src/common/mstream.cpp
      src/common/object.cpp
+    src/common/platinfo.cpp
+    src/common/powercmn.cpp
      src/common/process.cpp
      src/common/regex.cpp
      src/common/stdpbase.cpp
      src/common/process.cpp
      src/common/regex.cpp
      src/common/stdpbase.cpp
@@ -300,15 +366,25 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/common/strconv.cpp
      src/common/stream.cpp
      src/common/string.cpp
      src/common/strconv.cpp
      src/common/stream.cpp
      src/common/string.cpp
+    src/common/stringimpl.cpp
+    src/common/stringops.cpp
+    src/common/strvararg.cpp
      src/common/sysopt.cpp
      src/common/sysopt.cpp
+    src/common/tarstrm.cpp
      src/common/textbuf.cpp
      src/common/textfile.cpp
      src/common/textbuf.cpp
      src/common/textfile.cpp
+    src/common/timercmn.cpp
+    src/common/timerimpl.cpp
      src/common/tokenzr.cpp
      src/common/txtstrm.cpp
      src/common/tokenzr.cpp
      src/common/txtstrm.cpp
+    src/common/unichar.cpp
      src/common/uri.cpp
      src/common/uri.cpp
+    src/common/ustring.cpp
      src/common/variant.cpp
      src/common/wfstream.cpp
      src/common/variant.cpp
      src/common/wfstream.cpp
-    src/common/wxchar.cpp
+    src/common/wxcrt.cpp
+    src/common/wxprintf.cpp
+    src/common/xlocale.cpp
      src/common/xti.cpp
      src/common/xtistrm.cpp
      src/common/zipstrm.cpp
      src/common/xti.cpp
      src/common/xtistrm.cpp
      src/common/zipstrm.cpp
@@ -327,23 +403,30 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/archive.h
      wx/arrimpl.cpp
      wx/arrstr.h
      wx/archive.h
      wx/arrimpl.cpp
      wx/arrstr.h
+    wx/atomic.h
+    wx/base64.h
      wx/beforestd.h
      wx/buffer.h
      wx/build.h
      wx/beforestd.h
      wx/buffer.h
      wx/build.h
+    wx/chartype.h
      wx/chkconf.h
      wx/clntdata.h
      wx/chkconf.h
      wx/clntdata.h
+    wx/cmdargs.h
      wx/cmdline.h
      wx/confbase.h
      wx/config.h
      wx/cmdline.h
      wx/confbase.h
      wx/config.h
+    wx/convauto.h
      wx/containr.h
      wx/containr.h
+    wx/cpp.h
+    wx/crt.h
      wx/datetime.h
      wx/datetime.h
-    wx/datetime.inl
      wx/datstrm.h
      wx/dde.h
      wx/debug.h
      wx/defs.h
      wx/dir.h
      wx/dlimpexp.h
      wx/datstrm.h
      wx/dde.h
      wx/debug.h
      wx/defs.h
      wx/dir.h
      wx/dlimpexp.h
+    wx/dlist.h
      wx/dynarray.h
      wx/dynlib.h
      wx/dynload.h
      wx/dynarray.h
      wx/dynlib.h
      wx/dynload.h
@@ -351,6 +434,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/event.h
      wx/except.h
      wx/features.h
      wx/event.h
      wx/except.h
      wx/features.h
+    wx/flags.h
      wx/ffile.h
      wx/file.h
      wx/fileconf.h
      wx/ffile.h
      wx/file.h
      wx/fileconf.h
@@ -359,6 +443,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/filesys.h
      wx/fontenc.h
      wx/fontmap.h
      wx/filesys.h
      wx/fontenc.h
      wx/fontmap.h
+    wx/fs_arc.h
+    wx/fs_filter.h
      wx/fs_mem.h
      wx/fs_zip.h
      wx/hash.h
      wx/fs_mem.h
      wx/fs_zip.h
      wx/hash.h
@@ -372,8 +458,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/ioswrap.h
      wx/ipc.h
      wx/ipcbase.h
      wx/ioswrap.h
      wx/ipc.h
      wx/ipcbase.h
-    wx/isql.h
-    wx/isqlext.h
+    wx/kbdstate.h
+    wx/link.h
      wx/list.h
      wx/listimpl.cpp
      wx/log.h
      wx/list.h
      wx/listimpl.cpp
      wx/log.h
@@ -384,13 +470,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/memtext.h
      wx/mimetype.h
      wx/module.h
      wx/memtext.h
      wx/mimetype.h
      wx/module.h
-    wx/msgout.h
+    wx/mousestate.h
      wx/msgout.h
      wx/mstream.h
      wx/object.h
      wx/platform.h
      wx/msgout.h
      wx/mstream.h
      wx/object.h
      wx/platform.h
+    wx/platinfo.h
+    wx/power.h
      wx/process.h
      wx/ptr_scpd.h
      wx/process.h
      wx/ptr_scpd.h
+    wx/ptr_shrd.h
+    wx/recguard.h
      wx/regex.h
      wx/scopeguard.h
      wx/snglinst.h
      wx/regex.h
      wx/scopeguard.h
      wx/snglinst.h
@@ -403,29 +493,45 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/strconv.h
      wx/stream.h
      wx/string.h
      wx/strconv.h
      wx/stream.h
      wx/string.h
+    wx/stringimpl.h
+    wx/stringops.h
+    wx/strvararg.h
      wx/sysopt.h
      wx/sysopt.h
+    wx/tarstrm.h
      wx/textbuf.h
      wx/textfile.h
      wx/thread.h
      wx/thrimpl.cpp
      wx/timer.h
      wx/tokenzr.h
      wx/textbuf.h
      wx/textfile.h
      wx/thread.h
      wx/thrimpl.cpp
      wx/timer.h
      wx/tokenzr.h
+    wx/tracker.h
      wx/txtstrm.h
      wx/types.h
      wx/txtstrm.h
      wx/types.h
+    wx/unichar.h
      wx/uri.h
      wx/uri.h
+    wx/ustring.h
      wx/utils.h
      wx/variant.h
      wx/vector.h
      wx/version.h
      wx/volume.h
      wx/utils.h
      wx/variant.h
      wx/vector.h
      wx/version.h
      wx/volume.h
+    wx/weakref.h
      wx/wfstream.h
      wx/wx.h
      wx/wxchar.h
      wx/wfstream.h
      wx/wx.h
      wx/wxchar.h
+    wx/wxcrt.h
+    wx/wxcrtbase.h
+    wx/wxcrtvararg.h
      wx/wxprec.h
      wx/wxprec.h
+    wx/xlocale.h
      wx/xti.h
      wx/xtistrm.h
      wx/zipstrm.h
      wx/zstream.h
      wx/xti.h
      wx/xtistrm.h
      wx/zipstrm.h
      wx/zstream.h
+    wx/meta/convertible.h
+    wx/meta/if.h
+    wx/meta/int2type.h
+    wx/meta/movable.h
  </set>
  
  
  </set>
  
  
@@ -442,6 +548,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  
  <set var="NET_WIN32_SRC" hints="files">
      src/msw/gsocket.cpp
  
  <set var="NET_WIN32_SRC" hints="files">
      src/msw/gsocket.cpp
+    src/msw/gsockmsw.cpp
      src/msw/urlmsw.cpp
  </set>
  <set var="NET_WIN32_HDR" hints="files">
      src/msw/urlmsw.cpp
  </set>
  <set var="NET_WIN32_HDR" hints="files">
@@ -461,13 +568,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <set var="NET_OS2_HDR" hints="files">
      wx/unix/gsockunx.h
  </set>
  <set var="NET_OS2_HDR" hints="files">
      wx/unix/gsockunx.h
  </set>
-<!-- Net files used only by CarbonLib (not Classic or OS X) -->
-<set var="NET_MAC_CARBONLIB_SRC" hints="files">
-    src/mac/carbon/gsocket.cpp
-</set>
-<set var="NET_MAC_CARBONLIB_HDR" hints="files">
-    wx/mac/carbon/gsockmac.h
-</set>
  
  <set var="NET_CMN_SRC" hints="files">
      src/common/fs_inet.cpp
  
  <set var="NET_CMN_SRC" hints="files">
      src/common/fs_inet.cpp
@@ -513,14 +613,21 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <!-- ====================================================================== -->
  
  <set var="GUI_CMN_SRC" hints="files">
  <!-- ====================================================================== -->
  
  <set var="GUI_CMN_SRC" hints="files">
+    src/common/accelcmn.cpp
      src/common/accesscmn.cpp
      src/common/accesscmn.cpp
+    src/common/anidecod.cpp
      src/common/appcmn.cpp
      src/common/artprov.cpp
      src/common/artstd.cpp
      src/common/bmpbase.cpp
      src/common/bookctrl.cpp
      src/common/appcmn.cpp
      src/common/artprov.cpp
      src/common/artstd.cpp
      src/common/bmpbase.cpp
      src/common/bookctrl.cpp
+    src/common/btncmn.cpp
+    src/common/cairo.cpp
      src/common/choiccmn.cpp
      src/common/clipcmn.cpp
      src/common/choiccmn.cpp
      src/common/clipcmn.cpp
+    src/common/clrpickercmn.cpp
+    src/common/colourcmn.cpp
+    src/common/combocmn.cpp
      src/common/cmdproc.cpp
      src/common/cmndata.cpp
      src/common/containr.cpp
      src/common/cmdproc.cpp
      src/common/cmndata.cpp
      src/common/containr.cpp
@@ -529,6 +636,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/common/ctrlsub.cpp
      src/common/datacmn.cpp
      src/common/dcbase.cpp
      src/common/ctrlsub.cpp
      src/common/datacmn.cpp
      src/common/dcbase.cpp
+    src/common/dcbufcmn.cpp
+    src/common/dcgraph.cpp
+    src/common/dcsvg.cpp
      src/common/dlgcmn.cpp
      src/common/dndcmn.cpp
      src/common/dobjcmn.cpp
      src/common/dlgcmn.cpp
      src/common/dndcmn.cpp
      src/common/dobjcmn.cpp
@@ -538,15 +648,21 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/common/dseldlg.cpp
      src/common/effects.cpp
      src/common/fddlgcmn.cpp
      src/common/dseldlg.cpp
      src/common/effects.cpp
      src/common/fddlgcmn.cpp
+    src/common/filectrlcmn.cpp
+    src/common/filepickercmn.cpp
+    src/common/fontpickercmn.cpp
      src/common/fldlgcmn.cpp
      src/common/fontcmn.cpp
      src/common/fldlgcmn.cpp
      src/common/fontcmn.cpp
+    src/common/fontenumcmn.cpp
      src/common/fontmap.cpp
      src/common/fontmap.cpp
+    src/common/fontutilcmn.cpp
      src/common/framecmn.cpp
      src/common/gaugecmn.cpp
      src/common/gbsizer.cpp
      src/common/gdicmn.cpp
      src/common/geometry.cpp
      src/common/gifdecod.cpp
      src/common/framecmn.cpp
      src/common/gaugecmn.cpp
      src/common/gbsizer.cpp
      src/common/gdicmn.cpp
      src/common/geometry.cpp
      src/common/gifdecod.cpp
+    src/common/graphcmn.cpp
      src/common/helpbase.cpp
      src/common/iconbndl.cpp
      src/common/imagall.cpp
      src/common/helpbase.cpp
      src/common/iconbndl.cpp
      src/common/imagall.cpp
@@ -559,14 +675,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/common/imagpcx.cpp
      src/common/imagpng.cpp
      src/common/imagpnm.cpp
      src/common/imagpcx.cpp
      src/common/imagpng.cpp
      src/common/imagpnm.cpp
+    src/common/imagtga.cpp
      src/common/imagtiff.cpp
      src/common/imagxpm.cpp
      src/common/layout.cpp
      src/common/lboxcmn.cpp
      src/common/imagtiff.cpp
      src/common/imagxpm.cpp
      src/common/layout.cpp
      src/common/lboxcmn.cpp
+    src/common/listctrlcmn.cpp
      src/common/matrix.cpp
      src/common/menucmn.cpp
      src/common/nbkbase.cpp
      src/common/matrix.cpp
      src/common/menucmn.cpp
      src/common/nbkbase.cpp
+    src/common/overlaycmn.cpp
      src/common/paper.cpp
      src/common/paper.cpp
+    src/common/pickerbase.cpp
      src/common/popupcmn.cpp
      src/common/prntbase.cpp
      src/common/quantize.cpp
      src/common/popupcmn.cpp
      src/common/prntbase.cpp
      src/common/quantize.cpp
@@ -575,24 +695,31 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/common/rgncmn.cpp
      src/common/settcmn.cpp
      src/common/sizer.cpp
      src/common/rgncmn.cpp
      src/common/settcmn.cpp
      src/common/sizer.cpp
+    src/common/srchcmn.cpp
      src/common/statbar.cpp
      src/common/statbar.cpp
+    src/common/stattextcmn.cpp
      src/common/stockitem.cpp
      src/common/tbarbase.cpp
      src/common/textcmn.cpp
      src/common/stockitem.cpp
      src/common/tbarbase.cpp
      src/common/textcmn.cpp
-    src/common/timercmn.cpp
+    src/common/textentrycmn.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/toplvcmn.cpp
      src/common/treebase.cpp
      src/common/valgen.cpp
      src/common/validate.cpp
      src/common/valtext.cpp
      src/common/wincmn.cpp
+    src/common/windowid.cpp
+    src/common/wrapsizer.cpp
      src/common/xpmdecod.cpp
      src/generic/busyinfo.cpp
      src/common/xpmdecod.cpp
      src/generic/busyinfo.cpp
+    src/generic/buttonbar.cpp
      src/generic/choicdgg.cpp
      src/generic/choicbkg.cpp
      src/generic/choicdgg.cpp
      src/generic/choicbkg.cpp
+    src/generic/combog.cpp
      src/generic/dcpsg.cpp
      src/generic/dirctrlg.cpp
      src/generic/dragimgg.cpp
      src/generic/dcpsg.cpp
      src/generic/dirctrlg.cpp
      src/generic/dragimgg.cpp
+    src/generic/filectrlg.cpp
      src/generic/listbkg.cpp
      src/generic/logg.cpp
      src/generic/numdlgg.cpp
      src/generic/listbkg.cpp
      src/generic/logg.cpp
      src/generic/numdlgg.cpp
@@ -604,9 +731,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/generic/selstore.cpp
      src/generic/spinctlg.cpp
      src/generic/splitter.cpp
      src/generic/selstore.cpp
      src/generic/spinctlg.cpp
      src/generic/splitter.cpp
+    src/generic/srchctlg.cpp
+    src/generic/statbmpg.cpp
      src/generic/textdlgg.cpp
      src/generic/tipwin.cpp
      src/generic/textdlgg.cpp
      src/generic/tipwin.cpp
+    src/generic/toolbkg.cpp
      src/generic/treectlg.cpp
      src/generic/treectlg.cpp
+    src/generic/treebkg.cpp
      src/generic/vlbox.cpp
      src/generic/vscroll.cpp
  </set>
      src/generic/vlbox.cpp
      src/generic/vscroll.cpp
  </set>
@@ -614,20 +745,25 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/bmpbuttn.h
      wx/brush.h
      wx/button.h
      wx/bmpbuttn.h
      wx/brush.h
      wx/button.h
+    wx/cairo.h
      wx/checkbox.h
      wx/checklst.h
      wx/choicdlg.h
      wx/choice.h
      wx/cmndata.h
      wx/checkbox.h
      wx/checklst.h
      wx/choicdlg.h
      wx/choice.h
      wx/cmndata.h
+    wx/collpane.h
+    wx/combo.h
      wx/combobox.h
      wx/control.h
      wx/ctrlsub.h
      wx/cursor.h
      wx/dc.h
      wx/dcclient.h
      wx/combobox.h
      wx/control.h
      wx/ctrlsub.h
      wx/cursor.h
      wx/dc.h
      wx/dcclient.h
+    wx/dcgraph.h
      wx/dcmemory.h
      wx/dcprint.h
      wx/dcscreen.h
      wx/dcmemory.h
      wx/dcprint.h
      wx/dcscreen.h
+    wx/dcsvg.h
      wx/dialog.h
      wx/dirdlg.h
      wx/dragimag.h
      wx/dialog.h
      wx/dirdlg.h
      wx/dragimag.h
@@ -638,14 +774,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/gbsizer.h
      wx/gdicmn.h
      wx/generic/accel.h
      wx/gbsizer.h
      wx/gdicmn.h
      wx/generic/accel.h
+    wx/generic/buttonbar.h
      wx/generic/choicdgg.h
      wx/generic/colrdlgg.h
      wx/generic/choicdgg.h
      wx/generic/colrdlgg.h
+    wx/generic/combo.h
      wx/generic/dcpsg.h
      wx/generic/dirctrlg.h
      wx/generic/dragimgg.h
      wx/generic/dcpsg.h
      wx/generic/dirctrlg.h
      wx/generic/dragimgg.h
-    wx/generic/filedlgg.h
-    wx/generic/fontdlgg.h
-    wx/generic/imaglist.h
+    wx/generic/filectrlg.h
      wx/generic/logg.h
      wx/generic/msgdlgg.h
      wx/generic/numdlgg.h
      wx/generic/logg.h
      wx/generic/msgdlgg.h
      wx/generic/numdlgg.h
@@ -657,9 +793,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/generic/scrolwin.h
      wx/generic/spinctlg.h
      wx/generic/splitter.h
      wx/generic/scrolwin.h
      wx/generic/spinctlg.h
      wx/generic/splitter.h
+    wx/generic/srchctlg.h
+    wx/generic/statbmpg.h
      wx/generic/textdlgg.h
      wx/generic/textdlgg.h
-    wx/generic/timer.h
      wx/generic/treectlg.h
      wx/generic/treectlg.h
+    wx/graphics.h
      wx/helphtml.h
      wx/icon.h
      wx/layout.h
      wx/helphtml.h
      wx/icon.h
      wx/layout.h
@@ -667,10 +805,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/mdi.h
      wx/menu.h
      wx/msgdlg.h
      wx/mdi.h
      wx/menu.h
      wx/msgdlg.h
+    wx/nativewin.h
      wx/numdlg.h
      wx/numdlg.h
+    wx/overlay.h
      wx/palette.h
      wx/panel.h
      wx/pen.h
      wx/palette.h
      wx/panel.h
      wx/pen.h
+    wx/position.h
      wx/radiobox.h
      wx/radiobut.h
      wx/renderer.h
      wx/radiobox.h
      wx/radiobut.h
      wx/renderer.h
@@ -687,20 +828,29 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/statusbr.h
      wx/textctrl.h
      wx/textdlg.h
      wx/statusbr.h
      wx/textctrl.h
      wx/textdlg.h
+    wx/textentry.h
+    wx/tls.h
      wx/toolbar.h
      wx/validate.h
      wx/valtext.h
      wx/window.h
      wx/toolbar.h
      wx/validate.h
      wx/valtext.h
      wx/window.h
+    wx/windowid.h
+    wx/wrapsizer.h
+    wx/wupdlock.h
  
      wx/accel.h
      wx/access.h
  
      wx/accel.h
      wx/access.h
+    wx/anidecod.h
+    wx/animdecod.h
      wx/artprov.h
      wx/bitmap.h
      wx/bookctrl.h
      wx/busyinfo.h
      wx/artprov.h
      wx/bitmap.h
      wx/bookctrl.h
      wx/busyinfo.h
+    wx/generic/busyinfo.h
      wx/caret.h
      wx/choicebk.h
      wx/clipbrd.h
      wx/caret.h
      wx/choicebk.h
      wx/clipbrd.h
+    wx/clrpicker.h
      wx/cmdproc.h
      wx/colordlg.h
      wx/colour.h
      wx/cmdproc.h
      wx/colordlg.h
      wx/colour.h
@@ -711,12 +861,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/dialup.h
      wx/dirctrl.h
      wx/display.h
      wx/dialup.h
      wx/dirctrl.h
      wx/display.h
+    wx/display_impl.h
      wx/dnd.h
      wx/docmdi.h
      wx/docview.h
      wx/effects.h
      wx/evtloop.h
      wx/fdrepdlg.h
      wx/dnd.h
      wx/docmdi.h
      wx/docview.h
      wx/effects.h
      wx/evtloop.h
      wx/fdrepdlg.h
+    wx/filectrl.h
+    wx/filepicker.h
+    wx/fontpicker.h
      wx/fmappriv.h
      wx/font.h
      wx/fontdlg.h
      wx/fmappriv.h
      wx/font.h
      wx/fontdlg.h
@@ -725,7 +879,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/gdiobj.h
      wx/geometry.h
      wx/gifdecod.h
      wx/gdiobj.h
      wx/geometry.h
      wx/gifdecod.h
-    wx/glcanvas.h
      wx/help.h
      wx/helpbase.h
      wx/helpwin.h
      wx/help.h
      wx/helpbase.h
      wx/helpwin.h
@@ -739,6 +892,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/imagpcx.h
      wx/imagpng.h
      wx/imagpnm.h
      wx/imagpcx.h
      wx/imagpng.h
      wx/imagpnm.h
+    wx/imagtga.h
      wx/imagtiff.h
      wx/imagxpm.h
      wx/listbase.h
      wx/imagtiff.h
      wx/imagxpm.h
      wx/listbase.h
@@ -748,15 +902,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/menuitem.h
      wx/metafile.h
      wx/minifram.h
      wx/menuitem.h
      wx/metafile.h
      wx/minifram.h
+    wx/nonownedwnd.h
      wx/notebook.h
      wx/ownerdrw.h
      wx/paper.h
      wx/notebook.h
      wx/ownerdrw.h
      wx/paper.h
+    wx/pickerbase.h
      wx/popupwin.h
      wx/print.h
      wx/printdlg.h
      wx/prntbase.h
      wx/progdlg.h
      wx/popupwin.h
      wx/print.h
      wx/printdlg.h
      wx/prntbase.h
      wx/progdlg.h
-    wx/ptr_scpd.h
      wx/quantize.h
      wx/rawbmp.h
      wx/region.h
      wx/quantize.h
      wx/rawbmp.h
      wx/region.h
@@ -764,15 +919,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/spinbutt.h
      wx/spinctrl.h
      wx/splitter.h
      wx/spinbutt.h
      wx/spinctrl.h
      wx/splitter.h
+    wx/srchctrl.h
      wx/statline.h
      wx/tab.h
      wx/tabctrl.h
      wx/tbarbase.h
      wx/tglbtn.h
      wx/tipwin.h
      wx/statline.h
      wx/tab.h
      wx/tabctrl.h
      wx/tbarbase.h
      wx/tglbtn.h
      wx/tipwin.h
+    wx/toolbook.h
      wx/tooltip.h
      wx/toplevel.h
      wx/treebase.h
      wx/tooltip.h
      wx/toplevel.h
      wx/treebase.h
+    wx/treebook.h
      wx/treectrl.h
      wx/valgen.h
      wx/vidmode.h
      wx/treectrl.h
      wx/valgen.h
      wx/vidmode.h
@@ -783,6 +941,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/xpmhand.h
  </set>
  
      wx/xpmhand.h
  </set>
  
+<!-- ====================================================================== -->
+<!--                            Common Unix files:                          -->
+<!-- ====================================================================== -->
+
+<set var="UNIX_SRC" hints="files">
+    src/unix/apptraits.cpp
+</set>
  
  <!-- ====================================================================== -->
  <!--                            Common X11 code:                            -->
  
  <!-- ====================================================================== -->
  <!--                            Common X11 code:                            -->
@@ -790,6 +955,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  
  <set var="XWIN_LOWLEVEL_SRC" hints="files">
      src/generic/caret.cpp
  
  <set var="XWIN_LOWLEVEL_SRC" hints="files">
      src/generic/caret.cpp
+    src/generic/imaglist.cpp
      src/unix/dialup.cpp
      src/unix/fontenum.cpp
      src/unix/fontutil.cpp
      src/unix/dialup.cpp
      src/unix/fontenum.cpp
      src/unix/fontutil.cpp
@@ -798,9 +964,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  </set>
  <set var="XWIN_LOWLEVEL_HDR" hints="files">
      wx/generic/caret.h
  </set>
  <set var="XWIN_LOWLEVEL_HDR" hints="files">
      wx/generic/caret.h
+    wx/generic/imaglist.h
      wx/unix/fontutil.h
      wx/unix/utilsx11.h
      wx/unix/fontutil.h
      wx/unix/utilsx11.h
-    wx/unix/displayx11.h
  </set>
  
  
  </set>
  
  
@@ -810,14 +976,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  
  <set var="GTK_LOWLEVEL_SRC" hints="files">
      $(XWIN_LOWLEVEL_SRC)
  
  <set var="GTK_LOWLEVEL_SRC" hints="files">
      $(XWIN_LOWLEVEL_SRC)
+    src/generic/icon.cpp
      src/generic/paletteg.cpp
      src/gtk/app.cpp
      src/generic/paletteg.cpp
      src/gtk/app.cpp
+    src/gtk/assertdlg_gtk.c
      src/gtk/bitmap.cpp
      src/gtk/brush.cpp
      src/gtk/clipbrd.cpp
      src/gtk/colour.cpp
      src/gtk/cursor.cpp
      src/gtk/bitmap.cpp
      src/gtk/brush.cpp
      src/gtk/clipbrd.cpp
      src/gtk/colour.cpp
      src/gtk/cursor.cpp
-    src/gtk/data.cpp
      src/gtk/dataobj.cpp
      src/gtk/dc.cpp
      src/gtk/dcclient.cpp
      src/gtk/dataobj.cpp
      src/gtk/dc.cpp
      src/gtk/dcclient.cpp
@@ -825,14 +992,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/gtk/dcscreen.cpp
      src/gtk/dnd.cpp
      src/gtk/evtloop.cpp
      src/gtk/dcscreen.cpp
      src/gtk/dnd.cpp
      src/gtk/evtloop.cpp
+    src/gtk/filectrl.cpp
      src/gtk/font.cpp
      src/gtk/font.cpp
-    src/gtk/gdiobj.cpp
      src/gtk/gsockgtk.cpp
      src/gtk/gsockgtk.cpp
-    src/gtk/icon.cpp
-    src/gtk/main.cpp
      src/gtk/minifram.cpp
      src/gtk/pen.cpp
      src/gtk/popupwin.cpp
      src/gtk/minifram.cpp
      src/gtk/pen.cpp
      src/gtk/popupwin.cpp
+    src/gtk/private.cpp
      src/gtk/region.cpp
      src/gtk/renderer.cpp
      src/gtk/settings.cpp
      src/gtk/region.cpp
      src/gtk/renderer.cpp
      src/gtk/settings.cpp
@@ -840,13 +1006,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/gtk/tooltip.cpp
      src/gtk/toplevel.cpp
      src/gtk/utilsgtk.cpp
      src/gtk/tooltip.cpp
      src/gtk/toplevel.cpp
      src/gtk/utilsgtk.cpp
-    src/gtk/win_gtk.c
+    src/gtk/win_gtk.cpp
      src/gtk/window.cpp
  </set>
  <set var="GTK_LOWLEVEL_HDR" hints="files">
      $(XWIN_LOWLEVEL_HDR)
      src/gtk/window.cpp
  </set>
  <set var="GTK_LOWLEVEL_HDR" hints="files">
      $(XWIN_LOWLEVEL_HDR)
+    wx/generic/icon.h
      wx/generic/paletteg.h
      wx/gtk/app.h
      wx/generic/paletteg.h
      wx/gtk/app.h
+    wx/gtk/assertdlg_gtk.h
      wx/gtk/bitmap.h
      wx/gtk/brush.h
      wx/gtk/clipbrd.h
      wx/gtk/bitmap.h
      wx/gtk/brush.h
      wx/gtk/clipbrd.h
@@ -861,33 +1029,29 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/gtk/dcscreen.h
      wx/gtk/dnd.h
      wx/gtk/font.h
      wx/gtk/dcscreen.h
      wx/gtk/dnd.h
      wx/gtk/font.h
-    wx/gtk/gdiobj.h
-    wx/gtk/icon.h
      wx/gtk/minifram.h
      wx/gtk/pen.h
      wx/gtk/popupwin.h
      wx/gtk/minifram.h
      wx/gtk/pen.h
      wx/gtk/popupwin.h
+    wx/gtk/private/win_gtk.h
      wx/gtk/region.h
      wx/gtk/region.h
-    wx/gtk/timer.h
      wx/gtk/tooltip.h
      wx/gtk/toplevel.h
      wx/gtk/tooltip.h
      wx/gtk/toplevel.h
-    wx/gtk/win_gtk.h
      wx/gtk/window.h
  </set>
  <set var="GTK_SRC" hints="files">
      <!-- Generic implementations used by wxGTK: -->
      src/generic/accel.cpp
      wx/gtk/window.h
  </set>
  <set var="GTK_SRC" hints="files">
      <!-- Generic implementations used by wxGTK: -->
      src/generic/accel.cpp
-    src/generic/colrdlgg.cpp
-    src/generic/dirdlgg.cpp
      src/generic/fdrepdlg.cpp
      src/generic/fdrepdlg.cpp
-    src/generic/filedlgg.cpp
-    src/generic/imaglist.cpp
+    <!-- Needed as long as we support GTK+ < 2.6 -->
+    src/generic/filepickerg.cpp
+    src/generic/graphicc.cpp
      src/generic/listctrl.cpp
      src/generic/listctrl.cpp
-    src/generic/msgdlgg.cpp
      src/generic/prntdlgg.cpp
      src/generic/statusbr.cpp
      src/generic/tabg.cpp
      <!-- Generic implementations used by wxGPE: -->
      src/generic/fontdlgg.cpp
      src/generic/prntdlgg.cpp
      src/generic/statusbr.cpp
      src/generic/tabg.cpp
      <!-- Generic implementations used by wxGPE: -->
      src/generic/fontdlgg.cpp
+    src/generic/msgdlgg.cpp
      <!-- GTK+ specific files: -->
      src/gtk/artgtk.cpp
      src/gtk/bmpbuttn.cpp
      <!-- GTK+ specific files: -->
      src/gtk/artgtk.cpp
      src/gtk/bmpbuttn.cpp
@@ -895,19 +1059,28 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/gtk/checkbox.cpp
      src/gtk/checklst.cpp
      src/gtk/choice.cpp
      src/gtk/checkbox.cpp
      src/gtk/checklst.cpp
      src/gtk/choice.cpp
+    src/gtk/collpane.cpp
      src/gtk/colordlg.cpp
      src/gtk/combobox.cpp
      src/gtk/control.cpp
      src/gtk/colordlg.cpp
      src/gtk/combobox.cpp
      src/gtk/control.cpp
+    src/gtk/clrpicker.cpp
      src/gtk/dialog.cpp
      src/gtk/dialog.cpp
+    src/gtk/fontpicker.cpp
+    src/gtk/filepicker.cpp
+    src/gtk/dirdlg.cpp
      src/gtk/filedlg.cpp
      src/gtk/fontdlg.cpp
      src/gtk/frame.cpp
      src/gtk/gauge.cpp
      src/gtk/gnome/gprint.cpp
      src/gtk/filedlg.cpp
      src/gtk/fontdlg.cpp
      src/gtk/frame.cpp
      src/gtk/gauge.cpp
      src/gtk/gnome/gprint.cpp
+    src/gtk/gnome/gvfs.cpp
+    src/gtk/print.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
+    src/gtk/mnemonics.cpp
      src/gtk/msgdlg.cpp
      src/gtk/msgdlg.cpp
+    src/gtk/nativewin.cpp
      src/gtk/notebook.cpp
      src/gtk/radiobox.cpp
      src/gtk/radiobut.cpp
      src/gtk/notebook.cpp
      src/gtk/radiobox.cpp
      src/gtk/radiobut.cpp
@@ -922,13 +1095,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/gtk/stattext.cpp
      src/gtk/tbargtk.cpp
      src/gtk/textctrl.cpp
      src/gtk/stattext.cpp
      src/gtk/tbargtk.cpp
      src/gtk/textctrl.cpp
+    src/gtk/textentry.cpp
      src/gtk/tglbtn.cpp
      src/gtk/tglbtn.cpp
-    src/gtk/utilsres.cpp
+    src/gtk/treeentry_gtk.c
  </set>
  <set var="GTK_HDR" hints="files">
  </set>
  <set var="GTK_HDR" hints="files">
-    wx/generic/colrdlgg.h
-    wx/generic/dirdlgg.h
      wx/generic/fdrepdlg.h
      wx/generic/fdrepdlg.h
+    wx/generic/filepickerg.h
+    wx/generic/fontdlgg.h
      wx/generic/listctrl.h
      wx/generic/statusbr.h
      wx/generic/tabg.h
      wx/generic/listctrl.h
      wx/generic/statusbr.h
      wx/generic/tabg.h
@@ -937,16 +1111,25 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/gtk/button.h
      wx/gtk/checkbox.h
      wx/gtk/checklst.h
      wx/gtk/button.h
      wx/gtk/checkbox.h
      wx/gtk/checklst.h
+    wx/gtk/chkconf.h
+    wx/gtk/collpane.h
      wx/gtk/colordlg.h
      wx/gtk/choice.h
      wx/gtk/combobox.h
      wx/gtk/control.h
      wx/gtk/colordlg.h
      wx/gtk/choice.h
      wx/gtk/combobox.h
      wx/gtk/control.h
+    wx/gtk/clrpicker.h
      wx/gtk/dialog.h
      wx/gtk/dialog.h
+    wx/gtk/dirdlg.h
+    wx/gtk/filectrl.h
      wx/gtk/filedlg.h
      wx/gtk/filedlg.h
+    wx/gtk/fontpicker.h
+    wx/gtk/filepicker.h
      wx/gtk/fontdlg.h
      wx/gtk/frame.h
      wx/gtk/gauge.h
      wx/gtk/gnome/gprint.h
      wx/gtk/fontdlg.h
      wx/gtk/frame.h
      wx/gtk/gauge.h
      wx/gtk/gnome/gprint.h
+    wx/gtk/gnome/gvfs.h
+    wx/gtk/print.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
@@ -966,8 +1149,174 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/gtk/stattext.h
      wx/gtk/tbargtk.h
      wx/gtk/textctrl.h
      wx/gtk/stattext.h
      wx/gtk/tbargtk.h
      wx/gtk/textctrl.h
+    wx/gtk/textentry.h
      wx/gtk/tglbtn.h
      wx/gtk/tglbtn.h
-    wx/gtk/treectrl.h
+    wx/gtk/treeentry_gtk.h
+</set>
+
+
+<!-- ====================================================================== -->
+<!--                                wxGTK1                                  -->
+<!-- ====================================================================== -->
+
+<set var="GTK1_LOWLEVEL_SRC" hints="files">
+    $(XWIN_LOWLEVEL_SRC)
+    src/generic/icon.cpp
+    src/generic/paletteg.cpp
+    src/gtk1/app.cpp
+    src/gtk1/bitmap.cpp
+    src/gtk1/brush.cpp
+    src/gtk1/clipbrd.cpp
+    src/gtk1/colour.cpp
+    src/gtk1/cursor.cpp
+    src/gtk1/data.cpp
+    src/gtk1/dataobj.cpp
+    src/gtk1/dc.cpp
+    src/gtk1/dcclient.cpp
+    src/gtk1/dcmemory.cpp
+    src/gtk1/dcscreen.cpp
+    src/gtk1/dnd.cpp
+    src/gtk1/evtloop.cpp
+    src/gtk1/font.cpp
+    src/gtk1/gsockgtk.cpp
+    src/gtk1/main.cpp
+    src/gtk1/minifram.cpp
+    src/gtk1/pen.cpp
+    src/gtk1/popupwin.cpp
+    src/gtk1/region.cpp
+    src/gtk1/renderer.cpp
+    src/gtk1/settings.cpp
+    src/gtk1/timer.cpp
+    src/gtk1/tooltip.cpp
+    src/gtk1/toplevel.cpp
+    src/gtk1/utilsgtk.cpp
+    src/gtk1/win_gtk.c
+    src/gtk1/window.cpp
+</set>
+<set var="GTK1_LOWLEVEL_HDR" hints="files">
+    $(XWIN_LOWLEVEL_HDR)
+    wx/generic/icon.h
+    wx/generic/paletteg.h
+    wx/gtk1/app.h
+    wx/gtk1/bitmap.h
+    wx/gtk1/brush.h
+    wx/gtk1/clipbrd.h
+    wx/gtk1/colour.h
+    wx/gtk1/cursor.h
+    wx/gtk1/dataform.h
+    wx/gtk1/dataobj.h
+    wx/gtk1/dataobj2.h
+    wx/gtk1/dc.h
+    wx/gtk1/dcclient.h
+    wx/gtk1/dcmemory.h
+    wx/gtk1/dcscreen.h
+    wx/gtk1/dnd.h
+    wx/gtk1/font.h
+    wx/gtk1/minifram.h
+    wx/gtk1/pen.h
+    wx/gtk1/popupwin.h
+    wx/gtk1/region.h
+    wx/gtk1/tooltip.h
+    wx/gtk1/toplevel.h
+    wx/gtk1/win_gtk.h
+    wx/gtk1/window.h
+</set>
+<set var="GTK1_SRC" hints="files">
+    <!-- Generic implementations used by wxGTK1: -->
+    src/generic/accel.cpp
+    src/generic/clrpickerg.cpp
+    src/generic/collpaneg.cpp
+    src/generic/colrdlgg.cpp
+    src/generic/dirdlgg.cpp
+    src/generic/fdrepdlg.cpp
+    src/generic/filedlgg.cpp
+    src/generic/filepickerg.cpp
+    src/generic/fontdlgg.cpp
+    src/generic/fontpickerg.cpp
+    src/generic/listctrl.cpp
+    src/generic/msgdlgg.cpp
+    src/generic/prntdlgg.cpp
+    src/generic/statusbr.cpp
+    src/generic/tabg.cpp
+    <!-- GTK1 specific files: -->
+    src/gtk1/bmpbuttn.cpp
+    src/gtk1/button.cpp
+    src/gtk1/checkbox.cpp
+    src/gtk1/checklst.cpp
+    src/gtk1/choice.cpp
+    src/gtk1/combobox.cpp
+    src/gtk1/control.cpp
+    src/gtk1/dialog.cpp
+    src/gtk1/filedlg.cpp
+    src/gtk1/fontdlg.cpp
+    src/gtk1/frame.cpp
+    src/gtk1/gauge.cpp
+    src/gtk1/listbox.cpp
+    src/gtk1/mdi.cpp
+    src/gtk1/menu.cpp
+    src/gtk1/notebook.cpp
+    src/gtk1/radiobox.cpp
+    src/gtk1/radiobut.cpp
+    src/gtk1/scrolbar.cpp
+    src/gtk1/scrolwin.cpp
+    src/gtk1/slider.cpp
+    src/gtk1/spinbutt.cpp
+    src/gtk1/spinctrl.cpp
+    src/gtk1/statbmp.cpp
+    src/gtk1/statbox.cpp
+    src/gtk1/statline.cpp
+    src/gtk1/stattext.cpp
+    src/gtk1/tbargtk.cpp
+    src/gtk1/textctrl.cpp
+    src/gtk1/tglbtn.cpp
+</set>
+<set var="GTK1_HDR" hints="files">
+    wx/generic/clrpickerg.h
+    wx/generic/collpaneg.h
+    wx/generic/colrdlgg.h
+    wx/generic/dirdlgg.h
+    wx/generic/fdrepdlg.h
+    wx/generic/filedlgg.h
+    wx/generic/filepickerg.h
+    wx/generic/fontdlgg.h
+    wx/generic/fontpickerg.h
+    wx/generic/listctrl.h
+    wx/generic/statusbr.h
+    wx/generic/tabg.h
+    wx/gtk1/accel.h
+    wx/gtk1/bmpbuttn.h
+    wx/gtk1/button.h
+    wx/gtk1/checkbox.h
+    wx/gtk1/checklst.h
+    wx/gtk1/choice.h
+    wx/gtk1/combobox.h
+    wx/gtk1/control.h
+    wx/gtk1/dialog.h
+    wx/gtk1/filedlg.h
+    wx/gtk1/fontdlg.h
+    wx/gtk1/frame.h
+    wx/gtk1/gauge.h
+    wx/gtk1/listbox.h
+    wx/gtk1/mdi.h
+    wx/gtk1/menu.h
+    wx/gtk1/menuitem.h
+    wx/gtk1/msgdlg.h
+    wx/gtk1/notebook.h
+    wx/gtk1/radiobox.h
+    wx/gtk1/radiobut.h
+    wx/gtk1/scrolbar.h
+    wx/gtk1/scrolwin.h
+    wx/gtk1/slider.h
+    wx/gtk1/spinbutt.h
+    wx/gtk1/spinctrl.h
+    wx/gtk1/statbmp.h
+    wx/gtk1/statbox.h
+    wx/gtk1/statline.h
+    wx/gtk1/stattext.h
+    wx/gtk1/tbargtk.h
+    wx/gtk1/textctrl.h
+    wx/gtk1/tglbtn.h
+    wx/gtk1/treectrl.h
  </set>
  
  
  </set>
  
  
@@ -979,6 +1328,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      $(XWIN_LOWLEVEL_SRC)
      src/x11/bitmap.cpp
      src/x11/brush.cpp
      $(XWIN_LOWLEVEL_SRC)
      src/x11/bitmap.cpp
      src/x11/brush.cpp
+    src/x11/palette.cpp
      src/x11/pen.cpp
      src/x11/region.cpp
      src/x11/utilsx.cpp
      src/x11/pen.cpp
      src/x11/region.cpp
      src/x11/utilsx.cpp
@@ -987,6 +1337,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      $(XWIN_LOWLEVEL_HDR)
      wx/x11/bitmap.h
      wx/x11/brush.h
      $(XWIN_LOWLEVEL_HDR)
      wx/x11/bitmap.h
      wx/x11/brush.h
+    wx/x11/palette.h
      wx/x11/pen.h
      wx/x11/region.h
  </set>
      wx/x11/pen.h
      wx/x11/region.h
  </set>
@@ -1017,7 +1368,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/motif/font.cpp
      src/motif/frame.cpp
      src/motif/gauge.cpp
      src/motif/font.cpp
      src/motif/frame.cpp
      src/motif/gauge.cpp
-    src/motif/gdiobj.cpp
      src/motif/gsockmot.cpp
      src/motif/icon.cpp
      src/motif/listbox.cpp
      src/motif/gsockmot.cpp
      src/motif/icon.cpp
      src/motif/listbox.cpp
@@ -1027,7 +1377,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/motif/menuitem.cpp
      src/motif/minifram.cpp
      src/motif/msgdlg.cpp
      src/motif/menuitem.cpp
      src/motif/minifram.cpp
      src/motif/msgdlg.cpp
-    src/motif/palette.cpp
      src/motif/popupwin.cpp
      src/motif/radiobox.cpp
      src/motif/radiobut.cpp
      src/motif/popupwin.cpp
      src/motif/radiobox.cpp
      src/motif/radiobut.cpp
@@ -1039,6 +1388,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/motif/statbox.cpp
      src/motif/stattext.cpp
      src/motif/textctrl.cpp
      src/motif/statbox.cpp
      src/motif/stattext.cpp
      src/motif/textctrl.cpp
+    src/motif/textentry.cpp
      src/motif/timer.cpp
      src/motif/toolbar.cpp
      src/motif/toplevel.cpp
      src/motif/timer.cpp
      src/motif/toolbar.cpp
      src/motif/toplevel.cpp
@@ -1046,11 +1396,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/motif/window.cpp
      src/motif/xmcombo/xmcombo.c
      <!-- Generic files used by wxMotif: -->
      src/motif/window.cpp
      src/motif/xmcombo/xmcombo.c
      <!-- Generic files used by wxMotif: -->
+    src/generic/clrpickerg.cpp
+    src/generic/collpaneg.cpp
      src/generic/colrdlgg.cpp
      src/generic/dirdlgg.cpp
      src/generic/fdrepdlg.cpp
      src/generic/colrdlgg.cpp
      src/generic/dirdlgg.cpp
      src/generic/fdrepdlg.cpp
+    src/generic/filepickerg.cpp
      src/generic/fontdlgg.cpp
      src/generic/fontdlgg.cpp
-    src/generic/imaglist.cpp
+    src/generic/fontpickerg.cpp
      src/generic/listctrl.cpp
      src/generic/notebook.cpp
      src/generic/prntdlgg.cpp
      src/generic/listctrl.cpp
      src/generic/notebook.cpp
      src/generic/prntdlgg.cpp
@@ -1059,11 +1412,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/generic/tabg.cpp
  </set>
  <set var="MOTIF_HDR" hints="files">
      src/generic/tabg.cpp
  </set>
  <set var="MOTIF_HDR" hints="files">
+    wx/generic/clrpickerg.h
+    wx/generic/collpaneg.h
      wx/generic/colrdlgg.h
      wx/generic/colrdlgg.h
+    wx/generic/ctrlsub.h
      wx/generic/dirdlgg.h
      wx/generic/fdrepdlg.h
      wx/generic/dirdlgg.h
      wx/generic/fdrepdlg.h
+    wx/generic/filepickerg.h
      wx/generic/fontdlgg.h
      wx/generic/fontdlgg.h
-    wx/generic/imaglist.h
+    wx/generic/fontpickerg.h
      wx/generic/listctrl.h
      wx/generic/notebook.h
      wx/generic/prntdlgg.h
      wx/generic/listctrl.h
      wx/generic/notebook.h
      wx/generic/prntdlgg.h
@@ -1077,11 +1434,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/motif/button.h
      wx/motif/checkbox.h
      wx/motif/checklst.h
      wx/motif/button.h
      wx/motif/checkbox.h
      wx/motif/checklst.h
+    wx/motif/chkconf.h
      wx/motif/choice.h
      wx/motif/clipbrd.h
      wx/motif/colour.h
      wx/motif/combobox.h
      wx/motif/control.h
      wx/motif/choice.h
      wx/motif/clipbrd.h
      wx/motif/colour.h
      wx/motif/combobox.h
      wx/motif/control.h
+    wx/motif/ctrlsub.h
      wx/motif/cursor.h
      wx/motif/dataform.h
      wx/motif/dataobj.h
      wx/motif/cursor.h
      wx/motif/dataform.h
      wx/motif/dataobj.h
@@ -1097,7 +1456,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/motif/font.h
      wx/motif/frame.h
      wx/motif/gauge.h
      wx/motif/font.h
      wx/motif/frame.h
      wx/motif/gauge.h
-    wx/motif/gdiobj.h
      wx/motif/icon.h
      wx/motif/listbox.h
      wx/motif/mdi.h
      wx/motif/icon.h
      wx/motif/listbox.h
      wx/motif/mdi.h
@@ -1105,7 +1463,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/motif/menuitem.h
      wx/motif/minifram.h
      wx/motif/msgdlg.h
      wx/motif/menuitem.h
      wx/motif/minifram.h
      wx/motif/msgdlg.h
-    wx/motif/palette.h
      wx/motif/popupwin.h
      wx/motif/print.h
      wx/motif/private.h
      wx/motif/popupwin.h
      wx/motif/print.h
      wx/motif/private.h
@@ -1118,8 +1475,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/motif/statbox.h
      wx/motif/stattext.h
      wx/motif/textctrl.h
      wx/motif/statbox.h
      wx/motif/stattext.h
      wx/motif/textctrl.h
+    wx/motif/textentry.h
      wx/motif/tglbtn.h
      wx/motif/tglbtn.h
-    wx/motif/timer.h
      wx/motif/toolbar.h
      wx/motif/toplevel.h
      wx/motif/window.h
      wx/motif/toolbar.h
      wx/motif/toplevel.h
      wx/motif/window.h
@@ -1133,6 +1490,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  
  <set var="X11_LOWLEVEL_SRC" hints="files">
      $(XWIN_LOWLEVEL_SRC)
  
  <set var="X11_LOWLEVEL_SRC" hints="files">
      $(XWIN_LOWLEVEL_SRC)
+    src/generic/icon.cpp
      src/generic/timer.cpp
      src/x11/app.cpp
      src/x11/bitmap.cpp
      src/generic/timer.cpp
      src/x11/app.cpp
      src/x11/bitmap.cpp
@@ -1148,10 +1506,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/x11/dcscreen.cpp
      src/x11/evtloop.cpp
      src/x11/font.cpp
      src/x11/dcscreen.cpp
      src/x11/evtloop.cpp
      src/x11/font.cpp
-    src/x11/gdiobj.cpp
-    src/x11/gsockx11.cpp
-    src/x11/icon.cpp
-    src/x11/main.cpp
      src/x11/minifram.cpp
      src/x11/nanox.c
      src/x11/palette.cpp
      src/x11/minifram.cpp
      src/x11/nanox.c
      src/x11/palette.cpp
@@ -1167,9 +1521,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  </set>
  <set var="X11_LOWLEVEL_HDR" hints="files">
      $(XWIN_LOWLEVEL_HDR)
  </set>
  <set var="X11_LOWLEVEL_HDR" hints="files">
      $(XWIN_LOWLEVEL_HDR)
+    wx/generic/icon.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
+    wx/x11/chkconf.h
      wx/x11/clipbrd.h
      wx/x11/colour.h
      wx/x11/cursor.h
      wx/x11/clipbrd.h
      wx/x11/colour.h
      wx/x11/cursor.h
@@ -1183,8 +1539,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/x11/dcscreen.h
      wx/x11/dnd.h
      wx/x11/font.h
      wx/x11/dcscreen.h
      wx/x11/dnd.h
      wx/x11/font.h
-    wx/x11/gdiobj.h
-    wx/x11/icon.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
@@ -1223,14 +1577,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/msw/dib.cpp
      src/msw/display.cpp
      src/msw/enhmeta.cpp
      src/msw/dib.cpp
      src/msw/display.cpp
      src/msw/enhmeta.cpp
-    src/msw/evtloop.cpp
      src/msw/font.cpp
      src/msw/fontenum.cpp
      src/msw/fontutil.cpp
      src/msw/gdiimage.cpp
      src/msw/gdiobj.cpp
      src/msw/font.cpp
      src/msw/fontenum.cpp
      src/msw/fontutil.cpp
      src/msw/gdiimage.cpp
      src/msw/gdiobj.cpp
-    src/msw/gsockmsw.cpp
+    src/msw/gdiplus.cpp
+    src/msw/graphics.cpp
      src/msw/icon.cpp
      src/msw/icon.cpp
+    src/msw/imaglist.cpp
      src/msw/minifram.cpp
      src/msw/ole/dataobj.cpp
      src/msw/ole/dropsrc.cpp
      src/msw/minifram.cpp
      src/msw/ole/dataobj.cpp
      src/msw/ole/dropsrc.cpp
@@ -1244,7 +1599,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/msw/region.cpp
      src/msw/renderer.cpp
      src/msw/settings.cpp
      src/msw/region.cpp
      src/msw/renderer.cpp
      src/msw/settings.cpp
-    src/msw/timer.cpp
      src/msw/tooltip.cpp
      src/msw/toplevel.cpp
      src/msw/utilsgui.cpp
      src/msw/tooltip.cpp
      src/msw/toplevel.cpp
      src/msw/utilsgui.cpp
@@ -1252,7 +1606,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/msw/window.cpp
  </set>
  <set var="MSW_LOWLEVEL_HDR" hints="files">
      src/msw/window.cpp
  </set>
  <set var="MSW_LOWLEVEL_HDR" hints="files">
+    wx/msw/popupwin.h
      wx/msw/uxtheme.h
      wx/msw/uxtheme.h
+    wx/msw/uxthemep.h
+    wx/msw/htmlhelp.h
  </set>
  
  <set var="MSW_DESKTOP_LOWLEVEL_SRC" hints="files">
  </set>
  
  <set var="MSW_DESKTOP_LOWLEVEL_SRC" hints="files">
@@ -1268,15 +1625,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  </set>
  
  <set var="MSW_SRC" hints="files">
  </set>
  
  <set var="MSW_SRC" hints="files">
+    src/generic/clrpickerg.cpp
+    src/generic/collpaneg.cpp
+    src/generic/filepickerg.cpp
+    src/generic/fontpickerg.cpp
      src/generic/statusbr.cpp
      src/generic/prntdlgg.cpp
      src/msw/accel.cpp
      src/msw/bmpbuttn.cpp
      src/msw/button.cpp
      src/msw/checkbox.cpp
      src/generic/statusbr.cpp
      src/generic/prntdlgg.cpp
      src/msw/accel.cpp
      src/msw/bmpbuttn.cpp
      src/msw/button.cpp
      src/msw/checkbox.cpp
-    src/msw/checklst.cpp
      src/msw/choice.cpp
      src/msw/colordlg.cpp
      src/msw/choice.cpp
      src/msw/colordlg.cpp
+    src/msw/combo.cpp
      src/msw/combobox.cpp
      src/msw/control.cpp
      src/msw/dialog.cpp
      src/msw/combobox.cpp
      src/msw/control.cpp
      src/msw/dialog.cpp
@@ -1284,8 +1645,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/msw/dragimag.cpp
      src/msw/filedlg.cpp
      src/msw/frame.cpp
      src/msw/dragimag.cpp
      src/msw/filedlg.cpp
      src/msw/frame.cpp
-    src/msw/gauge95.cpp
-    src/msw/imaglist.cpp
+    src/msw/gauge.cpp
      src/msw/iniconf.cpp
      src/msw/listbox.cpp
      src/msw/listctrl.cpp
      src/msw/iniconf.cpp
      src/msw/listbox.cpp
      src/msw/listctrl.cpp
@@ -1295,27 +1655,33 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/msw/metafile.cpp
      src/msw/msgdlg.cpp
      src/msw/nativdlg.cpp
      src/msw/metafile.cpp
      src/msw/msgdlg.cpp
      src/msw/nativdlg.cpp
+    src/msw/nativewin.cpp
      src/msw/notebook.cpp
      src/msw/ole/access.cpp
      src/msw/ownerdrw.cpp
      src/msw/radiobox.cpp
      src/msw/radiobut.cpp
      src/msw/scrolbar.cpp
      src/msw/notebook.cpp
      src/msw/ole/access.cpp
      src/msw/ownerdrw.cpp
      src/msw/radiobox.cpp
      src/msw/radiobut.cpp
      src/msw/scrolbar.cpp
-    src/msw/slider95.cpp
+    src/msw/slider.cpp
      src/msw/spinbutt.cpp
      src/msw/spinctrl.cpp
      src/msw/statbmp.cpp
      src/msw/statbox.cpp
      src/msw/spinbutt.cpp
      src/msw/spinctrl.cpp
      src/msw/statbmp.cpp
      src/msw/statbox.cpp
-    src/msw/statbr95.cpp
+    src/msw/statusbar.cpp
      src/msw/statline.cpp
      src/msw/stattext.cpp
      src/msw/tabctrl.cpp
      src/msw/statline.cpp
      src/msw/stattext.cpp
      src/msw/tabctrl.cpp
-    src/msw/tbar95.cpp
+    src/msw/toolbar.cpp
      src/msw/textctrl.cpp
      src/msw/textctrl.cpp
+    src/msw/textentry.cpp
      src/msw/tglbtn.cpp
      src/msw/treectrl.cpp
  </set>
  <set var="MSW_HDR" hints="files">
      src/msw/tglbtn.cpp
      src/msw/treectrl.cpp
  </set>
  <set var="MSW_HDR" hints="files">
+    wx/generic/clrpickerg.h
+    wx/generic/collpaneg.h
+    wx/generic/filepickerg.h
+    wx/generic/fontpickerg.h
      wx/msw/accel.h
      wx/msw/app.h
      wx/msw/bitmap.h
      wx/msw/accel.h
      wx/msw/app.h
      wx/msw/bitmap.h
@@ -1324,13 +1690,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/msw/button.h
      wx/msw/caret.h
      wx/msw/checkbox.h
      wx/msw/button.h
      wx/msw/caret.h
      wx/msw/checkbox.h
-    wx/msw/checklst.h
      wx/msw/choice.h
      wx/msw/clipbrd.h
      wx/msw/colordlg.h
      wx/msw/colour.h
      wx/msw/choice.h
      wx/msw/clipbrd.h
      wx/msw/colordlg.h
      wx/msw/colour.h
+    wx/msw/combo.h
      wx/msw/combobox.h
      wx/msw/control.h
      wx/msw/combobox.h
      wx/msw/control.h
+    wx/msw/ctrlsub.h
      wx/msw/cursor.h
      wx/msw/dc.h
      wx/msw/dcclient.h
      wx/msw/cursor.h
      wx/msw/dc.h
      wx/msw/dcclient.h
@@ -1346,9 +1713,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/msw/filedlg.h
      wx/msw/font.h
      wx/msw/frame.h
      wx/msw/filedlg.h
      wx/msw/font.h
      wx/msw/frame.h
-    wx/msw/gauge95.h
+    wx/msw/gauge.h
      wx/msw/gdiimage.h
      wx/msw/gdiimage.h
-    wx/msw/gdiobj.h
      wx/msw/icon.h
      wx/msw/imaglist.h
      wx/msw/iniconf.h
      wx/msw/icon.h
      wx/msw/imaglist.h
      wx/msw/iniconf.h
@@ -1361,7 +1727,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/msw/minifram.h
      wx/msw/missing.h
      wx/msw/msgdlg.h
      wx/msw/minifram.h
      wx/msw/missing.h
      wx/msw/msgdlg.h
-    wx/msw/mslu.h
      wx/msw/msvcrt.h
      wx/msw/notebook.h
      wx/msw/ole/access.h
      wx/msw/msvcrt.h
      wx/msw/notebook.h
      wx/msw/ole/access.h
@@ -1375,36 +1740,34 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/msw/pen.h
      wx/msw/printdlg.h
      wx/msw/printwin.h
      wx/msw/pen.h
      wx/msw/printdlg.h
      wx/msw/printwin.h
-    wx/msw/private.h
      wx/msw/radiobox.h
      wx/msw/radiobut.h
      wx/msw/radiobox.h
      wx/msw/radiobut.h
-    wx/msw/regconf.h
      wx/msw/region.h
      wx/msw/region.h
-    wx/msw/registry.h
+    wx/msw/rcdefs.h
      wx/msw/scrolbar.h
      wx/msw/setup0.h
      wx/msw/scrolbar.h
      wx/msw/setup0.h
-    wx/msw/slider95.h
+    wx/msw/slider.h
      wx/msw/spinbutt.h
      wx/msw/spinctrl.h
      wx/msw/statbmp.h
      wx/msw/statbox.h
      wx/msw/spinbutt.h
      wx/msw/spinctrl.h
      wx/msw/statbmp.h
      wx/msw/statbox.h
-    wx/msw/statbr95.h
+    wx/msw/statusbar.h
      wx/msw/statline.h
      wx/msw/stattext.h
      wx/msw/tabctrl.h
      wx/msw/statline.h
      wx/msw/stattext.h
      wx/msw/tabctrl.h
-    wx/msw/tbar95.h
-    wx/msw/tbarmsw.h
+    wx/msw/toolbar.h
      wx/msw/textctrl.h
      wx/msw/textctrl.h
+    wx/msw/textentry.h
      wx/msw/tglbtn.h
      wx/msw/tglbtn.h
-    wx/msw/timer.h
      wx/msw/tooltip.h
      wx/msw/toplevel.h
      wx/msw/treectrl.h
      wx/msw/window.h
  
      <!-- Resources must be installed together with headers: -->
      wx/msw/tooltip.h
      wx/msw/toplevel.h
      wx/msw/treectrl.h
      wx/msw/window.h
  
      <!-- Resources must be installed together with headers: -->
-    wx/msw/gnuwin32/winresrc.h
      wx/msw/wx.manifest
      wx/msw/wx.manifest
+    wx/msw/amd64.manifest
+    wx/msw/ia64.manifest
      wx/msw/wx.rc
      <!-- bitmaps -->
      wx/msw/colours.bmp
      wx/msw/wx.rc
      <!-- bitmaps -->
      wx/msw/colours.bmp
@@ -1412,47 +1775,40 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      <!-- cursors -->
      wx/msw/blank.cur
      wx/msw/bullseye.cur
      <!-- cursors -->
      wx/msw/blank.cur
      wx/msw/bullseye.cur
-    wx/msw/clock.cur
+    wx/msw/cross.cur
      wx/msw/hand.cur
      wx/msw/hand.cur
-    wx/msw/heart.cur
      wx/msw/magnif1.cur
      wx/msw/magnif1.cur
-    wx/msw/noentry.cur
      wx/msw/pbrush.cur
      wx/msw/pencil.cur
      wx/msw/pntleft.cur
      wx/msw/pntright.cur
      wx/msw/pbrush.cur
      wx/msw/pencil.cur
      wx/msw/pntleft.cur
      wx/msw/pntright.cur
-    wx/msw/query.cur
      wx/msw/rightarr.cur
      wx/msw/roller.cur
      wx/msw/rightarr.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/drive.ico
      <!-- icons -->
      wx/msw/cdrom.ico
      wx/msw/child.ico
      wx/msw/computer.ico
      wx/msw/drive.ico
-    wx/msw/error.ico
      wx/msw/file1.ico
      wx/msw/floppy.ico
      wx/msw/folder1.ico
      wx/msw/folder2.ico
      wx/msw/file1.ico
      wx/msw/floppy.ico
      wx/msw/folder1.ico
      wx/msw/folder2.ico
-    wx/msw/info.ico
      wx/msw/mdi.ico
      wx/msw/question.ico
      wx/msw/removble.ico
      wx/msw/std.ico
      wx/msw/mdi.ico
      wx/msw/question.ico
      wx/msw/removble.ico
      wx/msw/std.ico
-    wx/msw/warning.ico
  </set>
  
  <!-- Files used only by desktop MSW port, but *not* WindowsCE one: -->
  <set var="MSW_DESKTOP_SRC" hints="files">
  </set>
  
  <!-- Files used only by desktop MSW port, but *not* WindowsCE one: -->
  <set var="MSW_DESKTOP_SRC" hints="files">
+    src/msw/checklst.cpp
      src/msw/fdrepdlg.cpp
      src/msw/fontdlg.cpp
  </set>
  <set var="MSW_DESKTOP_HDR" hints="files">
      src/msw/fdrepdlg.cpp
      src/msw/fontdlg.cpp
  </set>
  <set var="MSW_DESKTOP_HDR" hints="files">
+    wx/msw/checklst.h
      wx/msw/fdrepdlg.h
      wx/msw/fontdlg.h
      wx/msw/fdrepdlg.h
      wx/msw/fontdlg.h
-    wx/msw/helpbest.h
      wx/msw/ole/automtn.h
      wx/msw/ole/uuid.h
  </set>
      wx/msw/ole/automtn.h
      wx/msw/ole/uuid.h
  </set>
@@ -1461,7 +1817,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <set var="WINCE_SRC" hints="files">
      src/generic/dirdlgg.cpp
      src/generic/fdrepdlg.cpp
  <set var="WINCE_SRC" hints="files">
      src/generic/dirdlgg.cpp
      src/generic/fdrepdlg.cpp
+    src/generic/filedlgg.cpp
      src/generic/fontdlgg.cpp
      src/generic/fontdlgg.cpp
+    src/msw/wince/checklst.cpp
      src/msw/wince/choicece.cpp
      src/msw/wince/crt.cpp
      src/msw/wince/filedlgwce.cpp
      src/msw/wince/choicece.cpp
      src/msw/wince/crt.cpp
      src/msw/wince/filedlgwce.cpp
@@ -1473,7 +1831,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  </set>
  <set var="WINCE_HDR" hints="files">
      wx/generic/fdrepdlg.h
  </set>
  <set var="WINCE_HDR" hints="files">
      wx/generic/fdrepdlg.h
+    wx/generic/filedlgg.h
      wx/generic/fontdlgg.h
      wx/generic/fontdlgg.h
+    wx/msw/wince/checklst.h
      wx/msw/wince/choicece.h
      wx/msw/wince/helpwce.h
      wx/msw/wince/libraries.h
      wx/msw/wince/choicece.h
      wx/msw/wince/helpwce.h
      wx/msw/wince/libraries.h
@@ -1489,13 +1849,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <!-- ====================================================================== -->
  
  <set var="MGL_LOWLEVEL_SRC" hints="files">
  <!-- ====================================================================== -->
  
  <set var="MGL_LOWLEVEL_SRC" hints="files">
+    src/common/fontmgrcmn.cpp
      src/generic/caret.cpp
      src/generic/caret.cpp
+    src/generic/colour.cpp
+    src/generic/icon.cpp
+    src/generic/imaglist.cpp
+    src/generic/mask.cpp
      src/generic/timer.cpp
      src/mgl/app.cpp
      src/mgl/bitmap.cpp
      src/mgl/brush.cpp
      src/mgl/clipbrd.cpp
      src/generic/timer.cpp
      src/mgl/app.cpp
      src/mgl/bitmap.cpp
      src/mgl/brush.cpp
      src/mgl/clipbrd.cpp
-    src/mgl/colour.cpp
      src/mgl/cursor.cpp
      src/mgl/data.cpp
      src/mgl/dc.cpp
      src/mgl/cursor.cpp
      src/mgl/data.cpp
      src/mgl/dc.cpp
@@ -1506,9 +1870,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/mgl/evtloop.cpp
      src/mgl/font.cpp
      src/mgl/fontenum.cpp
      src/mgl/evtloop.cpp
      src/mgl/font.cpp
      src/mgl/fontenum.cpp
+    src/mgl/fontmgr.cpp
      src/mgl/fontutil.cpp
      src/mgl/fontutil.cpp
-    src/mgl/gdiobj.cpp
-    src/mgl/icon.cpp
      src/mgl/palette.cpp
      src/mgl/pen.cpp
      src/mgl/region.cpp
      src/mgl/palette.cpp
      src/mgl/pen.cpp
      src/mgl/region.cpp
@@ -1519,21 +1882,21 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  </set>
  <set var="MGL_LOWLEVEL_HDR" hints="files">
      wx/generic/caret.h
  </set>
  <set var="MGL_LOWLEVEL_HDR" hints="files">
      wx/generic/caret.h
-    wx/generic/timer.h
+    wx/generic/colour.h
+    wx/generic/icon.h
+    wx/generic/imaglist.h
+    wx/generic/mask.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
+    wx/mgl/chkconf.h
      wx/mgl/clipbrd.h
      wx/mgl/clipbrd.h
-    wx/mgl/colour.h
      wx/mgl/cursor.h
      wx/mgl/dc.h
      wx/mgl/dcclient.h
      wx/mgl/dcmemory.h
      wx/mgl/dcscreen.h
      wx/mgl/font.h
      wx/mgl/cursor.h
      wx/mgl/dc.h
      wx/mgl/dcclient.h
      wx/mgl/dcmemory.h
      wx/mgl/dcscreen.h
      wx/mgl/font.h
-    wx/mgl/fontutil.h
-    wx/mgl/gdiobj.h
-    wx/mgl/icon.h
      wx/mgl/palette.h
      wx/mgl/pen.h
      wx/mgl/popupwin.h
      wx/mgl/palette.h
      wx/mgl/pen.h
      wx/mgl/popupwin.h
@@ -1544,24 +1907,92 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  </set>
  
  
  </set>
  
  
+<!-- ====================================================================== -->
+<!--                                wxDFB                                   -->
+<!-- ====================================================================== -->
+
+<set var="DFB_LOWLEVEL_SRC" hints="files">
+    src/common/fontmgrcmn.cpp
+    src/generic/caret.cpp
+    src/generic/colour.cpp
+    src/generic/icon.cpp
+    src/generic/imaglist.cpp
+    src/generic/mask.cpp
+    src/generic/timer.cpp
+    src/dfb/app.cpp
+    src/dfb/bitmap.cpp
+    src/dfb/brush.cpp
+    src/dfb/cursor.cpp
+    <!--    src/dfb/data.cpp -->
+    src/dfb/dc.cpp
+    src/dfb/dcclient.cpp
+    src/dfb/dcmemory.cpp
+    src/dfb/dcscreen.cpp
+    src/dfb/evtloop.cpp
+    src/dfb/font.cpp
+    src/dfb/fontenum.cpp
+    src/dfb/fontmgr.cpp
+    src/dfb/nonownedwnd.cpp
+    src/dfb/overlay.cpp
+    src/dfb/pen.cpp
+    src/dfb/region.cpp
+    src/dfb/settings.cpp
+    src/dfb/toplevel.cpp
+    src/dfb/utils.cpp
+    src/dfb/window.cpp
+    src/dfb/wrapdfb.cpp
+</set>
+<set var="DFB_LOWLEVEL_HDR" hints="files">
+    wx/generic/caret.h
+    wx/generic/colour.h
+    wx/generic/icon.h
+    wx/generic/imaglist.h
+    wx/generic/mask.h
+    wx/dfb/app.h
+    wx/dfb/bitmap.h
+    wx/dfb/brush.h
+    wx/dfb/chkconf.h
+    wx/dfb/cursor.h
+    wx/dfb/dc.h
+    wx/dfb/dcclient.h
+    wx/dfb/dcmemory.h
+    wx/dfb/dcscreen.h
+    wx/dfb/dfbptr.h
+    wx/dfb/evtloop.h
+    wx/dfb/font.h
+    wx/dfb/nonownedwnd.h
+    wx/dfb/pen.h
+    wx/dfb/popupwin.h
+    wx/dfb/private.h
+    wx/dfb/region.h
+    wx/dfb/toplevel.h
+    wx/dfb/window.h
+    wx/dfb/wrapdfb.h
+</set>
+
+
  <!-- ====================================================================== -->
  <!--                               wxOS/2                                   -->
  <!-- ====================================================================== -->
  
  <set var="OS2_LOWLEVEL_SRC" hints="files">
  <!-- ====================================================================== -->
  <!--                               wxOS/2                                   -->
  <!-- ====================================================================== -->
  
  <set var="OS2_LOWLEVEL_SRC" hints="files">
+    <!-- wxUniv builds not supported under OS/2 -->
  </set>
  <set var="OS2_LOWLEVEL_HDR" hints="files">
  </set>
  <set var="OS2_SRC" hints="files">
      <!-- Generic implementations used by wxOS2: -->
      src/generic/caret.cpp
  </set>
  <set var="OS2_LOWLEVEL_HDR" hints="files">
  </set>
  <set var="OS2_SRC" hints="files">
      <!-- Generic implementations used by wxOS2: -->
      src/generic/caret.cpp
+    src/generic/clrpickerg.cpp
+    src/generic/collpaneg.cpp
      src/generic/colrdlgg.cpp
      src/generic/dirdlgg.cpp
      src/generic/fdrepdlg.cpp
      src/generic/colrdlgg.cpp
      src/generic/dirdlgg.cpp
      src/generic/fdrepdlg.cpp
+    src/generic/filepickerg.cpp
+    src/generic/fontpickerg.cpp
      src/generic/imaglist.cpp
      src/generic/listctrl.cpp
      src/generic/mdig.cpp
      src/generic/imaglist.cpp
      src/generic/listctrl.cpp
      src/generic/mdig.cpp
-    src/generic/msgdlgg.cpp
      src/generic/prntdlgg.cpp
      src/generic/statusbr.cpp
      <!-- OS/2 specific files: -->
      src/generic/prntdlgg.cpp
      src/generic/statusbr.cpp
      <!-- OS/2 specific files: -->
@@ -1597,7 +2028,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/os2/frame.cpp
      src/os2/gauge.cpp
      src/os2/gdiimage.cpp
      src/os2/frame.cpp
      src/os2/gauge.cpp
      src/os2/gdiimage.cpp
-    src/os2/gdiobj.cpp
      src/os2/gsockpm.cpp
      src/os2/helpwin.cpp
      src/os2/icon.cpp
      src/os2/gsockpm.cpp
      src/os2/helpwin.cpp
      src/os2/icon.cpp
@@ -1607,12 +2037,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/os2/menu.cpp
      src/os2/menuitem.cpp
      src/os2/metafile.cpp
      src/os2/menu.cpp
      src/os2/menuitem.cpp
      src/os2/metafile.cpp
+    src/os2/minifram.cpp
      src/os2/msgdlg.cpp
      src/os2/nativdlg.cpp
      src/os2/notebook.cpp
      src/os2/ownerdrw.cpp
      src/os2/palette.cpp
      src/os2/pen.cpp
      src/os2/msgdlg.cpp
      src/os2/nativdlg.cpp
      src/os2/notebook.cpp
      src/os2/ownerdrw.cpp
      src/os2/palette.cpp
      src/os2/pen.cpp
+    src/os2/popupwin.cpp
      src/os2/print.cpp
      src/os2/radiobox.cpp
      src/os2/radiobut.cpp
      src/os2/print.cpp
      src/os2/radiobox.cpp
      src/os2/radiobut.cpp
@@ -1628,6 +2060,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      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/textentry.cpp
+    src/os2/tglbtn.cpp
      src/os2/timer.cpp
      src/os2/toolbar.cpp
      src/os2/tooltip.cpp
      src/os2/timer.cpp
      src/os2/toolbar.cpp
      src/os2/tooltip.cpp
@@ -1637,6 +2071,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  </set>
  <set var="OS2_HDR" hints="files">
      wx/generic/caret.h
  </set>
  <set var="OS2_HDR" hints="files">
      wx/generic/caret.h
+    wx/generic/clrpickerg.h
+    wx/generic/collpaneg.h
      wx/generic/colrdlgg.h
      wx/generic/dirdlgg.h
      wx/generic/fdrepdlg.h
      wx/generic/colrdlgg.h
      wx/generic/dirdlgg.h
      wx/generic/fdrepdlg.h
@@ -1673,7 +2109,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/os2/frame.h
      wx/os2/gauge.h
      wx/os2/gdiimage.h
      wx/os2/frame.h
      wx/os2/gauge.h
      wx/os2/gdiimage.h
-    wx/os2/gdiobj.h
      wx/os2/helpwin.h
      wx/os2/icon.h
      wx/os2/iniconf.h
      wx/os2/helpwin.h
      wx/os2/icon.h
      wx/os2/iniconf.h
@@ -1689,7 +2124,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/os2/pnghand.h
      wx/os2/pngread.h
      wx/os2/print.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/radiobox.h
      wx/os2/radiobut.h
      wx/os2/region.h
@@ -1705,7 +2139,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/os2/stattext.h
      wx/os2/tabctrl.h
      wx/os2/textctrl.h
      wx/os2/stattext.h
      wx/os2/tabctrl.h
      wx/os2/textctrl.h
-    wx/os2/timer.h
+    wx/os2/textentry.h
+    wx/os2/tglbtn.h
      wx/os2/toolbar.h
      wx/os2/tooltip.h
      wx/os2/toplevel.h
      wx/os2/toolbar.h
      wx/os2/tooltip.h
      wx/os2/toplevel.h
@@ -1718,292 +2153,332 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <!--                                wxMac                                   -->
  <!-- ====================================================================== -->
  
  <!--                                wxMac                                   -->
  <!-- ====================================================================== -->
  
-<set var="MAC_OSX_LOWLEVEL_SRC" hints="files">
+<set var="OSX_LOWLEVEL_SRC" hints="files">
      <!-- Shared wxMac and wxCocoa files -->
      <!-- Shared wxMac and wxCocoa files -->
-    src/mac/corefoundation/gsockosx.cpp
-    src/mac/corefoundation/utilsexc_cf.cpp
+    <if cond="PLATFORM_MACOSX=='1'">
+    src/osx/accel.cpp
+    src/osx/artmac.cpp
+    src/osx/bmpbuttn_osx.cpp
+    src/osx/brush.cpp
+    src/osx/button_osx.cpp
+    src/osx/checkbox_osx.cpp
+    src/osx/checklst_osx.cpp
+    src/osx/choice_osx.cpp
+    src/osx/dialog_osx.cpp
+    src/osx/fontutil.cpp
+    src/osx/gauge_osx.cpp
+    src/osx/imaglist.cpp
+    src/osx/listbox_osx.cpp
+    src/osx/menu_osx.cpp
+    src/osx/menuitem_osx.cpp
+    src/osx/minifram.cpp
+    src/osx/nonownedwnd_osx.cpp
+    src/osx/notebook_osx.cpp
+    src/osx/palette.cpp
+    src/osx/pen.cpp
+    src/osx/radiobox_osx.cpp
+    src/osx/radiobut_osx.cpp
+    src/osx/scrolbar_osx.cpp
+    src/osx/slider_osx.cpp
+    src/osx/spinbutt_osx.cpp
+    src/osx/spinctrl_osx.cpp
+    src/osx/srchctrl_osx.cpp
+    src/osx/statbox_osx.cpp
+    src/osx/statline_osx.cpp
+    src/osx/stattext_osx.cpp
+    src/osx/tabctrl_osx.cpp
+    src/osx/textctrl_osx.cpp
+    src/osx/tglbtn_osx.cpp
+    src/osx/toolbar_osx.cpp
+    src/osx/toplevel_osx.cpp
+    src/osx/utils_osx.cpp
+    <!-- src/osx/treectrl.cpp -->
+    src/osx/window_osx.cpp
+
+    src/osx/core/bitmap.cpp
+    src/osx/core/colour.cpp
+    src/osx/core/dcmemory.cpp
+    src/osx/core/display.cpp
+    src/osx/core/fontenum.cpp
+    src/osx/core/hid.cpp
+    src/osx/core/printmac.cpp
+    src/osx/core/timer.cpp
+    src/osx/core/utilsexc_cf.cpp
+    </if>
  </set>
  
  </set>
  
-<set var="MAC_OSX_LOWLEVEL_HDR" hints="files">
+<set var="OSX_LOWLEVEL_HDR" hints="files">
  </set>
  
  </set>
  
-<set var="MAC_LOWLEVEL_SRC" hints="files">
-    <if cond="PLATFORM_MACOSX=='1'">$(MAC_OSX_LOWLEVEL_SRC)</if>
+<!--
+<set var="OSX_LOWLEVEL_SRC" hints="files">
+    <if cond="PLATFORM_MACOSX=='1'">$(OSX_LOWLEVEL_SRC)</if>
  </set>
  </set>
-<set var="MAC_LOWLEVEL_HDR" hints="files">
-    <if cond="PLATFORM_MACOSX=='1'">$(MAC_OSX_LOWLEVEL_HDR)</if>
+<set var="OSX_LOWLEVEL_HDR" hints="files">
+    <if cond="PLATFORM_MACOSX=='1'">$(OSX_LOWLEVEL_HDR)</if>
  </set>
  </set>
+-->
  
  
-<set var="MAC_OSX_SRC" hints="files">
+<set var="OSX_CARBON_COCOA_SRC" hints="files">
  <if cond="PLATFORM_MACOSX=='1'">
  <if cond="PLATFORM_MACOSX=='1'">
-    <!-- Unix files used by wxMac: -->
-    src/unix/snglinst.cpp
      <!-- wxWebKit files -->
      <!-- wxWebKit files -->
-    src/html/htmlctrl/webkit/webkit.mm
+    <!-- (TODO Move one level up) -->
      <!-- Native color/font dialogs -->
      <!-- Native color/font dialogs -->
-    src/mac/carbon/fontdlgosx.mm
-    src/mac/carbon/colordlgosx.mm
+    src/osx/carbon/colordlgosx.mm
+    src/osx/carbon/fontdlgosx.mm
+    <!-- other shared files -->
+    src/osx/carbon/clipbrd.cpp
+    src/osx/carbon/cursor.cpp
+    src/osx/carbon/fontdlg.cpp
+    src/osx/carbon/gdiobj.cpp
+    src/osx/carbon/icon.cpp
+    src/osx/carbon/app.cpp
+    src/osx/carbon/combobox.cpp
+    src/osx/carbon/control.cpp
+    src/osx/carbon/dataobj.cpp
+    src/osx/carbon/dcclient.cpp
+    src/osx/carbon/dcprint.cpp
+    src/osx/carbon/dcscreen.cpp
+    src/osx/carbon/graphics.cpp
+    src/osx/carbon/dnd.cpp
+    src/osx/carbon/font.cpp
+    src/osx/carbon/frame.cpp
+    src/osx/carbon/mdi.cpp
+    src/osx/carbon/metafile.cpp
+    src/osx/carbon/overlay.cpp
+    src/osx/carbon/popupwin.cpp
+    src/osx/carbon/printdlg.cpp
+    src/osx/carbon/renderer.cpp
+    src/osx/carbon/settings.cpp
+    src/osx/carbon/statbrma.cpp
+    src/osx/carbon/tabctrl.cpp
+    <!-- cocoa bridge -->
+    src/osx/carbon/utilscocoa.mm
  </if>
  </set>
  
  </if>
  </set>
  
-<set var="MAC_SRC" hints="files">
-    src/mac/carbon/accel.cpp
-    src/mac/carbon/aga.cpp
-    src/mac/carbon/app.cpp
-    src/mac/carbon/bitmap.cpp
-    src/mac/carbon/bmpbuttn.cpp
-    src/mac/carbon/brush.cpp
-    src/mac/carbon/button.cpp
-    src/mac/carbon/checkbox.cpp
-    src/mac/carbon/checklst.cpp
-    src/mac/carbon/choice.cpp
-    src/mac/carbon/clipbrd.cpp
-    src/mac/carbon/colordlg.cpp
-    src/mac/carbon/colour.cpp
-    src/mac/carbon/combobox.cpp
-    src/mac/carbon/control.cpp
-    src/mac/carbon/cursor.cpp
-    src/mac/carbon/data.cpp
-    src/mac/carbon/dataobj.cpp
-    src/mac/carbon/dc.cpp
-    src/mac/carbon/dccg.cpp
-    src/mac/carbon/dcclient.cpp
-    src/mac/carbon/dcmemory.cpp
-    src/mac/carbon/dcprint.cpp
-    src/mac/carbon/dcscreen.cpp
-    src/mac/carbon/dialog.cpp
-    src/mac/carbon/dirdlg.cpp
-    src/mac/carbon/display.cpp
-    src/mac/carbon/dnd.cpp
-    src/mac/carbon/filedlg.cpp
-    src/mac/carbon/font.cpp
-    src/mac/carbon/fontdlg.cpp
-    src/mac/carbon/fontenum.cpp
-    src/mac/carbon/fontutil.cpp
-    src/mac/carbon/frame.cpp
-    src/mac/carbon/gauge.cpp
-    src/mac/carbon/gdiobj.cpp
-    src/mac/carbon/icon.cpp
-    src/mac/carbon/listbox.cpp
-    src/mac/carbon/mdi.cpp
-    src/mac/carbon/menu.cpp
-    src/mac/carbon/menuitem.cpp
-    src/mac/carbon/metafile.cpp
-    src/mac/carbon/minifram.cpp
-    src/mac/carbon/msgdlg.cpp
-    src/mac/carbon/notebmac.cpp
-    src/mac/carbon/palette.cpp
-    src/mac/carbon/pen.cpp
-    src/mac/carbon/pnghand.cpp
-    src/mac/carbon/printdlg.cpp
-    src/mac/carbon/printmac.cpp
-    src/mac/carbon/radiobox.cpp
-    src/mac/carbon/radiobut.cpp
-    src/mac/carbon/region.cpp
-    src/mac/carbon/renderer.cpp
-    src/mac/carbon/scrolbar.cpp
-    src/mac/carbon/settings.cpp
-    src/mac/carbon/slider.cpp
-    src/mac/carbon/spinbutt.cpp
-    src/mac/carbon/spinctrl.cpp
-    src/mac/carbon/statbmp.cpp
-    src/mac/carbon/statbox.cpp
-    src/mac/carbon/statbrma.cpp
-    src/mac/carbon/statlmac.cpp
-    src/mac/carbon/stattext.cpp
-    src/mac/carbon/tabctrl.cpp
-    src/mac/carbon/textctrl.cpp
-    src/mac/carbon/timer.cpp
-    src/mac/carbon/tglbtn.cpp
-    src/mac/carbon/toolbar.cpp
-    src/mac/carbon/tooltip.cpp
-    src/mac/carbon/toplevel.cpp
-    src/mac/carbon/window.cpp
+<set var="OSX_CARBON_SRC" hints="files">
+    <!-- carbon files -->
+    $(OSX_CARBON_COCOA_SRC)
+    src/osx/carbon/bmpbuttn.cpp
+    src/osx/carbon/button.cpp
+    src/osx/carbon/checkbox.cpp
+    src/osx/carbon/choice.cpp
+    src/osx/carbon/colordlg.cpp
+    src/osx/carbon/dialog.cpp
+    src/osx/carbon/dirdlg.cpp
+    src/osx/carbon/evtloop.cpp
+    src/osx/carbon/filedlg.cpp
+    src/osx/carbon/gauge.cpp
+    src/osx/carbon/listbox.cpp
+    src/osx/carbon/listctrl_mac.cpp
+    src/osx/carbon/menu.cpp
+    src/osx/carbon/menuitem.cpp
+    src/osx/carbon/msgdlg.cpp
+    src/osx/carbon/nonownedwnd.cpp
+    src/osx/carbon/notebmac.cpp
+    src/osx/carbon/radiobut.cpp
+    src/osx/carbon/region.cpp
+    src/osx/carbon/scrolbar.cpp
+    src/osx/carbon/slider.cpp
+    src/osx/carbon/spinbutt.cpp
+    src/osx/carbon/srchctrl.cpp
+    src/osx/carbon/statbmp.cpp
+    src/osx/carbon/statbox.cpp
+    src/osx/carbon/statlmac.cpp
+    src/osx/carbon/stattext.cpp
+    src/osx/carbon/textctrl.cpp
+    src/osx/carbon/tglbtn.cpp
+    src/osx/carbon/toolbar.cpp
+    src/osx/carbon/tooltip.cpp
+    src/osx/carbon/window.cpp
+    
+    src/html/htmlctrl/webkit/webkit.mm
      <!-- Generic implementations used by wxMac: -->
      src/generic/caret.cpp
      <!-- Generic implementations used by wxMac: -->
      src/generic/caret.cpp
+    src/generic/clrpickerg.cpp
+    src/generic/collpaneg.cpp
      src/generic/fdrepdlg.cpp
      src/generic/fdrepdlg.cpp
+    src/generic/filepickerg.cpp
      src/generic/fontdlgg.cpp
      src/generic/fontdlgg.cpp
-    src/generic/imaglist.cpp
+    src/generic/fontpickerg.cpp
      src/generic/listctrl.cpp
      src/generic/prntdlgg.cpp
      src/generic/statusbr.cpp
      src/generic/tabg.cpp
  </set>
  
      src/generic/listctrl.cpp
      src/generic/prntdlgg.cpp
      src/generic/statusbr.cpp
      src/generic/tabg.cpp
  </set>
  
-<!-- Header files like wx/mac/foo.h which include wx/mac/carbon/foo.h -->
-<set var="MAC_CMN_HDR" hints="files">
-    wx/mac/accel.h
-    wx/mac/aga.h
-    wx/mac/app.h
-    wx/mac/bitmap.h
-    wx/mac/bmpbuttn.h
-    wx/mac/brush.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/colour.h
-    wx/mac/combobox.h
-    wx/mac/control.h
-    wx/mac/cursor.h
-    wx/mac/dataform.h
-    wx/mac/dataobj.h
-    wx/mac/dataobj2.h
-    wx/mac/dc.h
-    wx/mac/dcclient.h
-    wx/mac/dcmemory.h
-    wx/mac/dcprint.h
-    wx/mac/dcscreen.h
-    wx/mac/dialog.h
-    wx/mac/dirdlg.h
-    wx/mac/display.h
-    wx/mac/dnd.h
-    wx/mac/filedlg.h
-    wx/mac/font.h
-    wx/mac/fontdlg.h
-    wx/mac/frame.h
-    wx/mac/gauge.h
-    wx/mac/gdiobj.h
-    wx/mac/glcanvas.h
-    wx/mac/gsockmac.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/macsock.h
-    wx/mac/mdi.h
-    wx/mac/menu.h
-    wx/mac/menuitem.h
-    wx/mac/metafile.h
-    wx/mac/mimetype.h
-    wx/mac/minifram.h
-    wx/mac/msgdlg.h
-    wx/mac/notebook.h
-    wx/mac/palette.h
-    wx/mac/pen.h
-    wx/mac/pnghand.h
-    wx/mac/pngread.h
-    wx/mac/printdlg.h
-    wx/mac/printmac.h
-    wx/mac/private.h
-    wx/mac/radiobox.h
-    wx/mac/radiobut.h
-    wx/mac/region.h
-    wx/mac/scrolbar.h
-    wx/mac/slider.h
-    wx/mac/sound.h
-    wx/mac/spinbutt.h
-    wx/mac/spinctrl.h
-    wx/mac/statbmp.h
-    wx/mac/statbox.h
-    wx/mac/statline.h
-    wx/mac/stattext.h
-    wx/mac/statusbr.h
-    wx/mac/tabctrl.h
-    wx/mac/taskbarosx.h
-    wx/mac/textctrl.h
-    wx/mac/timer.h
-    wx/mac/tglbtn.h
-    wx/mac/toolbar.h
-    wx/mac/tooltip.h
-    wx/mac/toplevel.h
-    wx/mac/treectrl.h
-    wx/mac/uma.h
-    wx/mac/window.h
+<!-- Header files like wx/osx/foo.h which include wx/osx/carbon/foo.h -->
+<set var="OSX_SHARED_HDR" hints="files">
+    wx/osx/accel.h
+    wx/osx/app.h
+    wx/osx/bitmap.h
+    wx/osx/bmpbuttn.h
+    wx/osx/brush.h
+    wx/osx/button.h
+    wx/osx/checkbox.h
+    wx/osx/checklst.h
+    wx/osx/chkconf.h
+    wx/osx/choice.h
+    wx/osx/clipbrd.h
+    wx/osx/colordlg.h
+    wx/osx/colour.h
+    wx/osx/combobox.h
+    wx/osx/control.h
+    wx/osx/cursor.h
+    wx/osx/dataform.h
+    wx/osx/dataobj.h
+    wx/osx/dataobj2.h
+    wx/osx/dc.h
+    wx/osx/dcclient.h
+    wx/osx/dcmemory.h
+    wx/osx/dcprint.h
+    wx/osx/dcscreen.h
+    wx/osx/dialog.h
+    wx/osx/dirdlg.h
+    wx/osx/dnd.h
+    wx/osx/evtloop.h
+    wx/osx/filedlg.h
+    wx/osx/font.h
+    wx/osx/fontdlg.h
+    wx/osx/frame.h
+    wx/osx/gauge.h
+    wx/osx/helpxxxx.h
+    wx/osx/icon.h
+    wx/osx/imaglist.h
+    wx/osx/listbox.h
+    wx/osx/listctrl.h
+    wx/osx/mdi.h
+    wx/osx/menu.h
+    wx/osx/menuitem.h
+    wx/osx/metafile.h
+    wx/osx/mimetype.h
+    wx/osx/minifram.h
+    wx/osx/msgdlg.h
+    wx/osx/nonownedwnd.h
+    wx/osx/notebook.h
+    wx/osx/palette.h
+    wx/osx/pen.h
+    wx/osx/popupwin.h
+    wx/osx/pnghand.h
+    wx/osx/pngread.h
+    wx/osx/printdlg.h
+    wx/osx/printmac.h
+    wx/osx/private.h
+    wx/osx/radiobox.h
+    wx/osx/radiobut.h
+    wx/osx/region.h
+    wx/osx/scrolbar.h
+    wx/osx/slider.h
+    wx/osx/spinbutt.h
+    wx/osx/spinctrl.h
+    wx/osx/srchctrl.h
+    wx/osx/statbmp.h
+    wx/osx/statbox.h
+    wx/osx/statline.h
+    wx/osx/stattext.h
+    wx/osx/statusbr.h
+    wx/osx/tabctrl.h
+    wx/osx/taskbarosx.h
+    wx/osx/textctrl.h
+    wx/osx/tglbtn.h
+    wx/osx/toolbar.h
+    wx/osx/tooltip.h
+    wx/osx/toplevel.h
+    wx/osx/treectrl.h
+    wx/osx/uma.h
+    wx/osx/window.h
  </set>
  <!-- wxMac Carbon header files -->
  </set>
  <!-- wxMac Carbon header files -->
-<set var="MAC_HDR" hints="files">
-    wx/mac/carbon/accel.h
-    wx/mac/carbon/aga.h
-    wx/mac/carbon/app.h
-    wx/mac/carbon/bitmap.h
-    wx/mac/carbon/bmpbuttn.h
-    wx/mac/carbon/brush.h
-    wx/mac/carbon/button.h
-    wx/mac/carbon/checkbox.h
-    wx/mac/carbon/checklst.h
-    wx/mac/carbon/chkconf.h
-    wx/mac/carbon/choice.h
-    wx/mac/carbon/clipbrd.h
-    wx/mac/carbon/colordlg.h
-    wx/mac/carbon/colour.h
-    wx/mac/carbon/combobox.h
-    wx/mac/carbon/control.h
-    wx/mac/carbon/cursor.h
-    wx/mac/carbon/dataform.h
-    wx/mac/carbon/dataobj.h
-    wx/mac/carbon/dataobj2.h
-    wx/mac/carbon/dc.h
-    wx/mac/carbon/dcclient.h
-    wx/mac/carbon/dcmemory.h
-    wx/mac/carbon/dcprint.h
-    wx/mac/carbon/dcscreen.h
-    wx/mac/carbon/dialog.h
-    wx/mac/carbon/dirdlg.h
-    wx/mac/carbon/display.h
-    wx/mac/carbon/dnd.h
-    wx/mac/carbon/filedlg.h
-    wx/mac/carbon/font.h
-    wx/mac/carbon/fontdlg.h
-    wx/mac/carbon/frame.h
-    wx/mac/carbon/gauge.h
-    wx/mac/carbon/gdiobj.h
-    wx/mac/carbon/gsockmac.h
-    wx/mac/carbon/helpxxxx.h
-    wx/mac/carbon/icon.h
-    wx/mac/carbon/imaglist.h
-    wx/mac/carbon/listbox.h
-    wx/mac/carbon/listctrl.h
-    wx/mac/carbon/macnotfy.h
-    wx/mac/carbon/macsock.h
-    wx/mac/carbon/mdi.h
-    wx/mac/carbon/menu.h
-    wx/mac/carbon/menuitem.h
-    wx/mac/carbon/metafile.h
-    wx/mac/carbon/mimetype.h
-    wx/mac/carbon/minifram.h
-    wx/mac/carbon/msgdlg.h
-    wx/mac/carbon/notebook.h
-    wx/mac/carbon/palette.h
-    wx/mac/carbon/pen.h
-    wx/mac/carbon/pnghand.h
-    wx/mac/carbon/pngread.h
-    wx/mac/carbon/printdlg.h
-    wx/mac/carbon/printmac.h
-    wx/mac/carbon/private.h
-    wx/mac/carbon/radiobox.h
-    wx/mac/carbon/radiobut.h
-    wx/mac/carbon/region.h
-    wx/mac/carbon/scrolbar.h
-    wx/mac/carbon/slider.h
-    wx/mac/carbon/spinbutt.h
-    wx/mac/carbon/spinctrl.h
-    wx/mac/carbon/statbmp.h
-    wx/mac/carbon/statbox.h
-    wx/mac/carbon/statline.h
-    wx/mac/carbon/stattext.h
-    wx/mac/carbon/statusbr.h
-    wx/mac/carbon/tabctrl.h
-    wx/mac/carbon/textctrl.h
-    wx/mac/carbon/timer.h
-    wx/mac/carbon/tglbtn.h
-    wx/mac/carbon/toolbar.h
-    wx/mac/carbon/tooltip.h
-    wx/mac/carbon/toplevel.h
-    wx/mac/carbon/treectrl.h
-    wx/mac/carbon/uma.h
-    wx/mac/carbon/window.h
+<set var="OSX_CARBON_HDR" hints="files">
+    <!-- core files -->
+    wx/osx/core/colour.h
+    <!-- carbon files -->
+    wx/osx/carbon/accel.h
+    wx/osx/carbon/app.h
+    wx/osx/carbon/bitmap.h
+    wx/osx/carbon/bmpbuttn.h
+    wx/osx/carbon/button.h
+    wx/osx/carbon/checkbox.h
+    wx/osx/carbon/checklst.h
+    wx/osx/carbon/chkconf.h
+    wx/osx/carbon/choice.h
+    wx/osx/carbon/clipbrd.h
+    wx/osx/carbon/colordlg.h
+    wx/osx/carbon/combobox.h
+    wx/osx/carbon/control.h
+    wx/osx/carbon/cursor.h
+    wx/osx/carbon/dataform.h
+    wx/osx/carbon/dataobj.h
+    wx/osx/carbon/dataobj2.h
+    wx/osx/carbon/dc.h
+    wx/osx/carbon/dcclient.h
+    wx/osx/carbon/dcmemory.h
+    wx/osx/carbon/dcprint.h
+    wx/osx/carbon/dcscreen.h
+    wx/osx/carbon/dialog.h
+    wx/osx/carbon/dirdlg.h
+    wx/osx/carbon/dnd.h
+    wx/osx/carbon/evtloop.h
+    wx/osx/carbon/filedlg.h
+    wx/osx/carbon/font.h
+    wx/osx/carbon/fontdlg.h
+    wx/osx/carbon/frame.h
+    wx/osx/carbon/gauge.h
+    wx/osx/carbon/helpxxxx.h
+    wx/osx/carbon/icon.h
+    wx/osx/carbon/imaglist.h
+    wx/osx/carbon/listbox.h
+    wx/osx/carbon/listctrl.h
+    wx/osx/carbon/mdi.h
+    wx/osx/carbon/menu.h
+    wx/osx/carbon/menuitem.h
+    wx/osx/carbon/metafile.h
+    wx/osx/carbon/mimetype.h
+    wx/osx/carbon/minifram.h
+    wx/osx/carbon/msgdlg.h
+    wx/osx/carbon/nonownedwnd.h
+    wx/osx/carbon/notebook.h
+    wx/osx/carbon/palette.h
+    wx/osx/carbon/popupwin.h
+    wx/osx/carbon/pnghand.h
+    wx/osx/carbon/pngread.h
+    wx/osx/carbon/printdlg.h
+    wx/osx/carbon/printmac.h
+    wx/osx/carbon/private.h
+    wx/osx/carbon/private/mactext.h
+    wx/osx/carbon/private/overlay.h
+    wx/osx/carbon/private/print.h
+    wx/osx/carbon/radiobox.h
+    wx/osx/carbon/radiobut.h
+    wx/osx/carbon/region.h
+    wx/osx/carbon/scrolbar.h
+    wx/osx/carbon/slider.h
+    wx/osx/carbon/spinbutt.h
+    wx/osx/carbon/spinctrl.h
+    wx/osx/carbon/srchctrl.h
+    wx/osx/carbon/statbmp.h
+    wx/osx/carbon/statbox.h
+    wx/osx/carbon/statline.h
+    wx/osx/carbon/stattext.h
+    wx/osx/carbon/statusbr.h
+    wx/osx/carbon/tabctrl.h
+    wx/osx/carbon/textctrl.h
+    wx/osx/carbon/tglbtn.h
+    wx/osx/carbon/toolbar.h
+    wx/osx/carbon/tooltip.h
+    wx/osx/carbon/toplevel.h
+    wx/osx/carbon/treectrl.h
+    wx/osx/carbon/uma.h
+    wx/osx/carbon/window.h
      <!-- Generic implementations used by wxMac: -->
      wx/generic/caret.h
      <!-- Generic implementations used by wxMac: -->
      wx/generic/caret.h
+    wx/generic/clrpickerg.h
+    wx/generic/collpaneg.h
      wx/generic/fdrepdlg.h
      wx/generic/fdrepdlg.h
+    wx/generic/filepickerg.h
      wx/generic/fontdlgg.h
      wx/generic/fontdlgg.h
-    wx/generic/imaglist.h
+    wx/generic/fontpickerg.h
      wx/generic/listctrl.h
      wx/generic/statusbr.h
      wx/generic/tabg.h
      wx/generic/listctrl.h
      wx/generic/statusbr.h
      wx/generic/tabg.h
@@ -2011,6 +2486,69 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/html/webkit.h
  </set>
  
      wx/html/webkit.h
  </set>
  
+<!-- ====================================================================== -->
+<!--                              wxMac/Cocoa                               -->
+<!-- ====================================================================== -->
+
+<set var="OSX_COCOA_SRC" hints="files">
+    $(OSX_CARBON_COCOA_SRC)
+    src/osx/cocoa/bmpbuttn.mm
+    src/osx/cocoa/button.mm
+    src/osx/cocoa/checkbox.mm
+    src/osx/cocoa/choice.mm
+    src/osx/cocoa/dialog.mm
+    src/osx/cocoa/dirdlg.mm
+    src/osx/cocoa/evtloop.mm
+    src/osx/cocoa/filedlg.mm
+    src/osx/cocoa/gauge.mm
+    src/osx/cocoa/listbox.mm
+    src/osx/cocoa/menu.mm
+    src/osx/cocoa/menuitem.mm
+    src/osx/cocoa/msgdlg.mm
+    src/osx/cocoa/nonownedwnd.mm
+    src/osx/cocoa/notebook.mm
+    src/osx/cocoa/radiobut.mm
+    src/osx/cocoa/scrolbar.mm
+    src/osx/cocoa/slider.mm
+    src/osx/cocoa/spinbutt.mm
+    src/osx/cocoa/srchctrl.mm
+    src/osx/cocoa/statbox.mm
+    src/osx/cocoa/statline.mm
+    src/osx/cocoa/stattext.mm
+    src/osx/cocoa/textctrl.mm
+    src/osx/cocoa/tglbtn.mm
+    src/osx/cocoa/toolbar.mm
+    src/osx/cocoa/tooltip.mm
+    src/osx/cocoa/window.mm
+    src/generic/caret.cpp
+    src/generic/clrpickerg.cpp
+    src/generic/collpaneg.cpp
+    src/generic/fdrepdlg.cpp
+    src/generic/filepickerg.cpp
+    src/generic/fontdlgg.cpp
+    src/generic/fontpickerg.cpp
+    src/generic/listctrl.cpp
+    src/generic/prntdlgg.cpp
+    src/generic/regiong.cpp
+    src/generic/statusbr.cpp
+    src/generic/tabg.cpp
+</set>
+<set var="OSX_COCOA_HDR" hints="files">
+    wx/osx/cocoa/chkconf.h
+    wx/osx/cocoa/private.h
+    $(OSX_CARBON_HDR) <!-- FIXME: these headers need moved somewhere shared... -->
+    wx/generic/region.h
+</set>
+
+<!-- ====================================================================== -->
+<!--                              wxMac/iPhone                              -->
+<!-- ====================================================================== -->
+
+<set var="OSX_IPHONE_SRC" hints="files">
+src/osx/iphone/nonownedwnd.mm
+src/osx/iphone/utils.mm
+src/osx/iphone/window.mm
+</set>
  
  <!-- ====================================================================== -->
  <!--                              wxCocoa                                   -->
  
  <!-- ====================================================================== -->
  <!--                              wxCocoa                                   -->
@@ -2018,8 +2556,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  
  <set var="COCOA_LOWLEVEL_SRC" hints="files">
      <!-- Shared wxMac and wxCocoa files -->
  
  <set var="COCOA_LOWLEVEL_SRC" hints="files">
      <!-- Shared wxMac and wxCocoa files -->
-    src/mac/corefoundation/gsockosx.cpp
-    src/mac/corefoundation/utilsexc_cf.cpp
+    src/osx/core/hid.cpp
+    src/osx/core/utilsexc_cf.cpp
  </set>
  <set var="COCOA_LOWLEVEL_HDR" hints="files">
  </set>
  </set>
  <set var="COCOA_LOWLEVEL_HDR" hints="files">
  </set>
@@ -2030,6 +2568,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/cocoa/NSMenu.mm
      src/cocoa/NSPanel.mm
      src/cocoa/NSScroller.mm
      src/cocoa/NSMenu.mm
      src/cocoa/NSPanel.mm
      src/cocoa/NSScroller.mm
+    src/cocoa/NSSlider.mm
      src/cocoa/NSTabView.mm
      src/cocoa/NSTableView.mm
      src/cocoa/NSTextField.mm
      src/cocoa/NSTabView.mm
      src/cocoa/NSTableView.mm
      src/cocoa/NSTextField.mm
@@ -2057,17 +2596,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/cocoa/dcmemory.mm
      src/cocoa/dcscreen.cpp
      src/cocoa/dialog.mm
      src/cocoa/dcmemory.mm
      src/cocoa/dcscreen.cpp
      src/cocoa/dialog.mm
+    src/cocoa/dirdlg.mm
      src/cocoa/display.mm
      src/cocoa/drawer.mm
      src/cocoa/evtloop.mm
      src/cocoa/filedlg.mm
      src/cocoa/display.mm
      src/cocoa/drawer.mm
      src/cocoa/evtloop.mm
      src/cocoa/filedlg.mm
-    src/cocoa/font.cpp
+    src/cocoa/font.mm
      src/cocoa/fontdlg.mm
      src/cocoa/fontenum.mm
      src/cocoa/fontutil.cpp
      src/cocoa/frame.mm
      src/cocoa/gauge.mm
      src/cocoa/fontdlg.mm
      src/cocoa/fontenum.mm
      src/cocoa/fontutil.cpp
      src/cocoa/frame.mm
      src/cocoa/gauge.mm
-    src/cocoa/gdiobj.cpp
      src/cocoa/icon.mm
      src/cocoa/listbox.mm
      src/cocoa/main.cpp
      src/cocoa/icon.mm
      src/cocoa/listbox.mm
      src/cocoa/main.cpp
@@ -2095,16 +2634,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/cocoa/toolbar.mm
      src/cocoa/tooltip.mm
      src/cocoa/toplevel.mm
      src/cocoa/toolbar.mm
      src/cocoa/tooltip.mm
      src/cocoa/toplevel.mm
-    src/cocoa/utils.cpp
+    src/cocoa/utils.mm
      src/cocoa/utilsexc.mm
      src/cocoa/window.mm
      <!-- Generic implementations used by wxCocoa: -->
      src/generic/accel.cpp
      src/generic/caret.cpp
      src/cocoa/utilsexc.mm
      src/cocoa/window.mm
      <!-- Generic implementations used by wxCocoa: -->
      src/generic/accel.cpp
      src/generic/caret.cpp
+    src/generic/clrpickerg.cpp
+    src/generic/collpaneg.cpp
      src/generic/colrdlgg.cpp
      src/generic/colrdlgg.cpp
-    src/generic/dirdlgg.cpp
      src/generic/fdrepdlg.cpp
      src/generic/fdrepdlg.cpp
+    src/generic/filepickerg.cpp
      src/generic/fontdlgg.cpp
      src/generic/fontdlgg.cpp
+    src/generic/fontpickerg.cpp
      src/generic/imaglist.cpp
      src/generic/listctrl.cpp
      src/generic/msgdlgg.cpp
      src/generic/imaglist.cpp
      src/generic/listctrl.cpp
      src/generic/msgdlgg.cpp
@@ -2121,6 +2663,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/cocoa/NSMenu.h
      wx/cocoa/NSPanel.h
      wx/cocoa/NSScroller.h
      wx/cocoa/NSMenu.h
      wx/cocoa/NSPanel.h
      wx/cocoa/NSScroller.h
+    wx/cocoa/NSSlider.h
      wx/cocoa/NSTabView.h
      wx/cocoa/NSTableView.h
      wx/cocoa/NSTextField.h
      wx/cocoa/NSTabView.h
      wx/cocoa/NSTableView.h
      wx/cocoa/NSTextField.h
@@ -2151,14 +2694,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/cocoa/dcmemory.h
      wx/cocoa/dcscreen.h
      wx/cocoa/dialog.h
      wx/cocoa/dcmemory.h
      wx/cocoa/dcscreen.h
      wx/cocoa/dialog.h
-    wx/cocoa/display.h
+    wx/cocoa/dirdlg.h
      wx/cocoa/drawer.h
      wx/cocoa/filedlg.h
      wx/cocoa/font.h
      wx/cocoa/fontdlg.h
      wx/cocoa/frame.h
      wx/cocoa/gauge.h
      wx/cocoa/drawer.h
      wx/cocoa/filedlg.h
      wx/cocoa/font.h
      wx/cocoa/fontdlg.h
      wx/cocoa/frame.h
      wx/cocoa/gauge.h
-    wx/cocoa/gdiobj.h
      wx/cocoa/icon.h
      wx/cocoa/listbox.h
      wx/cocoa/log.h
      wx/cocoa/icon.h
      wx/cocoa/listbox.h
      wx/cocoa/log.h
@@ -2181,15 +2723,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/cocoa/statline.h
      wx/cocoa/stattext.h
      wx/cocoa/textctrl.h
      wx/cocoa/statline.h
      wx/cocoa/stattext.h
      wx/cocoa/textctrl.h
-    wx/cocoa/timer.h
      wx/cocoa/toolbar.h
      wx/cocoa/toolbar.h
+    wx/cocoa/tooltip.h
      wx/cocoa/toplevel.h
      wx/cocoa/window.h
      wx/cocoa/toplevel.h
      wx/cocoa/window.h
+    <!-- Semi-private headers -->
+    wx/cocoa/objc/objc_uniquifying.h
      <!-- Generic implementations used by wxCocoa: -->
      wx/generic/caret.h
      <!-- Generic implementations used by wxCocoa: -->
      wx/generic/caret.h
-    wx/generic/dirdlgg.h
+    wx/generic/clrpickerg.h
+    wx/generic/collpaneg.h
      wx/generic/fdrepdlg.h
      wx/generic/fontdlgg.h
      wx/generic/fdrepdlg.h
      wx/generic/fontdlgg.h
+    wx/generic/fontpickerg.h
      wx/generic/imaglist.h
      wx/generic/listctrl.h
      wx/generic/paletteg.h
      wx/generic/imaglist.h
      wx/generic/listctrl.h
      wx/generic/paletteg.h
@@ -2208,17 +2754,21 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <set var="UNIV_THEMES_SRC" hints="files">
      src/univ/themes/gtk.cpp
      src/univ/themes/metal.cpp
  <set var="UNIV_THEMES_SRC" hints="files">
      src/univ/themes/gtk.cpp
      src/univ/themes/metal.cpp
+    src/univ/themes/mono.cpp
      src/univ/themes/win32.cpp
  </set>
  
  <set var="UNIV_SRC" hints="files">
      src/generic/accel.cpp
      src/univ/themes/win32.cpp
  </set>
  
  <set var="UNIV_SRC" hints="files">
      src/generic/accel.cpp
+    src/generic/clrpickerg.cpp
+    src/generic/collpaneg.cpp
      src/generic/colrdlgg.cpp
      src/generic/dirdlgg.cpp
      src/generic/fdrepdlg.cpp
      src/generic/filedlgg.cpp
      src/generic/colrdlgg.cpp
      src/generic/dirdlgg.cpp
      src/generic/fdrepdlg.cpp
      src/generic/filedlgg.cpp
+    src/generic/filepickerg.cpp
      src/generic/fontdlgg.cpp
      src/generic/fontdlgg.cpp
-    src/generic/imaglist.cpp
+    src/generic/fontpickerg.cpp
      src/generic/listctrl.cpp
      src/generic/mdig.cpp
      src/generic/msgdlgg.cpp
      src/generic/listctrl.cpp
      src/generic/mdig.cpp
      src/generic/msgdlgg.cpp
@@ -2229,7 +2779,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/univ/checkbox.cpp
      src/univ/checklst.cpp
      src/univ/choice.cpp
      src/univ/checkbox.cpp
      src/univ/checklst.cpp
      src/univ/choice.cpp
-    src/univ/colschem.cpp
      src/univ/combobox.cpp
      src/univ/control.cpp
      src/univ/ctrlrend.cpp
      src/univ/combobox.cpp
      src/univ/control.cpp
      src/univ/ctrlrend.cpp
@@ -2246,6 +2795,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/univ/scrarrow.cpp
      src/univ/scrolbar.cpp
      src/univ/scrthumb.cpp
      src/univ/scrarrow.cpp
      src/univ/scrolbar.cpp
      src/univ/scrthumb.cpp
+    src/univ/settingsuniv.cpp
      src/univ/slider.cpp
      src/univ/spinbutt.cpp
      src/univ/statbmp.cpp
      src/univ/slider.cpp
      src/univ/spinbutt.cpp
      src/univ/statbmp.cpp
@@ -2253,7 +2803,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      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/stdrend.cpp
      src/univ/textctrl.cpp
      src/univ/textctrl.cpp
+    src/univ/tglbtn.cpp
      src/univ/theme.cpp
      src/univ/toolbar.cpp
      src/univ/topluniv.cpp
      src/univ/theme.cpp
      src/univ/toolbar.cpp
      src/univ/topluniv.cpp
@@ -2261,9 +2813,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  </set>
  <set var="UNIV_HDR" hints="files">
      wx/generic/accel.h
  </set>
  <set var="UNIV_HDR" hints="files">
      wx/generic/accel.h
+    wx/generic/animate.h
+    wx/generic/clrpickerg.h
+    wx/generic/collpaneg.h
+    wx/generic/ctrlsub.h
      wx/generic/dirdlgg.h
      wx/generic/fdrepdlg.h
      wx/generic/dirdlgg.h
      wx/generic/fdrepdlg.h
+    wx/generic/filedlgg.h
+    wx/generic/filepickerg.h
      wx/generic/fontdlgg.h
      wx/generic/fontdlgg.h
+    wx/generic/fontpickerg.h
      wx/generic/listctrl.h
      wx/generic/mdig.h
      wx/generic/statusbr.h
      wx/generic/listctrl.h
      wx/generic/mdig.h
      wx/generic/statusbr.h
@@ -2273,6 +2832,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/univ/button.h
      wx/univ/checkbox.h
      wx/univ/checklst.h
      wx/univ/button.h
      wx/univ/checkbox.h
      wx/univ/checklst.h
+    wx/univ/chkconf.h
      wx/univ/choice.h
      wx/univ/colschem.h
      wx/univ/combobox.h
      wx/univ/choice.h
      wx/univ/colschem.h
      wx/univ/combobox.h
@@ -2300,26 +2860,39 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/univ/statline.h
      wx/univ/stattext.h
      wx/univ/statusbr.h
      wx/univ/statline.h
      wx/univ/stattext.h
      wx/univ/statusbr.h
+    wx/univ/stdrend.h
      wx/univ/textctrl.h
      wx/univ/theme.h
      wx/univ/textctrl.h
      wx/univ/theme.h
+    wx/univ/tglbtn.h
      wx/univ/toolbar.h
      wx/univ/toplevel.h
      wx/univ/window.h
  </set>
  
      wx/univ/toolbar.h
      wx/univ/toplevel.h
      wx/univ/window.h
  </set>
  
-
  <!-- ====================================================================== -->
  <!--                               wxAdvanced                               -->
  <!-- ====================================================================== -->
  
  <set var="ADVANCED_CMN_SRC" hints="files">
  <!-- ====================================================================== -->
  <!--                               wxAdvanced                               -->
  <!-- ====================================================================== -->
  
  <set var="ADVANCED_CMN_SRC" hints="files">
-    src/generic/calctrl.cpp
+    src/common/animatecmn.cpp
+    src/common/bmpcboxcmn.cpp
+    src/common/calctrlcmn.cpp
+    src/common/datavcmn.cpp
+    src/common/hyperlnkcmn.cpp
+    src/generic/aboutdlgg.cpp
+    src/generic/bmpcboxg.cpp
+    src/generic/calctrlg.cpp
+    src/generic/datavgen.cpp
      src/generic/datectlg.cpp
      src/generic/datectlg.cpp
+    src/generic/editlbox.cpp
      src/generic/grid.cpp
      src/generic/gridctrl.cpp
      src/generic/gridsel.cpp
      src/generic/helpext.cpp
      src/generic/grid.cpp
      src/generic/gridctrl.cpp
      src/generic/gridsel.cpp
      src/generic/helpext.cpp
+    src/generic/hyperlinkg.cpp
      src/generic/laywin.cpp
      src/generic/laywin.cpp
+    src/generic/notifmsgg.cpp
+    src/generic/odcombo.cpp
      src/generic/propdlg.cpp
      src/generic/sashwin.cpp
      src/generic/splash.cpp
      src/generic/propdlg.cpp
      src/generic/sashwin.cpp
      src/generic/splash.cpp
@@ -2328,52 +2901,72 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  </set>
  
  <set var="ADVANCED_CMN_HDR" hints="files">
  </set>
  
  <set var="ADVANCED_CMN_HDR" hints="files">
+    wx/aboutdlg.h
+    wx/animate.h
+    wx/bmpcbox.h
      wx/calctrl.h
      wx/calctrl.h
+    wx/dataview.h
+    wx/datectrl.h
      wx/dateevt.h
      wx/dcbuffer.h
      wx/dateevt.h
      wx/dcbuffer.h
-    wx/generic/calctrl.h
+    wx/editlbox.h
+    wx/generic/aboutdlgg.h
+    wx/generic/bmpcbox.h
+    wx/generic/calctrlg.h
      wx/generic/datectrl.h
      wx/generic/datectrl.h
+    wx/generic/dataview.h
      wx/generic/grid.h
      wx/generic/gridctrl.h
      wx/generic/gridsel.h
      wx/generic/helpext.h
      wx/generic/grid.h
      wx/generic/gridctrl.h
      wx/generic/gridsel.h
      wx/generic/helpext.h
+    wx/generic/hyperlink.h
      wx/generic/laywin.h
      wx/generic/laywin.h
+    wx/generic/notifmsg.h
      wx/generic/propdlg.h
      wx/generic/sashwin.h
      wx/generic/splash.h
      wx/generic/wizard.h
      wx/grid.h
      wx/generic/propdlg.h
      wx/generic/sashwin.h
      wx/generic/splash.h
      wx/generic/wizard.h
      wx/grid.h
+    wx/hyperlink.h
      wx/joystick.h
      wx/laywin.h
      wx/joystick.h
      wx/laywin.h
+    wx/notifmsg.h
+    wx/odcombo.h
      wx/propdlg.h
      wx/sashwin.h
      wx/sound.h
      wx/splash.h
      wx/taskbar.h
      wx/tipdlg.h
      wx/propdlg.h
      wx/sashwin.h
      wx/sound.h
      wx/splash.h
      wx/taskbar.h
      wx/tipdlg.h
-    wx/wave.h
      wx/wizard.h
  </set>
  
      wx/wizard.h
  </set>
  
-<set var="ADVANCED_CMN_NATIVE_HDR" hints="files">
-    wx/datectrl.h
-</set>
-
  <set var="ADVANCED_MSW_SRC" hints="files">
      src/common/taskbarcmn.cpp
  <set var="ADVANCED_MSW_SRC" hints="files">
      src/common/taskbarcmn.cpp
+    src/generic/animateg.cpp
+    src/msw/aboutdlg.cpp
+    src/msw/notifmsg.cpp
      src/msw/sound.cpp
      src/msw/taskbar.cpp
  </set>
  <set var="ADVANCED_MSW_HDR" hints="files">
      src/msw/sound.cpp
      src/msw/taskbar.cpp
  </set>
  <set var="ADVANCED_MSW_HDR" hints="files">
+    wx/generic/animate.h
+    wx/msw/notifmsg.h
      wx/msw/sound.h
      wx/msw/taskbar.h
  </set>
  
  <!-- not used with wxUniv -->
  <set var="ADVANCED_MSW_NATIVE_SRC" hints="files">
      wx/msw/sound.h
      wx/msw/taskbar.h
  </set>
  
  <!-- not used with wxUniv -->
  <set var="ADVANCED_MSW_NATIVE_SRC" hints="files">
+    src/msw/bmpcbox.cpp
+    src/msw/calctrl.cpp
+    src/msw/datecontrols.cpp
      src/msw/datectrl.cpp
  </set>
  <set var="ADVANCED_MSW_NATIVE_HDR" hints="files">
      src/msw/datectrl.cpp
  </set>
  <set var="ADVANCED_MSW_NATIVE_HDR" hints="files">
+    wx/msw/bmpcbox.h
+    wx/msw/calctrl.h
+    wx/msw/datecontrols.h
      wx/msw/datectrl.h
  </set>
  
      wx/msw/datectrl.h
  </set>
  
@@ -2385,35 +2978,72 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/msw/joystick.h
  </set>
  
      wx/msw/joystick.h
  </set>
  
-<set var="ADVANCED_MAC_SRC" hints="files">
+<set var="ADVANCED_OSX_CARBON_SRC" hints="files">
+    src/common/taskbarcmn.cpp
+    src/generic/animateg.cpp
+    src/osx/carbon/aboutdlg.cpp
+    src/osx/carbon/drawer.cpp
+    src/osx/carbon/dataview.cpp
+    src/osx/carbon/databrow.cpp
+    src/osx/carbon/sound.cpp
+    src/osx/carbon/taskbar.cpp
+    src/osx/core/hidjoystick.cpp
+</set>
+
+<set var="ADVANCED_OSX_CARBON_HDR" hints="files">
+    wx/generic/animate.h
+    wx/osx/dataview.h
+    wx/osx/joystick.h
+    wx/osx/sound.h
+    wx/osx/carbon/drawer.h
+    wx/osx/carbon/dataview.h
+    wx/osx/carbon/databrow.h
+    wx/osx/carbon/sound.h
+    wx/osx/carbon/taskbarosx.h
+    wx/osx/core/joystick.h
+</set>
+
+<set var="ADVANCED_OSX_COCOA_SRC" hints="files">
      src/common/taskbarcmn.cpp
      src/common/taskbarcmn.cpp
-    src/mac/carbon/drawer.cpp
-    src/mac/carbon/sound.cpp
-    src/mac/carbon/taskbar.cpp
-    src/mac/corefoundation/hidjoystick.cpp
+    src/generic/animateg.cpp
+    src/osx/cocoa/aboutdlg.mm
+    src/osx/cocoa/taskbar.mm
+    src/osx/core/hidjoystick.cpp
  </set>
  </set>
-<set var="ADVANCED_MAC_HDR" hints="files">
-    wx/mac/carbon/drawer.h
-    wx/mac/carbon/sound.h
-    wx/mac/carbon/taskbarosx.h
-    wx/mac/corefoundation/joystick.h
+
+<set var="ADVANCED_OSX_COCOA_HDR" hints="files">
+    wx/generic/animate.h
+    wx/osx/dataview.h
+    wx/osx/joystick.h
+    wx/osx/sound.h
+    <!--wx/osx/carbon/drawer.h -->
+    <!--wx/osx/carbon/dataview.h -->
+    <!--wx/osx/carbon/databrow.h -->
+    wx/osx/carbon/sound.h
+    wx/osx/carbon/taskbarosx.h
+    wx/osx/core/joystick.h
  </set>
  
  <set var="ADVANCED_COCOA_SRC" hints="files">
      src/cocoa/taskbar.mm
      src/common/taskbarcmn.cpp
  </set>
  
  <set var="ADVANCED_COCOA_SRC" hints="files">
      src/cocoa/taskbar.mm
      src/common/taskbarcmn.cpp
-    src/mac/corefoundation/hidjoystick.cpp
+    src/generic/animateg.cpp
+    src/osx/core/hidjoystick.cpp
  </set>
  </set>
+
  <set var="ADVANCED_COCOA_HDR" hints="files">
      wx/cocoa/taskbar.h
  <set var="ADVANCED_COCOA_HDR" hints="files">
      wx/cocoa/taskbar.h
-    wx/mac/corefoundation/joystick.h
+    wx/generic/animate.h
+    wx/osx/core/joystick.h
  </set>
  
  <set var="ADVANCED_OS2_SRC" hints="files">
  </set>
  
  <set var="ADVANCED_OS2_SRC" hints="files">
+    src/generic/animateg.cpp
      src/os2/joystick.cpp
      src/os2/sound.cpp
  </set>
  <set var="ADVANCED_OS2_HDR" hints="files">
      src/os2/joystick.cpp
      src/os2/sound.cpp
  </set>
  <set var="ADVANCED_OS2_HDR" hints="files">
+    wx/generic/animate.h
      wx/os2/joystick.h
      wx/os2/sound.h
  </set>
      wx/os2/joystick.h
      wx/os2/sound.h
  </set>
@@ -2430,9 +3060,53 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/unix/taskbarx11.h
  </set>
  
      wx/unix/taskbarx11.h
  </set>
  
+<set var="ADVANCED_MOTIF_SRC" hints="files">
+    src/generic/animateg.cpp
+</set>
+
+<set var="ADVANCED_MOTIF_HDR" hints="files">
+    wx/generic/animate.h
+</set>
+
  <set var="ADVANCED_GTK_SRC" hints="files">
      src/gtk/taskbar.cpp
      src/gtk/eggtrayicon.c
  <set var="ADVANCED_GTK_SRC" hints="files">
      src/gtk/taskbar.cpp
      src/gtk/eggtrayicon.c
+    src/gtk/hildon/notifmsg.cpp
+</set>
+<set var="ADVANCED_GTK_HDR" hints="files">
+    wx/gtk/hildon/notifmsg.h
+</set>
+
+<set var="ADVANCED_GTK_NATIVE_SRC" hints="files">
+    src/gtk/aboutdlg.cpp
+    src/gtk/animate.cpp
+    src/gtk/bmpcbox.cpp
+    src/gtk/calctrl.cpp
+    src/gtk/dataview.cpp
+    src/gtk/hyperlink.cpp
+</set>
+<set var="ADVANCED_GTK_NATIVE_HDR" hints="files">
+    wx/gtk/animate.h
+    wx/gtk/bmpcbox.h
+    wx/gtk/calctrl.h
+    wx/gtk/dataview.h
+    wx/gtk/hyperlink.h
+</set>
+
+<set var="ADVANCED_GTK1_SRC" hints="files">
+    src/generic/animateg.cpp
+    src/gtk1/eggtrayicon.c
+    src/gtk1/taskbar.cpp
+</set>
+<set var="ADVANCED_GTK1_HDR" hints="files">
+    wx/generic/animate.h
+</set>
+
+<set var="ADVANCED_UNIV_SRC" hints="files">
+    src/generic/animateg.cpp
+</set>
+<set var="ADVANCED_UNIV_HDR" hints="files">
+    wx/generic/animate.h
  </set>
  
  <!-- ====================================================================== -->
  </set>
  
  <!-- ====================================================================== -->
@@ -2448,9 +3122,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  </set>
  
  <set var="MEDIA_MSW_SRC" hints="files">
  </set>
  
  <set var="MEDIA_MSW_SRC" hints="files">
-    src/msw/mediactrl.cpp
+    src/msw/mediactrl_am.cpp
+    src/msw/mediactrl_wmp10.cpp
+    src/msw/mediactrl_qt.cpp
+    src/msw/ole/activex.cpp
  </set>
  <set var="MEDIA_MSW_HDR" hints="files">
  </set>
  <set var="MEDIA_MSW_HDR" hints="files">
+    wx/msw/ole/activex.h
  </set>
  <!-- not built on WindowsCE: -->
  <set var="MEDIA_MSW_DESKTOP_SRC" hints="files">
  </set>
  <!-- not built on WindowsCE: -->
  <set var="MEDIA_MSW_DESKTOP_SRC" hints="files">
@@ -2458,10 +3136,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <set var="MEDIA_MSW_DESKTOP_HDR" hints="files">
  </set>
  
  <set var="MEDIA_MSW_DESKTOP_HDR" hints="files">
  </set>
  
-<set var="MEDIA_MAC_SRC" hints="files">
-    src/mac/carbon/mediactrl.cpp
+<set var="MEDIA_OSX_CARBON_SRC" hints="files">
+    src/osx/carbon/mediactrl.cpp
  </set>
  </set>
-<set var="MEDIA_MAC_HDR" hints="files">
+<set var="MEDIA_OSX_CARBON_HDR" hints="files">
+</set>
+
+<set var="MEDIA_OSX_COCOA_SRC" hints="files">
+    <!-- src/osx/cocoa/mediactrl.mm -->
+</set>
+<set var="MEDIA_OSX_COCOA_HDR" hints="files">
  </set>
  
  <set var="MEDIA_COCOA_SRC" hints="files">
  </set>
  
  <set var="MEDIA_COCOA_SRC" hints="files">
@@ -2484,6 +3168,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <set var="MEDIA_GTK_SRC" hints="files">
  </set>
  
  <set var="MEDIA_GTK_SRC" hints="files">
  </set>
  
+<set var="MEDIA_GTK1_SRC" hints="files">
+</set>
+
  <!-- ====================================================================== -->
  <!--                               wxHTML                                   -->
  <!-- ====================================================================== -->
  <!-- ====================================================================== -->
  <!--                               wxHTML                                   -->
  <!-- ====================================================================== -->
@@ -2503,7 +3190,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      $(HTML_SRC_PLATFORM)
      src/html/helpctrl.cpp
      src/html/helpdata.cpp
      $(HTML_SRC_PLATFORM)
      src/html/helpctrl.cpp
      src/html/helpdata.cpp
+    src/html/helpdlg.cpp
      src/html/helpfrm.cpp
      src/html/helpfrm.cpp
+    src/html/helpwnd.cpp
      src/html/htmlcell.cpp
      src/html/htmlfilt.cpp
      src/html/htmlpars.cpp
      src/html/htmlcell.cpp
      src/html/htmlfilt.cpp
      src/html/htmlpars.cpp
@@ -2524,10 +3213,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      <!-- wxHTML users: -->
      src/generic/htmllbox.cpp
  </set>
      <!-- wxHTML users: -->
      src/generic/htmllbox.cpp
  </set>
+<set var="MSW_HTML_HDR" hints="files">
+    <if cond="TOOLKIT=='MSW'">wx/msw/helpbest.h</if>
+</set>
  <set var="HTML_HDR" hints="files">
      wx/html/helpctrl.h
      wx/html/helpdata.h
  <set var="HTML_HDR" hints="files">
      wx/html/helpctrl.h
      wx/html/helpdata.h
+    wx/html/helpdlg.h
      wx/html/helpfrm.h
      wx/html/helpfrm.h
+    wx/html/helpwnd.h
      wx/html/htmlcell.h
      wx/html/htmldefs.h
      wx/html/htmlfilt.h
      wx/html/htmlcell.h
      wx/html/htmldefs.h
      wx/html/htmlfilt.h
@@ -2541,6 +3235,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/wxhtml.h
      <!-- wxHTML users: -->
      wx/htmllbox.h
      wx/wxhtml.h
      <!-- wxHTML users: -->
      wx/htmllbox.h
+    $(MSW_HTML_HDR)
  </set>
  
  
  </set>
  
  
@@ -2550,35 +3245,51 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <!-- ====================================================================== -->
  
  <set var="XRC_SRC" hints="files">
  <!-- ====================================================================== -->
  
  <set var="XRC_SRC" hints="files">
-    src/xrc/xh_bmpbt.cpp
+    src/xrc/xh_animatctrl.cpp
      src/xrc/xh_bmp.cpp
      src/xrc/xh_bmp.cpp
+    src/xrc/xh_bmpcbox.cpp
+    src/xrc/xh_bmpbt.cpp
      src/xrc/xh_bttn.cpp
      src/xrc/xh_cald.cpp
      src/xrc/xh_chckb.cpp
      src/xrc/xh_chckl.cpp
      src/xrc/xh_choic.cpp
      src/xrc/xh_choicbk.cpp
      src/xrc/xh_bttn.cpp
      src/xrc/xh_cald.cpp
      src/xrc/xh_chckb.cpp
      src/xrc/xh_chckl.cpp
      src/xrc/xh_choic.cpp
      src/xrc/xh_choicbk.cpp
+    src/xrc/xh_clrpicker.cpp
+    src/xrc/xh_collpane.cpp
      src/xrc/xh_combo.cpp
      src/xrc/xh_datectrl.cpp
      src/xrc/xh_combo.cpp
      src/xrc/xh_datectrl.cpp
+    src/xrc/xh_dirpicker.cpp
      src/xrc/xh_dlg.cpp
      src/xrc/xh_frame.cpp
      src/xrc/xh_dlg.cpp
      src/xrc/xh_frame.cpp
+    src/xrc/xh_mdi.cpp
+    src/xrc/xh_filepicker.cpp
+    src/xrc/xh_fontpicker.cpp
      src/xrc/xh_gauge.cpp
      src/xrc/xh_gdctl.cpp
      src/xrc/xh_gauge.cpp
      src/xrc/xh_gdctl.cpp
+    src/xrc/xh_grid.cpp
      src/xrc/xh_html.cpp
      src/xrc/xh_html.cpp
+    src/xrc/xh_hyperlink.cpp
      src/xrc/xh_listb.cpp
      src/xrc/xh_listbk.cpp
      src/xrc/xh_listc.cpp
      src/xrc/xh_menu.cpp
      src/xrc/xh_notbk.cpp
      src/xrc/xh_listb.cpp
      src/xrc/xh_listbk.cpp
      src/xrc/xh_listc.cpp
      src/xrc/xh_menu.cpp
      src/xrc/xh_notbk.cpp
+    src/xrc/xh_odcombo.cpp
      src/xrc/xh_panel.cpp
      src/xrc/xh_panel.cpp
+    src/xrc/xh_propdlg.cpp
      src/xrc/xh_radbt.cpp
      src/xrc/xh_radbx.cpp
      src/xrc/xh_radbt.cpp
      src/xrc/xh_radbx.cpp
+    <!-- disabled until linking problems are fixed -->
+    <!-- src/xrc/xh_richtext.cpp -->
      src/xrc/xh_scrol.cpp
      src/xrc/xh_scwin.cpp
      src/xrc/xh_scrol.cpp
      src/xrc/xh_scwin.cpp
+    src/xrc/xh_htmllbox.cpp
      src/xrc/xh_sizer.cpp
      src/xrc/xh_slidr.cpp
      src/xrc/xh_spin.cpp
      src/xrc/xh_split.cpp
      src/xrc/xh_sizer.cpp
      src/xrc/xh_slidr.cpp
      src/xrc/xh_spin.cpp
      src/xrc/xh_split.cpp
+    src/xrc/xh_srchctrl.cpp
      src/xrc/xh_statbar.cpp
      src/xrc/xh_stbmp.cpp
      src/xrc/xh_stbox.cpp
      src/xrc/xh_statbar.cpp
      src/xrc/xh_stbmp.cpp
      src/xrc/xh_stbox.cpp
@@ -2588,42 +3299,59 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/xrc/xh_tglbtn.cpp
      src/xrc/xh_toolb.cpp
      src/xrc/xh_tree.cpp
      src/xrc/xh_tglbtn.cpp
      src/xrc/xh_toolb.cpp
      src/xrc/xh_tree.cpp
+    src/xrc/xh_treebk.cpp
      src/xrc/xh_unkwn.cpp
      src/xrc/xh_wizrd.cpp
      src/xrc/xmlres.cpp
      src/xrc/xh_unkwn.cpp
      src/xrc/xh_wizrd.cpp
      src/xrc/xmlres.cpp
+    src/xrc/xmladv.cpp
      src/xrc/xmlrsall.cpp
  </set>
  <set var="XRC_HDR" hints="files">
      wx/xrc/xh_all.h
      src/xrc/xmlrsall.cpp
  </set>
  <set var="XRC_HDR" hints="files">
      wx/xrc/xh_all.h
+    wx/xrc/xh_animatctrl.h
      wx/xrc/xh_bmpbt.h
      wx/xrc/xh_bmp.h
      wx/xrc/xh_bmpbt.h
      wx/xrc/xh_bmp.h
+    wx/xrc/xh_bmpcbox.h
      wx/xrc/xh_bttn.h
      wx/xrc/xh_cald.h
      wx/xrc/xh_chckb.h
      wx/xrc/xh_chckl.h
      wx/xrc/xh_choic.h
      wx/xrc/xh_choicbk.h
      wx/xrc/xh_bttn.h
      wx/xrc/xh_cald.h
      wx/xrc/xh_chckb.h
      wx/xrc/xh_chckl.h
      wx/xrc/xh_choic.h
      wx/xrc/xh_choicbk.h
+    wx/xrc/xh_clrpicker.h
+    wx/xrc/xh_collpane.h
      wx/xrc/xh_combo.h
      wx/xrc/xh_datectrl.h
      wx/xrc/xh_combo.h
      wx/xrc/xh_datectrl.h
+    wx/xrc/xh_dirpicker.h
      wx/xrc/xh_dlg.h
      wx/xrc/xh_dlg.h
+    wx/xrc/xh_filepicker.h
+    wx/xrc/xh_fontpicker.h
      wx/xrc/xh_frame.h
      wx/xrc/xh_frame.h
+    wx/xrc/xh_mdi.h
      wx/xrc/xh_gauge.h
      wx/xrc/xh_gdctl.h
      wx/xrc/xh_gauge.h
      wx/xrc/xh_gdctl.h
+    wx/xrc/xh_grid.h
      wx/xrc/xh_html.h
      wx/xrc/xh_html.h
+    wx/xrc/xh_hyperlink.h
      wx/xrc/xh_listb.h
      wx/xrc/xh_listbk.h
      wx/xrc/xh_listc.h
      wx/xrc/xh_menu.h
      wx/xrc/xh_notbk.h
      wx/xrc/xh_listb.h
      wx/xrc/xh_listbk.h
      wx/xrc/xh_listc.h
      wx/xrc/xh_menu.h
      wx/xrc/xh_notbk.h
+    wx/xrc/xh_odcombo.h
      wx/xrc/xh_panel.h
      wx/xrc/xh_panel.h
+    wx/xrc/xh_propdlg.h
      wx/xrc/xh_radbt.h
      wx/xrc/xh_radbx.h
      wx/xrc/xh_radbt.h
      wx/xrc/xh_radbx.h
+    <!-- wx/xrc/xh_richtext.h -->
      wx/xrc/xh_scrol.h
      wx/xrc/xh_scwin.h
      wx/xrc/xh_scrol.h
      wx/xrc/xh_scwin.h
+    wx/xrc/xh_htmllbox.h
      wx/xrc/xh_sizer.h
      wx/xrc/xh_slidr.h
      wx/xrc/xh_spin.h
      wx/xrc/xh_split.h
      wx/xrc/xh_sizer.h
      wx/xrc/xh_slidr.h
      wx/xrc/xh_spin.h
      wx/xrc/xh_split.h
+    wx/xrc/xh_srchctrl.h
      wx/xrc/xh_statbar.h
      wx/xrc/xh_stbmp.h
      wx/xrc/xh_stbox.h
      wx/xrc/xh_statbar.h
      wx/xrc/xh_stbmp.h
      wx/xrc/xh_stbox.h
@@ -2633,6 +3361,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/xrc/xh_tglbtn.h
      wx/xrc/xh_toolb.h
      wx/xrc/xh_tree.h
      wx/xrc/xh_tglbtn.h
      wx/xrc/xh_toolb.h
      wx/xrc/xh_tree.h
+    wx/xrc/xh_treebk.h
      wx/xrc/xh_unkwn.h
      wx/xrc/xh_wizrd.h
      wx/xrc/xmlres.h
      wx/xrc/xh_unkwn.h
      wx/xrc/xh_wizrd.h
      wx/xrc/xmlres.h
@@ -2659,58 +3388,149 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <!--                             OpenGL canvas                              -->
  <!-- ====================================================================== -->
  
  <!--                             OpenGL canvas                              -->
  <!-- ====================================================================== -->
  
-<set var="OPENGL_SRC" hints="files">
-    <if cond="TOOLKIT=='MAC'">src/mac/carbon/glcanvas.cpp</if>
+<set var="OPENGL_SRC_PLATFORM" hints="files">
+    <if cond="TOOLKIT=='OSX_CARBON'">src/osx/carbon/glcanvas.cpp src/osx/glcanvas_osx.cpp</if>
+    <if cond="TOOLKIT=='OSX_COCOA'">src/osx/cocoa/glcanvas.mm src/osx/glcanvas_osx.cpp</if>
      <if cond="TOOLKIT=='COCOA'">src/cocoa/glcanvas.mm</if>
      <if cond="TOOLKIT=='COCOA'">src/cocoa/glcanvas.mm</if>
-    <if cond="TOOLKIT=='GTK'">src/gtk/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
+        src/gtk/glcanvas.cpp
+        src/unix/glx11.cpp
+    </if>
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">
+        src/gtk1/glcanvas.cpp
+        src/unix/glx11.cpp
+    </if>
      <if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>
      <if cond="TOOLKIT=='WINCE'">src/msw/glcanvas.cpp</if>
      <if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>
      <if cond="TOOLKIT=='WINCE'">src/msw/glcanvas.cpp</if>
-    <if cond="TOOLKIT=='MOTIF'">src/x11/glcanvas.cpp</if>
-    <if cond="TOOLKIT=='X11'">src/x11/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='MOTIF'">src/x11/glcanvas.cpp src/unix/glx11.cpp</if>
+    <if cond="TOOLKIT=='X11'">src/x11/glcanvas.cpp src/unix/glx11.cpp</if>
      <if cond="TOOLKIT=='PM'">src/os2/glcanvas.cpp</if>
  </set>
  
      <if cond="TOOLKIT=='PM'">src/os2/glcanvas.cpp</if>
  </set>
  
-<set var="OPENGL_HDR" hints="files">
-    <if cond="TOOLKIT=='MAC'">wx/mac/carbon/glcanvas.h</if>
+<set var="OPENGL_SRC" hints="files">
+    src/common/glcmn.cpp
+    $(OPENGL_SRC_PLATFORM)
+</set>
+
+<set var="OPENGL_HDR_PLATFORM" hints="files">
+    <if cond="TOOLKIT=='OSX_CARBON'">wx/osx/glcanvas.h wx/osx/carbon/glcanvas.h</if>
      <if cond="TOOLKIT=='COCOA'">wx/cocoa/glcanvas.h</if>
      <if cond="TOOLKIT=='COCOA'">wx/cocoa/glcanvas.h</if>
-    <if cond="TOOLKIT=='GTK'">wx/gtk/glcanvas.h</if>
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
+        wx/gtk/glcanvas.h
+        wx/unix/glx11.h
+    </if>
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">
+        wx/gtk1/glcanvas.h
+        wx/unix/glx11.h
+    </if>
      <if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
      <if cond="TOOLKIT=='WINCE'">wx/msw/glcanvas.h</if>
      <if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
      <if cond="TOOLKIT=='WINCE'">wx/msw/glcanvas.h</if>
-    <if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h</if>
-    <if cond="TOOLKIT=='X11'">wx/x11/glcanvas.h</if>
-    <if cond="TOOLKIT=='PM'">wx/os2/glcanvas.h</if>
+    <if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h wx/unix/glx11.h</if>
+    <if cond="TOOLKIT=='X11'">wx/x11/glcanvas.h wx/unix/glx11.h</if>
+</set>
+
+<set var="OPENGL_HDR" hints="files">
+    wx/glcanvas.h
+    $(OPENGL_HDR_PLATFORM)
  </set>
  
  
  </set>
  
  
+<!-- ====================================================================== -->
+<!--                             Misc plugin sources:                       -->
+<!-- ====================================================================== -->
+
+<set var="UNIX_SOUND_SRC_SDL" hints="files">
+    src/unix/sound_sdl.cpp
+</set>
  
  <!-- ====================================================================== -->
  
  <!-- ====================================================================== -->
-<!--                              ODBC classes                              -->
+<!--                                  wxAUI                                 -->
  <!-- ====================================================================== -->
  
  <!-- ====================================================================== -->
  
-<set var="ODBC_SRC" hints="files">
-    src/common/db.cpp
-    src/common/dbtable.cpp
+<set var="AUI_SRC" hints="files">
+    src/aui/framemanager.cpp
+    src/aui/dockart.cpp
+    src/aui/floatpane.cpp
+    src/aui/auibook.cpp
+    src/aui/auibar.cpp
+    src/aui/tabmdi.cpp
  </set>
  </set>
-<set var="ODBC_HDR" hints="files">
-    wx/db.h
-    wx/dbkeyg.h
-    wx/dbtable.h
+<set var="AUI_HDR" hints="files">
+    wx/aui/framemanager.h
+    wx/aui/dockart.h
+    wx/aui/floatpane.h
+    wx/aui/auibook.h
+    wx/aui/auibar.h
+    wx/aui/tabmdi.h
+    wx/aui/aui.h
  </set>
  
  </set>
  
-<set var="DBGRID_SRC" hints="files">
-    src/common/dbgrid.cpp
+<!-- ====================================================================== -->
+<!--                                  wxPropertyGrid                        -->
+<!-- ====================================================================== -->
+
+<set var="PROPGRID_SRC" hints="files">
+    src/propgrid/advprops.cpp
+    src/propgrid/editors.cpp
+    src/propgrid/manager.cpp
+    src/propgrid/property.cpp
+    src/propgrid/propgrid.cpp
+    src/propgrid/propgridiface.cpp
+    src/propgrid/propgridpagestate.cpp
+    src/propgrid/props.cpp
+</set>
+<set var="PROPGRID_HDR" hints="files">
+    wx/propgrid/advprops.h
+    wx/propgrid/editors.h
+    wx/propgrid/manager.h
+    wx/propgrid/property.h
+    wx/propgrid/propgrid.h
+    wx/propgrid/propgriddefs.h
+    wx/propgrid/propgridiface.h
+    wx/propgrid/propgridpagestate.h
+    wx/propgrid/props.h
  </set>
  </set>
-<set var="DBGRID_HDR" hints="files">
-    wx/dbgrid.h
+
+<!-- ====================================================================== -->
+<!--                                  wxRichTextCtrl                        -->
+<!-- ====================================================================== -->
+
+<set var="RICHTEXT_SRC" hints="files">
+    src/richtext/richtextctrl.cpp
+    src/richtext/richtextbuffer.cpp
+    src/richtext/richtextstyles.cpp
+    src/richtext/richtextxml.cpp
+    src/richtext/richtexthtml.cpp
+    src/richtext/richtextformatdlg.cpp
+    src/richtext/richtextsymboldlg.cpp
+    src/richtext/richtextstyledlg.cpp
+    src/richtext/richtextprint.cpp
+</set>
+<set var="RICHTEXT_HDR" hints="files">
+    wx/richtext/richtextctrl.h
+    wx/richtext/richtextbuffer.h
+    wx/richtext/richtexthtml.h
+    wx/richtext/richtextstyles.h
+    wx/richtext/richtextxml.h
+    wx/richtext/richtextformatdlg.h
+    wx/richtext/richtextsymboldlg.h
+    wx/richtext/richtextstyledlg.h
+    wx/richtext/richtextprint.h
  </set>
  
  
  <!-- ====================================================================== -->
  </set>
  
  
  <!-- ====================================================================== -->
-<!--                             Misc plugin sources:                       -->
+<!--                                wxSTC                                   -->
  <!-- ====================================================================== -->
  
  <!-- ====================================================================== -->
  
-<set var="UNIX_SOUND_SRC_SDL" hints="files">
-    src/unix/sound_sdl.cpp
+<set var="STC_SRC" hints="files">
+    src/stc/stc.cpp
+    src/stc/PlatWX.cpp
+    src/stc/ScintillaWX.cpp
+</set>
+
+<set var="STC_HDR" hints="files">
+    wx/stc/stc.h
  </set>
  
  <!-- ====================================================================== -->
  </set>
  
  <!-- ====================================================================== -->
@@ -2721,57 +3541,61 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  
      <!-- Nested if would be nicer, but this works -->
      <!-- These are the files for PLATFORM_MACOSX -->
  
      <!-- Nested if would be nicer, but this works -->
      <!-- These are the files for PLATFORM_MACOSX -->
-    <set var="BASE_MACOSX_SRC" hints="files">
-        <if cond="TOOLKIT=='MAC'">$(BASE_MACOSX_WXMAC_SRC)</if>
-        <if cond="TOOLKIT=='COCOA'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
-        <if cond="TOOLKIT=='GTK'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
-        <if cond="TOOLKIT=='X11'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
-        <if cond="TOOLKIT=='MOTIF'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
+    <set var="BASE_OSX_SRC" hints="files">
+        <if cond="TOOLKIT=='OSX_CARBON'">$(BASE_OSX_SHARED_SRC)</if>
+        <if cond="TOOLKIT=='OSX_COCOA'">$(BASE_OSX_SHARED_SRC)</if>
+        <if cond="TOOLKIT=='COCOA'">$(BASE_OSX_NOTWXMAC_SRC)</if>
+        <if cond="TOOLKIT=='GTK'">$(BASE_OSX_NOTWXMAC_SRC)</if>
+        <if cond="TOOLKIT=='X11'">$(BASE_OSX_NOTWXMAC_SRC)</if>
+        <if cond="TOOLKIT=='MOTIF'">$(BASE_OSX_NOTWXMAC_SRC)</if>
          <!-- FIXME: TOOLKIT!='MAC' is what we really want -->
  
          <!-- FIXME: a hack because there are two wxBase versions on
                      Mac; once fixed, this would no longer be needed -->
          <!-- FIXME: TOOLKIT!='MAC' is what we really want -->
  
          <!-- FIXME: a hack because there are two wxBase versions on
                      Mac; once fixed, this would no longer be needed -->
-        <if cond="TOOLKIT==''">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
+        <if cond="TOOLKIT==''">$(BASE_OSX_NOTWXMAC_SRC)</if>
      </set>
      <set var="BASE_PLATFORM_SRC" hints="files">
          <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if>
          <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC) $(BASE_WINCE_SRC)</if>
      </set>
      <set var="BASE_PLATFORM_SRC" hints="files">
          <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if>
          <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC) $(BASE_WINCE_SRC)</if>
-        <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_SRC)</if>
-        <if cond="PLATFORM_MACOS=='1'">$(BASE_MAC_SRC) $(BASE_MAC_CARBONLIB_SRC)</if>
+        <if cond="PLATFORM_MACOSX=='1'">$(BASE_OSX_SHARED_SRC)</if>
          <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_SRC)</if>
          <if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_SRC)</if>
          <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_SRC)</if>
          <if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_SRC)</if>
+        <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_SRC)</if>
      </set>
      <set var="BASE_AND_GUI_TOOLKIT_SRC" hints="files">
      </set>
      <set var="BASE_AND_GUI_TOOLKIT_SRC" hints="files">
-        <if cond="TOOLKIT=='MAC'">$(BASE_AND_GUI_MAC_SRC)</if>
+        <if cond="TOOLKIT=='OSX_CARBON'">$(BASE_AND_GUI_OSX_CARBON_SRC)</if>
+        <if cond="TOOLKIT=='OSX_COCOA'">$(BASE_AND_GUI_OSX_COCOA_SRC)</if>
      </set>
      <set var="BASE_AND_GUI_PLATFORM_SRC" hints="files">
      </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>
          <if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
-        <if cond="PLATFORM_MACOSX=='1'">$(BASE_AND_GUI_UNIX_SRC)</if>
          <if cond="PLATFORM_PALMOS=='1'">$(BASE_AND_GUI_PALMOS_SRC)</if>
          <if cond="PLATFORM_PALMOS=='1'">$(BASE_AND_GUI_PALMOS_SRC)</if>
+        <if cond="PLATFORM_MSDOS=='1'">$(BASE_AND_GUI_MSDOS_SRC)</if>
          <!-- At the moment, BASE_AND_GUI_TOOLKIT_SRC handles this -->
          <!-- if cond="PLATFORM_MACOS=='1'">$(BASE_AND_GUI_MAC_SRC)</if -->
      </set>
  
      <!-- Nested if would be nicer, but this works -->
      <!-- These are the files for PLATFORM_MACOSX -->
          <!-- At the moment, BASE_AND_GUI_TOOLKIT_SRC handles this -->
          <!-- if cond="PLATFORM_MACOS=='1'">$(BASE_AND_GUI_MAC_SRC)</if -->
      </set>
  
      <!-- Nested if would be nicer, but this works -->
      <!-- These are the files for PLATFORM_MACOSX -->
-    <set var="BASE_MACOSX_HDR" hints="files">
-        <if cond="TOOLKIT=='MAC'">$(BASE_MACOSX_WXMAC_HDR)</if>
-        <if cond="TOOLKIT=='COCOA'">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
-        <if cond="TOOLKIT=='GTK'">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
-        <if cond="TOOLKIT=='X11'">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
-        <if cond="TOOLKIT=='MOTIF'">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
+    <set var="BASE_OSX_HDR" hints="files">
+        <if cond="TOOLKIT=='OSX_CARBON'">$(BASE_OSX_SHARED_HDR)</if>
+        <if cond="TOOLKIT=='OSX_COCOA'">$(BASE_OSX_SHARED_HDR)</if>
+        <if cond="TOOLKIT=='COCOA'">$(BASE_OSX_NOTWXMAC_HDR)</if>
+        <if cond="TOOLKIT=='GTK'">$(BASE_OSX_NOTWXMAC_HDR)</if>
+        <if cond="TOOLKIT=='X11'">$(BASE_OSX_NOTWXMAC_HDR)</if>
+        <if cond="TOOLKIT=='MOTIF'">$(BASE_OSX_NOTWXMAC_HDR)</if>
          <!-- FIXME: TOOLKIT!='MAC' is what we really want -->
  
          <!-- FIXME: a hack because there are two wxBase versions on
                      Mac; once fixed, this would no longer be needed -->
          <!-- FIXME: TOOLKIT!='MAC' is what we really want -->
  
          <!-- FIXME: a hack because there are two wxBase versions on
                      Mac; once fixed, this would no longer be needed -->
-        <if cond="TOOLKIT==''">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
+        <if cond="TOOLKIT==''">$(BASE_OSX_NOTWXMAC_HDR)</if>
      </set>
      <set var="BASE_PLATFORM_HDR" hints="files">
          <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>
          <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)</if>
      </set>
      <set var="BASE_PLATFORM_HDR" hints="files">
          <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>
          <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)</if>
-        <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_HDR)</if>
+        <if cond="PLATFORM_MACOSX=='1'">$(BASE_OSX_HDR)</if>
          <if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_HDR)</if>
          <if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_HDR)</if>
+        <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_HDR)</if>
+        <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_HDR)</if>
      </set>
  
      <set var="BASE_SRC" hints="files">
      </set>
  
      <set var="BASE_SRC" hints="files">
@@ -2788,7 +3612,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
          <if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_SRC)</if>
          <if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_SRC) $(NET_WINCE_SRC)</if>
          <if cond="PLATFORM_MACOSX=='1'">$(NET_UNIX_SRC)</if>
          <if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_SRC)</if>
          <if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_SRC) $(NET_WINCE_SRC)</if>
          <if cond="PLATFORM_MACOSX=='1'">$(NET_UNIX_SRC)</if>
-        <if cond="PLATFORM_MACOS=='1'">$(NET_MAC_CARBONLIB_SRC)</if>
          <if cond="PLATFORM_OS2=='1'">$(NET_OS2_SRC)</if>
      </set>
      <set var="NET_PLATFORM_HDR" hints="files">
          <if cond="PLATFORM_OS2=='1'">$(NET_OS2_SRC)</if>
      </set>
      <set var="NET_PLATFORM_HDR" hints="files">
@@ -2796,7 +3619,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
          <if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_HDR) $(NET_WINCE_HDR)</if>
          <if cond="PLATFORM_OS2=='1'">$(NET_OS2_HDR)</if>
          <if cond="PLATFORM_MACOSX=='1'">$(NET_UNIX_HDR)</if>
          <if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_HDR) $(NET_WINCE_HDR)</if>
          <if cond="PLATFORM_OS2=='1'">$(NET_OS2_HDR)</if>
          <if cond="PLATFORM_MACOSX=='1'">$(NET_UNIX_HDR)</if>
-        <if cond="PLATFORM_MACOS=='1'">$(NET_MAC_CARBONLIB_HDR)</if>
      </set>
  
      <set var="NET_SRC" hints="files">
      </set>
  
      <set var="NET_SRC" hints="files">
@@ -2807,53 +3629,68 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      <!-- GUI sources: -->
  
      <set var="LOWLEVEL_SRC" hints="files">
      <!-- GUI sources: -->
  
      <set var="LOWLEVEL_SRC" hints="files">
-        <if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_LOWLEVEL_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_DESKTOP_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_DESKTOP_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_SRC)</if>
-        <if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_SRC)</if>
+        <if cond="TOOLKIT=='OSX_CARBON'">$(OSX_LOWLEVEL_SRC)</if>
+        <if cond="TOOLKIT=='OSX_COCOA'">$(OSX_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_SRC)</if>
+        <if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_SRC)</if>
      </set>
      <set var="LOWLEVEL_HDR" hints="files">
      </set>
      <set var="LOWLEVEL_HDR" hints="files">
-        <if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_HDR)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_LOWLEVEL_HDR)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_HDR)</if>
-        <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR)</if>
+        <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR) $(MSW_DESKTOP_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_HDR)</if>
-        <if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_HDR)</if>
+        <if cond="TOOLKIT=='OSX_CARBON'">$(OSX_LOWLEVEL_HDR)</if>
+        <if cond="TOOLKIT=='OSX_COCOA'">$(OSX_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_HDR)</if>
+        <if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_HDR)</if>
+    </set>
+
+    <set var="PLATFORM_SRC" hints="files">
+        <if cond="PLATFORM_UNIX=='1'">$(UNIX_SRC)</if>
+        <if cond="PLATFORM_MACOSX=='1'">$(UNIX_SRC)</if>
      </set>
  
      <set var="GUI_SRC" hints="files">
      </set>
  
      <set var="GUI_SRC" hints="files">
-        <if cond="TOOLKIT=='GTK'">$(GTK_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_SRC)</if>
          <if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
          <if cond="TOOLKIT=='MSW'">$(MSW_SRC) $(MSW_DESKTOP_SRC)</if>
          <if cond="TOOLKIT=='WINCE'">$(MSW_SRC) $(WINCE_SRC)</if>
          <if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
          <if cond="TOOLKIT=='MSW'">$(MSW_SRC) $(MSW_DESKTOP_SRC)</if>
          <if cond="TOOLKIT=='WINCE'">$(MSW_SRC) $(WINCE_SRC)</if>
-        <if cond="TOOLKIT=='MAC'">$(MAC_SRC) $(MAC_OSX_SRC)</if>
+        <if cond="TOOLKIT=='OSX_CARBON'">$(OSX_CARBON_SRC)</if>
+        <if cond="TOOLKIT=='OSX_COCOA'">$(OSX_COCOA_SRC)</if>
          <if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
          <if cond="TOOLKIT=='PM'">$(OS2_SRC)</if>
      </set>
      <set var="GUI_HDR" hints="files">
          <if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
          <if cond="TOOLKIT=='PM'">$(OS2_SRC)</if>
      </set>
      <set var="GUI_HDR" hints="files">
-        <if cond="TOOLKIT=='GTK'">$(GTK_HDR)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_HDR)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_HDR)</if>
          <if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
          <if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_DESKTOP_HDR)</if>
          <if cond="TOOLKIT=='WINCE'">$(MSW_HDR) $(WINCE_HDR)</if>
          <if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
          <if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_DESKTOP_HDR)</if>
          <if cond="TOOLKIT=='WINCE'">$(MSW_HDR) $(WINCE_HDR)</if>
-        <if cond="TOOLKIT=='MAC'">$(MAC_CMN_HDR) $(MAC_HDR)</if>
+        <if cond="TOOLKIT=='OSX_CARBON'">$(OSX_SHARED_HDR) $(OSX_CARBON_HDR)</if>
+        <if cond="TOOLKIT=='OSX_COCOA'">$(OSX_SHARED_HDR) $(OSX_COCOA_HDR)</if>
          <if cond="TOOLKIT=='COCOA'">$(COCOA_HDR)</if>
          <if cond="TOOLKIT=='PM'">$(OS2_HDR)</if>
      </set>
  
      <set var="CORE_SRC" hints="files">
          <if cond="USE_GUI=='1' and WXUNIV=='0'">
          <if cond="TOOLKIT=='COCOA'">$(COCOA_HDR)</if>
          <if cond="TOOLKIT=='PM'">$(OS2_HDR)</if>
      </set>
  
      <set var="CORE_SRC" hints="files">
          <if cond="USE_GUI=='1' and WXUNIV=='0'">
-            $(LOWLEVEL_SRC) $(GUI_SRC) $(GUI_CMN_SRC)
+            $(LOWLEVEL_SRC) $(PLATFORM_SRC) $(GUI_SRC) $(GUI_CMN_SRC)
          </if>
          <if cond="USE_GUI=='1' and WXUNIV=='1'">
          </if>
          <if cond="USE_GUI=='1' and WXUNIV=='1'">
-            $(LOWLEVEL_SRC) $(UNIV_SRC) $(UNIV_THEMES_SRC) $(GUI_CMN_SRC)
+            $(LOWLEVEL_SRC) $(PLATFORM_SRC) $(UNIV_SRC) $(UNIV_THEMES_SRC) $(GUI_CMN_SRC)
          </if>
      </set>
  
          </if>
      </set>
  
@@ -2861,46 +3698,57 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      <set var="ADVANCED_PLATFORM_SRC" hints="files">
          <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC) $(ADVANCED_MSW_DESKTOP_SRC)</if>
          <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_SRC)</if>
      <set var="ADVANCED_PLATFORM_SRC" hints="files">
          <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC) $(ADVANCED_MSW_DESKTOP_SRC)</if>
          <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_SRC)</if>
-        <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_SRC)</if>
+        <if cond="TOOLKIT=='OSX_CARBON'">$(ADVANCED_OSX_CARBON_SRC)</if>
+        <if cond="TOOLKIT=='OSX_COCOA'">$(ADVANCED_OSX_COCOA_SRC)</if>
          <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_SRC)</if>
          <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_SRC)</if>
-        <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC)</if>
-        <if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>
+        <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC) $(ADVANCED_MOTIF_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK1_SRC)</if>
          <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
          <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
+        <if cond="TOOLKIT=='MGL' and PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_SRC)</if>
          <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
      </set>
      <set var="ADVANCED_PLATFORM_HDR" hints="files">
          <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR) $(ADVANCED_MSW_DESKTOP_HDR)</if>
          <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_HDR)</if>
          <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
      </set>
      <set var="ADVANCED_PLATFORM_HDR" hints="files">
          <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR) $(ADVANCED_MSW_DESKTOP_HDR)</if>
          <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_HDR)</if>
-        <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_HDR)</if>
+        <if cond="TOOLKIT=='OSX_CARBON'">$(ADVANCED_OSX_CARBON_HDR)</if>
+        <if cond="TOOLKIT=='OSX_COCOA'">$(ADVANCED_OSX_COCOA_HDR)</if>
          <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_HDR)</if>
          <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_HDR)</if>
-        <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR)</if>
-        <if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_HDR)</if>
+        <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR) $(ADVANCED_MOTIF_HDR)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK_HDR)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK1_HDR)</if>
          <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
          <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
+        <if cond="TOOLKIT=='MGL' and PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_HDR)</if>
          <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_HDR)</if>
      </set>
  
      <!-- wxAdv files not used by wxUniv -->
      <set var="ADVANCED_PLATFORM_NATIVE_SRC" hints="files">
          <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_HDR)</if>
      </set>
  
      <!-- wxAdv files not used by wxUniv -->
      <set var="ADVANCED_PLATFORM_NATIVE_SRC" hints="files">
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK_NATIVE_SRC)</if>
          <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_SRC)</if>
          <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_SRC)</if>
+        <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_NATIVE_SRC)</if>
      </set>
      <set var="ADVANCED_PLATFORM_NATIVE_HDR" hints="files">
      </set>
      <set var="ADVANCED_PLATFORM_NATIVE_HDR" hints="files">
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK_NATIVE_HDR)</if>
          <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_HDR)</if>
          <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_HDR)</if>
+        <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_NATIVE_HDR)</if>
      </set>
  
      <set var="ADVANCED_SRC" hints="files">
          <if cond="WXUNIV=='0'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC) $(ADVANCED_PLATFORM_NATIVE_SRC)</if>
      </set>
  
      <set var="ADVANCED_SRC" hints="files">
          <if cond="WXUNIV=='0'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC) $(ADVANCED_PLATFORM_NATIVE_SRC)</if>
-        <if cond="WXUNIV=='1'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC)</if>
+        <if cond="WXUNIV=='1'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC) $(ADVANCED_UNIV_SRC)</if>
      </set>
      <set var="ADVANCED_HDR" hints="files">
      </set>
      <set var="ADVANCED_HDR" hints="files">
-        <if cond="WXUNIV=='0'">$(ADVANCED_CMN_HDR) $(ADVANCED_CMN_NATIVE_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_PLATFORM_NATIVE_HDR)</if>
-        <if cond="WXUNIV=='1'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR)</if>
+        <if cond="WXUNIV=='0'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_PLATFORM_NATIVE_HDR)</if>
+        <if cond="WXUNIV=='1'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_UNIV_HDR)</if>
      </set>
  
      <!-- wxMedia files: -->
      <set var="MEDIA_PLATFORM_SRC" hints="files">
          <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_SRC) $(MEDIA_MSW_DESKTOP_SRC)</if>
          <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_SRC)</if>
      </set>
  
      <!-- wxMedia files: -->
      <set var="MEDIA_PLATFORM_SRC" hints="files">
          <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_SRC) $(MEDIA_MSW_DESKTOP_SRC)</if>
          <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_SRC)</if>
-        <if cond="TOOLKIT=='MAC'">$(MEDIA_MAC_SRC)</if>
+        <if cond="TOOLKIT=='OSX_CARBON'">$(MEDIA_OSX_CARBON_SRC)</if>
+        <if cond="TOOLKIT=='OSX_COCOA'">$(MEDIA_OSX_COCOA_SRC)</if>
          <if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_SRC)</if>
          <if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_SRC)</if>
          <if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_SRC) $(MEDIA_GTK_SRC)</if>
          <if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_SRC)</if>
          <if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_SRC)</if>
          <if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_SRC) $(MEDIA_GTK_SRC)</if>
@@ -2910,7 +3758,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      <set var="MEDIA_PLATFORM_HDR" hints="files">
          <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_HDR) $(MEDIA_MSW_DESKTOP_HDR)</if>
          <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_HDR)</if>
      <set var="MEDIA_PLATFORM_HDR" hints="files">
          <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_HDR) $(MEDIA_MSW_DESKTOP_HDR)</if>
          <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_HDR)</if>
-        <if cond="TOOLKIT=='MAC'">$(MEDIA_MAC_HDR)</if>
+        <if cond="TOOLKIT=='OSX_CARBON'">$(MEDIA_OSX_CARBON_HDR)</if>
          <if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_HDR)</if>
          <if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_HDR)</if>
          <if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_HDR)</if>
          <if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_HDR)</if>
          <if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_HDR)</if>
          <if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_HDR)</if>
@@ -2932,32 +3780,52 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
              $(LOWLEVEL_HDR)
              $(GUI_CORE_HEADERS)
              $(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
              $(LOWLEVEL_HDR)
              $(GUI_CORE_HEADERS)
              $(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
-            $(OPENGL_HDR) $(QA_HDR) $(DBGRID_HDR) $(XRC_HDR)
+            $(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(PROPGRID_HDR)
+            $(RICHTEXT_HDR) $(STC_HDR)
          </if>
      </set>
  
          </if>
      </set>
  
-
+    <!-- for 'make install', only the headers needed for the installed port -->
      <set var="ALL_BASE_HEADERS" make_var="1" hints="files">
          $(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
          $(NET_CMN_HDR) $(NET_PLATFORM_HDR)
      <set var="ALL_BASE_HEADERS" make_var="1" hints="files">
          $(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
          $(NET_CMN_HDR) $(NET_PLATFORM_HDR)
-        $(XML_HDR) $(ODBC_HDR)
+        $(XML_HDR)
      </set>
      </set>
-
      <set var="ALL_HEADERS" make_var="1" hints="files">
          $(ALL_BASE_HEADERS) $(ALL_GUI_HEADERS)
      </set>
  
      <set var="ALL_HEADERS" make_var="1" hints="files">
          $(ALL_BASE_HEADERS) $(ALL_GUI_HEADERS)
      </set>
  
+
+    <!-- used by 'make dist', should include wxBase headers for all ports -->
+    <set var="ALL_PORTS_BASE_HEADERS" make_var="1" hints="files">
+        $(BASE_CMN_HDR)
+        $(BASE_UNIX_HDR)
+        $(BASE_WIN32_HDR) $(BASE_WINCE_HDR)
+        $(BASE_OSX_HDR)
+        $(BASE_PALMOS_HDR)
+        $(BASE_MSDOS_HDR)
+        $(NET_CMN_HDR)
+        $(NET_UNIX_HDR)
+        $(NET_WIN32_HDR) $(NET_WINCE_HDR)
+        $(NET_OS2_HDR)
+        $(NET_UNIX_HDR)
+        $(XML_HDR)
+    </set>
+
+    <!-- used by 'make dist', should include wxBase sources for all ports -->
      <set var="ALL_BASE_SOURCES" make_var="1" hints="files">
          $(BASE_CMN_SRC)
          $(BASE_UNIX_SRC) $(BASE_WIN32_SRC) $(BASE_WINCE_SRC)
      <set var="ALL_BASE_SOURCES" make_var="1" hints="files">
          $(BASE_CMN_SRC)
          $(BASE_UNIX_SRC) $(BASE_WIN32_SRC) $(BASE_WINCE_SRC)
-        $(BASE_MAC_SRC)
+        $(BASE_OSX_SRC)
          $(BASE_OS2_SRC)
          $(BASE_OS2_SRC)
+        $(BASE_MSDOS_SRC)
+        $(BASE_PALMOS_SRC)
          $(BASE_AND_GUI_CMN_SRC)
          $(BASE_AND_GUI_CMN_SRC)
-        $(BASE_AND_GUI_UNIX_SRC)
-        $(BASE_AND_GUI_MAC_SRC)
+        $(BASE_AND_GUI_OSX_CARBON_SRC)
+        $(BASE_AND_GUI_OSX_COCOA_SRC)
          $(BASE_AND_GUI_WIN32_SRC)
          $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_WINCE_SRC)
          $(BASE_AND_GUI_WIN32_SRC)
          $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_WINCE_SRC)
-        $(XML_SRC) $(ODBC_SRC)
+        $(XML_SRC)
      </set>
  
  
      </set>