No changes, just fix unused variables and parameters warnings.

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

index 70dce6cdf98c564c87529d481c2b66eb31c695bb..e43ccb2fa52ca585ac87e7a904db2ccd45044567 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -53,28 +53,64 @@ 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/appunix.cpp
      src/unix/dir.cpp
      src/unix/dlunix.cpp
      src/unix/dir.cpp
      src/unix/dlunix.cpp
-    src/unix/mimetype.cpp
+    src/unix/epolldispatcher.cpp
+    src/unix/evtloopunix.cpp
+    src/unix/fdiounix.cpp
      src/unix/snglinst.cpp
      src/unix/stackwalk.cpp
      src/unix/stdpaths.cpp
      src/unix/snglinst.cpp
      src/unix/stackwalk.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/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/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/private.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
+</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)
+</set>
+<set var="BASE_UNIX_HDR" hints="files">
+    $(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR)
  </set>
  
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
  </set>
  
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
@@ -95,10 +131,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/msw/stackwalk.cpp
      src/msw/stdpaths.cpp
      src/msw/thread.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
@@ -139,83 +177,50 @@ 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/stdpaths_cf.cpp
-    src/mac/corefoundation/utilsexc_base.cpp
+    src/osx/core/cfstring.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/snglinst.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/apptbase.h
-    wx/unix/apptrait.h
-    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>
  
@@ -224,8 +229,14 @@ 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/unix/appunix.cpp
+    src/unix/evtloopunix.cpp
+    src/unix/timerunx.cpp
      src/os2/dir.cpp
      src/os2/mimetype.cpp
      src/os2/dir.cpp
      src/os2/mimetype.cpp
+    src/os2/snglinst.cpp
      src/os2/stdpaths.cpp
      src/os2/thread.cpp
      src/os2/utils.cpp
      src/os2/stdpaths.cpp
      src/os2/thread.cpp
      src/os2/utils.cpp
@@ -234,8 +245,10 @@ 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/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/private.h
      wx/os2/stdpaths.h
      wx/os2/mimetype.h
      wx/os2/private.h
      wx/os2/stdpaths.h
@@ -252,6 +265,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
@@ -267,6 +281,7 @@ 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>
  
@@ -293,17 +308,21 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/common/arcall.cpp
      src/common/arcfind.cpp
      src/common/archive.cpp
      src/common/arcall.cpp
      src/common/arcfind.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/convauto.cpp
      src/common/datetime.cpp
      src/common/clntdata.cpp
      src/common/cmdline.cpp
      src/common/config.cpp
      src/common/convauto.cpp
      src/common/datetime.cpp
+    src/common/datetimefmt.cpp
      src/common/datstrm.cpp
      src/common/dircmn.cpp
      src/common/dynarray.cpp
      src/common/dynlib.cpp
      src/common/dynload.cpp
      src/common/encconv.cpp
      src/common/datstrm.cpp
      src/common/dircmn.cpp
      src/common/dynarray.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
@@ -336,20 +355,30 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/common/regex.cpp
      src/common/stdpbase.cpp
      src/common/sstream.cpp
      src/common/regex.cpp
      src/common/stdpbase.cpp
      src/common/sstream.cpp
+    src/common/stdstream.cpp
      src/common/stopwatch.cpp
      src/common/strconv.cpp
      src/common/stream.cpp
      src/common/string.cpp
      src/common/stopwatch.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/tarstrm.cpp
      src/common/textbuf.cpp
      src/common/textfile.cpp
      src/common/sysopt.cpp
      src/common/tarstrm.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
@@ -363,22 +392,29 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  </set>
  <set var="BASE_CMN_HDR" hints="files">
      wx/afterstd.h
  </set>
  <set var="BASE_CMN_HDR" hints="files">
      wx/afterstd.h
+    wx/anystr.h
      wx/app.h
      wx/apptrait.h
      wx/archive.h
      wx/arrimpl.cpp
      wx/arrstr.h
      wx/app.h
      wx/apptrait.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/checkeddelete.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/convauto.h
      wx/containr.h
      wx/cpp.h
      wx/cmdline.h
      wx/confbase.h
      wx/config.h
      wx/convauto.h
      wx/containr.h
      wx/cpp.h
+    wx/crt.h
      wx/datetime.h
      wx/datstrm.h
      wx/dde.h
      wx/datetime.h
      wx/datstrm.h
      wx/dde.h
@@ -386,6 +422,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/defs.h
      wx/dir.h
      wx/dlimpexp.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
@@ -393,6 +430,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
@@ -416,8 +454,7 @@ 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/link.h
      wx/list.h
      wx/listimpl.cpp
@@ -429,6 +466,7 @@ 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/mousestate.h
      wx/msgout.h
      wx/mstream.h
      wx/object.h
      wx/msgout.h
      wx/mstream.h
      wx/object.h
@@ -437,19 +475,27 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/power.h
      wx/process.h
      wx/ptr_scpd.h
      wx/power.h
      wx/process.h
      wx/ptr_scpd.h
+    wx/ptr_shrd.h
      wx/recguard.h
      wx/regex.h
      wx/recguard.h
      wx/regex.h
+    wx/scopedarray.h
+    wx/scopedptr.h
      wx/scopeguard.h
      wx/scopeguard.h
+    wx/sharedptr.h
      wx/snglinst.h
      wx/sstream.h
      wx/stack.h
      wx/stackwalk.h
      wx/stdpaths.h
      wx/snglinst.h
      wx/sstream.h
      wx/stack.h
      wx/stackwalk.h
      wx/stdpaths.h
+    wx/stdstream.h
      wx/stockitem.h
      wx/stopwatch.h
      wx/strconv.h
      wx/stream.h
      wx/string.h
      wx/stockitem.h
      wx/stopwatch.h
      wx/strconv.h
      wx/stream.h
      wx/string.h
+    wx/stringimpl.h
+    wx/stringops.h
+    wx/strvararg.h
      wx/sysopt.h
      wx/tarstrm.h
      wx/textbuf.h
      wx/sysopt.h
      wx/tarstrm.h
      wx/textbuf.h
@@ -457,23 +503,36 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/thread.h
      wx/thrimpl.cpp
      wx/timer.h
      wx/thread.h
      wx/thrimpl.cpp
      wx/timer.h
+    wx/tls.h
      wx/tokenzr.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>
  
  
@@ -482,18 +541,20 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <!-- ====================================================================== -->
  
  <set var="NET_UNIX_SRC" hints="files">
  <!-- ====================================================================== -->
  
  <set var="NET_UNIX_SRC" hints="files">
-    src/unix/gsocket.cpp
+    src/common/socketiohandler.cpp
+    src/unix/sockunix.cpp
  </set>
  </set>
-<set var="NET_UNIX_HDR" hints="files">
-    wx/unix/gsockunx.h
+
+<set var="NET_OSX_SRC" hints="files">
+    src/osx/core/sockosx.cpp
  </set>
  
  <set var="NET_WIN32_SRC" hints="files">
  </set>
  
  <set var="NET_WIN32_SRC" hints="files">
-    src/msw/gsocket.cpp
+    src/msw/sockmsw.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">
-    wx/msw/gsockmsw.h
+    wx/msw/private/sockmsw.h
  </set>
  
  <set var="NET_WINCE_SRC" hints="files">
  </set>
  
  <set var="NET_WINCE_SRC" hints="files">
@@ -504,17 +565,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  </set>
  
  <set var="NET_OS2_SRC" hints="files">
  </set>
  
  <set var="NET_OS2_SRC" hints="files">
-    src/unix/gsocket.cpp
-</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
+    src/unix/sockunix.cpp
  </set>
  
  <set var="NET_CMN_SRC" hints="files">
  </set>
  
  <set var="NET_CMN_SRC" hints="files">
@@ -531,10 +582,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  </set>
  <set var="NET_CMN_HDR" hints="files">
      wx/fs_inet.h
  </set>
  <set var="NET_CMN_HDR" hints="files">
      wx/fs_inet.h
-    wx/gsocket.h
      wx/protocol/file.h
      wx/protocol/ftp.h
      wx/protocol/http.h
      wx/protocol/file.h
      wx/protocol/ftp.h
      wx/protocol/http.h
+    wx/protocol/log.h
      wx/protocol/protocol.h
      wx/sckaddr.h
      wx/sckipc.h
      wx/protocol/protocol.h
      wx/sckaddr.h
      wx/sckipc.h
@@ -561,6 +612,7 @@ 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/anidecod.cpp
      src/common/appcmn.cpp
      src/common/accesscmn.cpp
      src/common/anidecod.cpp
      src/common/appcmn.cpp
@@ -568,6 +620,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/common/artstd.cpp
      src/common/bmpbase.cpp
      src/common/bookctrl.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/clrpickercmn.cpp
      src/common/choiccmn.cpp
      src/common/clipcmn.cpp
      src/common/clrpickercmn.cpp
@@ -583,6 +637,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/common/dcbase.cpp
      src/common/dcbufcmn.cpp
      src/common/dcgraph.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
@@ -591,14 +646,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/common/dpycmn.cpp
      src/common/dseldlg.cpp
      src/common/effects.cpp
      src/common/dpycmn.cpp
      src/common/dseldlg.cpp
      src/common/effects.cpp
-    src/common/evtloopcmn.cpp
      src/common/fddlgcmn.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/fontenumcmn.cpp
      src/common/fontmap.cpp
      src/common/filepickercmn.cpp
      src/common/fontpickercmn.cpp
      src/common/fldlgcmn.cpp
      src/common/fontcmn.cpp
      src/common/fontenumcmn.cpp
      src/common/fontmap.cpp
+    src/common/fontutilcmn.cpp
      src/common/framecmn.cpp
      src/common/gaugecmn.cpp
      src/common/gbsizer.cpp
      src/common/framecmn.cpp
      src/common/gaugecmn.cpp
      src/common/gbsizer.cpp
@@ -606,6 +662,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/common/geometry.cpp
      src/common/gifdecod.cpp
      src/common/graphcmn.cpp
      src/common/geometry.cpp
      src/common/gifdecod.cpp
      src/common/graphcmn.cpp
+    src/common/headercolcmn.cpp
+    src/common/headerctrlcmn.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
@@ -626,42 +684,48 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/common/listctrlcmn.cpp
      src/common/matrix.cpp
      src/common/menucmn.cpp
      src/common/listctrlcmn.cpp
      src/common/matrix.cpp
      src/common/menucmn.cpp
+    src/common/mousemanager.cpp
      src/common/nbkbase.cpp
      src/common/overlaycmn.cpp
      src/common/paper.cpp
      src/common/nbkbase.cpp
      src/common/overlaycmn.cpp
      src/common/paper.cpp
+    src/common/persist.cpp
      src/common/pickerbase.cpp
      src/common/popupcmn.cpp
      src/common/prntbase.cpp
      src/common/quantize.cpp
      src/common/radiocmn.cpp
      src/common/pickerbase.cpp
      src/common/popupcmn.cpp
      src/common/prntbase.cpp
      src/common/quantize.cpp
      src/common/radiocmn.cpp
+    src/common/rearrangectrl.cpp
      src/common/rendcmn.cpp
      src/common/rgncmn.cpp
      src/common/settcmn.cpp
      src/common/sizer.cpp
      src/common/rendcmn.cpp
      src/common/rgncmn.cpp
      src/common/settcmn.cpp
      src/common/sizer.cpp
+    src/common/spinctrlcmn.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/generic/buttonbar.cpp
      src/generic/choicdgg.cpp
      src/generic/choicbkg.cpp
      src/common/xpmdecod.cpp
      src/generic/busyinfo.cpp
      src/generic/buttonbar.cpp
      src/generic/choicdgg.cpp
      src/generic/choicbkg.cpp
-    src/generic/clrpickerg.cpp
-    src/generic/collpaneg.cpp
      src/generic/combog.cpp
      src/generic/dcpsg.cpp
      src/generic/dirctrlg.cpp
      src/generic/dragimgg.cpp
      src/generic/combog.cpp
      src/generic/dcpsg.cpp
      src/generic/dirctrlg.cpp
      src/generic/dragimgg.cpp
-    src/generic/filepickerg.cpp
-    src/generic/fontpickerg.cpp
+    src/generic/filectrlg.cpp
+    src/generic/headerctrlg.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
@@ -673,6 +737,9 @@ 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/stattextg.cpp
      src/generic/textdlgg.cpp
      src/generic/tipwin.cpp
      src/generic/toolbkg.cpp
      src/generic/textdlgg.cpp
      src/generic/tipwin.cpp
      src/generic/toolbkg.cpp
@@ -685,6 +752,7 @@ 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/checkbox.h
      wx/checklst.h
      wx/choicdlg.h
@@ -702,6 +770,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      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
@@ -714,17 +783,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/generic/accel.h
      wx/generic/buttonbar.h
      wx/generic/choicdgg.h
      wx/generic/accel.h
      wx/generic/buttonbar.h
      wx/generic/choicdgg.h
-    wx/generic/clrpickerg.h
-    wx/generic/collpaneg.h
      wx/generic/colrdlgg.h
      wx/generic/combo.h
      wx/generic/dcpsg.h
      wx/generic/dirctrlg.h
      wx/generic/dragimgg.h
      wx/generic/colrdlgg.h
      wx/generic/combo.h
      wx/generic/dcpsg.h
      wx/generic/dirctrlg.h
      wx/generic/dragimgg.h
-    wx/generic/filedlgg.h
-    wx/generic/filepickerg.h
-    wx/generic/fontdlgg.h
-    wx/generic/fontpickerg.h
+    wx/generic/filectrlg.h
+    wx/generic/headerctrlg.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
@@ -736,24 +801,32 @@ 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/stattextg.h
      wx/generic/textdlgg.h
      wx/generic/textdlgg.h
-    wx/generic/timer.h
      wx/generic/treectlg.h
      wx/graphics.h
      wx/generic/treectlg.h
      wx/graphics.h
+    wx/headercol.h
+    wx/headerctrl.h
      wx/helphtml.h
      wx/icon.h
      wx/layout.h
      wx/listbox.h
      wx/mdi.h
      wx/menu.h
      wx/helphtml.h
      wx/icon.h
      wx/layout.h
      wx/listbox.h
      wx/mdi.h
      wx/menu.h
+    wx/mousemanager.h
      wx/msgdlg.h
      wx/msgdlg.h
+    wx/nativewin.h
      wx/numdlg.h
      wx/overlay.h
      wx/palette.h
      wx/panel.h
      wx/pen.h
      wx/numdlg.h
      wx/overlay.h
      wx/palette.h
      wx/panel.h
      wx/pen.h
+    wx/position.h
      wx/radiobox.h
      wx/radiobut.h
      wx/radiobox.h
      wx/radiobut.h
+    wx/rearrangectrl.h
      wx/renderer.h
      wx/scrolbar.h
      wx/scrolbar.h
      wx/renderer.h
      wx/scrolbar.h
      wx/scrolbar.h
@@ -768,15 +841,20 @@ 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/textwrapper.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/anidecod.h
      wx/wupdlock.h
  
      wx/accel.h
      wx/access.h
      wx/anidecod.h
+    wx/animdecod.h
      wx/artprov.h
      wx/bitmap.h
      wx/bookctrl.h
      wx/artprov.h
      wx/bitmap.h
      wx/bookctrl.h
@@ -803,6 +881,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/effects.h
      wx/evtloop.h
      wx/fdrepdlg.h
      wx/effects.h
      wx/evtloop.h
      wx/fdrepdlg.h
+    wx/filectrl.h
      wx/filepicker.h
      wx/fontpicker.h
      wx/fmappriv.h
      wx/filepicker.h
      wx/fontpicker.h
      wx/fmappriv.h
@@ -813,7 +892,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
@@ -837,16 +915,21 @@ 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/persist.h
+    wx/persist/bookctrl.h
+    wx/persist/toplevel.h
+    wx/persist/treebook.h
+    wx/persist/window.h
      wx/pickerbase.h
      wx/popupwin.h
      wx/print.h
      wx/printdlg.h
      wx/prntbase.h
      wx/progdlg.h
      wx/pickerbase.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
@@ -854,9 +937,8 @@ 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/statline.h
-    wx/tab.h
-    wx/tabctrl.h
      wx/tbarbase.h
      wx/tglbtn.h
      wx/tipwin.h
      wx/tbarbase.h
      wx/tglbtn.h
      wx/tipwin.h
@@ -875,6 +957,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:                            -->
@@ -906,12 +995,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/generic/icon.cpp
      src/generic/paletteg.cpp
      src/gtk/app.cpp
      src/generic/icon.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
@@ -919,12 +1008,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/gsockgtk.cpp
-    src/gtk/main.cpp
+    src/gtk/sockgtk.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
@@ -932,7 +1022,7 @@ 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">
      src/gtk/window.cpp
  </set>
  <set var="GTK_LOWLEVEL_HDR" hints="files">
@@ -940,6 +1030,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/generic/icon.h
      wx/generic/paletteg.h
      wx/gtk/app.h
      wx/generic/icon.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
@@ -953,32 +1044,30 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/gtk/dcmemory.h
      wx/gtk/dcscreen.h
      wx/gtk/dnd.h
      wx/gtk/dcmemory.h
      wx/gtk/dcscreen.h
      wx/gtk/dnd.h
+    wx/gtk/evtloop.h
      wx/gtk/font.h
      wx/gtk/minifram.h
      wx/gtk/pen.h
      wx/gtk/popupwin.h
      wx/gtk/font.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
+    <!-- Needed as long as we support GTK+ < 2.6 -->
+    src/generic/filepickerg.cpp
      src/generic/graphicc.cpp
      src/generic/listctrl.cpp
      src/generic/graphicc.cpp
      src/generic/listctrl.cpp
-    src/generic/msgdlgg.cpp
      src/generic/prntdlgg.cpp
      src/generic/statusbr.cpp
      src/generic/prntdlgg.cpp
      src/generic/statusbr.cpp
-    src/generic/tabg.cpp
      <!-- Generic implementations used by wxGPE: -->
      src/generic/fontdlgg.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
@@ -1001,10 +1090,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/gtk/gauge.cpp
      src/gtk/gnome/gprint.cpp
      src/gtk/gnome/gvfs.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
@@ -1019,22 +1111,22 @@ 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/treeentry_gtk.c
      src/gtk/tglbtn.cpp
      src/gtk/treeentry_gtk.c
-    src/gtk/utilsres.cpp
  </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/listctrl.h
      wx/generic/statusbr.h
-    wx/generic/tabg.h
      wx/gtk/accel.h
      wx/gtk/bmpbuttn.h
      wx/gtk/button.h
      wx/gtk/checkbox.h
      wx/gtk/checklst.h
      wx/gtk/accel.h
      wx/gtk/bmpbuttn.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/collpane.h
      wx/gtk/colordlg.h
      wx/gtk/choice.h
@@ -1043,6 +1135,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/gtk/clrpicker.h
      wx/gtk/dialog.h
      wx/gtk/dirdlg.h
      wx/gtk/clrpicker.h
      wx/gtk/dialog.h
      wx/gtk/dirdlg.h
+    wx/gtk/filectrl.h
      wx/gtk/filedlg.h
      wx/gtk/fontpicker.h
      wx/gtk/filepicker.h
      wx/gtk/filedlg.h
      wx/gtk/fontpicker.h
      wx/gtk/filepicker.h
@@ -1051,6 +1144,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/gtk/gauge.h
      wx/gtk/gnome/gprint.h
      wx/gtk/gnome/gvfs.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
@@ -1070,8 +1164,8 @@ 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>
  
      wx/gtk/treeentry_gtk.h
  </set>
  
@@ -1099,7 +1193,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/gtk1/dnd.cpp
      src/gtk1/evtloop.cpp
      src/gtk1/font.cpp
      src/gtk1/dnd.cpp
      src/gtk1/evtloop.cpp
      src/gtk1/font.cpp
-    src/gtk1/gsockgtk.cpp
+    src/gtk1/sockgtk.cpp
      src/gtk1/main.cpp
      src/gtk1/minifram.cpp
      src/gtk1/pen.cpp
      src/gtk1/main.cpp
      src/gtk1/minifram.cpp
      src/gtk1/pen.cpp
@@ -1137,7 +1231,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/gtk1/pen.h
      wx/gtk1/popupwin.h
      wx/gtk1/region.h
      wx/gtk1/pen.h
      wx/gtk1/popupwin.h
      wx/gtk1/region.h
-    wx/gtk1/timer.h
      wx/gtk1/tooltip.h
      wx/gtk1/toplevel.h
      wx/gtk1/win_gtk.h
      wx/gtk1/tooltip.h
      wx/gtk1/toplevel.h
      wx/gtk1/win_gtk.h
@@ -1146,17 +1239,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <set var="GTK1_SRC" hints="files">
      <!-- Generic implementations used by wxGTK1: -->
      src/generic/accel.cpp
  <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/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/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
      <!-- GTK1 specific files: -->
      src/gtk1/bmpbuttn.cpp
      src/gtk1/button.cpp
      <!-- GTK1 specific files: -->
      src/gtk1/bmpbuttn.cpp
      src/gtk1/button.cpp
@@ -1188,15 +1283,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/gtk1/tbargtk.cpp
      src/gtk1/textctrl.cpp
      src/gtk1/tglbtn.cpp
      src/gtk1/tbargtk.cpp
      src/gtk1/textctrl.cpp
      src/gtk1/tglbtn.cpp
-    src/gtk1/utilsres.cpp
  </set>
  <set var="GTK1_HDR" hints="files">
  </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/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/listctrl.h
      wx/generic/statusbr.h
-    wx/generic/tabg.h
      wx/gtk1/accel.h
      wx/gtk1/bmpbuttn.h
      wx/gtk1/button.h
      wx/gtk1/accel.h
      wx/gtk1/bmpbuttn.h
      wx/gtk1/button.h
@@ -1242,6 +1341,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
@@ -1250,6 +1350,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>
@@ -1280,16 +1381,14 @@ 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/gsockmot.cpp
+    src/motif/sockmot.cpp
      src/motif/icon.cpp
      src/motif/listbox.cpp
      src/motif/main.cpp
      src/motif/icon.cpp
      src/motif/listbox.cpp
      src/motif/main.cpp
-    src/motif/mdi.cpp
      src/motif/menu.cpp
      src/motif/menuitem.cpp
      src/motif/minifram.cpp
      src/motif/msgdlg.cpp
      src/motif/menu.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
@@ -1301,6 +1400,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
@@ -1308,11 +1408,16 @@ 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/fontpickerg.cpp
      src/generic/listctrl.cpp
      src/generic/listctrl.cpp
+    src/generic/mdig.cpp
      src/generic/notebook.cpp
      src/generic/prntdlgg.cpp
      src/generic/statline.cpp
      src/generic/notebook.cpp
      src/generic/prntdlgg.cpp
      src/generic/statline.cpp
@@ -1320,11 +1425,17 @@ 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/fontpickerg.h
      wx/generic/listctrl.h
      wx/generic/listctrl.h
+    wx/generic/mdig.h
      wx/generic/notebook.h
      wx/generic/prntdlgg.h
      wx/generic/statline.h
      wx/generic/notebook.h
      wx/generic/prntdlgg.h
      wx/generic/statline.h
@@ -1343,6 +1454,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/motif/colour.h
      wx/motif/combobox.h
      wx/motif/control.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
@@ -1360,12 +1472,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/motif/gauge.h
      wx/motif/icon.h
      wx/motif/listbox.h
      wx/motif/gauge.h
      wx/motif/icon.h
      wx/motif/listbox.h
-    wx/motif/mdi.h
      wx/motif/menu.h
      wx/motif/menuitem.h
      wx/motif/minifram.h
      wx/motif/msgdlg.h
      wx/motif/menu.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
@@ -1378,8 +1488,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
@@ -1409,7 +1519,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/gsockx11.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
@@ -1464,6 +1573,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <!-- ====================================================================== -->
  
  <set var="MSW_LOWLEVEL_SRC" hints="files">
  <!-- ====================================================================== -->
  
  <set var="MSW_LOWLEVEL_SRC" hints="files">
+    src/msw/ole/activex.cpp
      src/msw/app.cpp
      src/msw/bitmap.cpp
      src/msw/brush.cpp
      src/msw/app.cpp
      src/msw/bitmap.cpp
      src/msw/brush.cpp
@@ -1481,14 +1591,13 @@ 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/gdiplus.cpp
      src/msw/graphics.cpp
      src/msw/graphics.cpp
-    src/msw/gsockmsw.cpp
      src/msw/icon.cpp
      src/msw/imaglist.cpp
      src/msw/minifram.cpp
      src/msw/icon.cpp
      src/msw/imaglist.cpp
      src/msw/minifram.cpp
@@ -1504,7 +1613,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
@@ -1512,6 +1620,7 @@ 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/ole/activex.h
      wx/msw/popupwin.h
      wx/msw/uxtheme.h
      wx/msw/uxthemep.h
      wx/msw/popupwin.h
      wx/msw/uxtheme.h
      wx/msw/uxthemep.h
@@ -1531,9 +1640,14 @@ 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/generic/statusbr.cpp
      src/generic/prntdlgg.cpp
      src/msw/accel.cpp
+    src/msw/artmsw.cpp
      src/msw/bmpbuttn.cpp
      src/msw/button.cpp
      src/msw/checkbox.cpp
      src/msw/bmpbuttn.cpp
      src/msw/button.cpp
      src/msw/checkbox.cpp
@@ -1547,7 +1661,8 @@ 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/gauge.cpp
+    src/msw/headerctrl.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
@@ -1557,30 +1672,32 @@ 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/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">
      wx/generic/clrpickerg.h
      src/msw/tglbtn.cpp
      src/msw/treectrl.cpp
  </set>
  <set var="MSW_HDR" hints="files">
      wx/generic/clrpickerg.h
-    wx/generic/fontpickerg.h
+    wx/generic/collpaneg.h
      wx/generic/filepickerg.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
@@ -1596,6 +1713,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/msw/combo.h
      wx/msw/combobox.h
      wx/msw/control.h
      wx/msw/combo.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
@@ -1611,8 +1729,9 @@ 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/headerctrl.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
@@ -1644,19 +1763,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/msw/rcdefs.h
      wx/msw/scrolbar.h
      wx/msw/setup0.h
      wx/msw/rcdefs.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/statline.h
      wx/msw/stattext.h
-    wx/msw/tabctrl.h
-    wx/msw/tbar95.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/tooltip.h
      wx/msw/toplevel.h
      wx/msw/treectrl.h
@@ -1747,6 +1865,7 @@ 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/colour.cpp
      src/generic/icon.cpp
      src/generic/caret.cpp
      src/generic/colour.cpp
      src/generic/icon.cpp
@@ -1767,6 +1886,7 @@ 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/palette.cpp
      src/mgl/pen.cpp
      src/mgl/fontutil.cpp
      src/mgl/palette.cpp
      src/mgl/pen.cpp
@@ -1782,7 +1902,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/generic/icon.h
      wx/generic/imaglist.h
      wx/generic/mask.h
      wx/generic/icon.h
      wx/generic/imaglist.h
      wx/generic/mask.h
-    wx/generic/timer.h
      wx/mgl/app.h
      wx/mgl/bitmap.h
      wx/mgl/brush.h
      wx/mgl/app.h
      wx/mgl/bitmap.h
      wx/mgl/brush.h
@@ -1794,7 +1913,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/mgl/dcmemory.h
      wx/mgl/dcscreen.h
      wx/mgl/font.h
      wx/mgl/dcmemory.h
      wx/mgl/dcscreen.h
      wx/mgl/font.h
-    wx/mgl/fontutil.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
@@ -1810,12 +1928,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <!-- ====================================================================== -->
  
  <set var="DFB_LOWLEVEL_SRC" hints="files">
  <!-- ====================================================================== -->
  
  <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/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/app.cpp
      src/dfb/bitmap.cpp
      src/dfb/brush.cpp
@@ -1828,6 +1946,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/dfb/evtloop.cpp
      src/dfb/font.cpp
      src/dfb/fontenum.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/overlay.cpp
      src/dfb/pen.cpp
      src/dfb/region.cpp
@@ -1843,7 +1963,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/generic/icon.h
      wx/generic/imaglist.h
      wx/generic/mask.h
      wx/generic/icon.h
      wx/generic/imaglist.h
      wx/generic/mask.h
-    wx/generic/timer.h
      wx/dfb/app.h
      wx/dfb/bitmap.h
      wx/dfb/brush.h
      wx/dfb/app.h
      wx/dfb/bitmap.h
      wx/dfb/brush.h
@@ -1856,7 +1975,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/dfb/dfbptr.h
      wx/dfb/evtloop.h
      wx/dfb/font.h
      wx/dfb/dfbptr.h
      wx/dfb/evtloop.h
      wx/dfb/font.h
+    wx/dfb/nonownedwnd.h
      wx/dfb/pen.h
      wx/dfb/pen.h
+    wx/dfb/popupwin.h
      wx/dfb/private.h
      wx/dfb/region.h
      wx/dfb/toplevel.h
      wx/dfb/private.h
      wx/dfb/region.h
      wx/dfb/toplevel.h
@@ -1877,9 +1998,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <set var="OS2_SRC" hints="files">
      <!-- Generic implementations used by wxOS2: -->
      src/generic/caret.cpp
  <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
@@ -1918,7 +2043,7 @@ 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/gsockpm.cpp
+    src/os2/sockpm.cpp
      src/os2/helpwin.cpp
      src/os2/icon.cpp
      src/os2/iniconf.cpp
      src/os2/helpwin.cpp
      src/os2/icon.cpp
      src/os2/iniconf.cpp
@@ -1927,6 +2052,7 @@ 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/msgdlg.cpp
      src/os2/nativdlg.cpp
      src/os2/notebook.cpp
@@ -1947,8 +2073,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/os2/statbox.cpp
      src/os2/statline.cpp
      src/os2/stattext.cpp
      src/os2/statbox.cpp
      src/os2/statline.cpp
      src/os2/stattext.cpp
-    src/os2/tabctrl.cpp
      src/os2/textctrl.cpp
      src/os2/textctrl.cpp
+    src/os2/textentry.cpp
      src/os2/tglbtn.cpp
      src/os2/timer.cpp
      src/os2/toolbar.cpp
      src/os2/tglbtn.cpp
      src/os2/timer.cpp
      src/os2/toolbar.cpp
@@ -1959,6 +2085,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
@@ -2023,10 +2151,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/os2/statbox.h
      wx/os2/statline.h
      wx/os2/stattext.h
      wx/os2/statbox.h
      wx/os2/statline.h
      wx/os2/stattext.h
-    wx/os2/tabctrl.h
      wx/os2/textctrl.h
      wx/os2/textctrl.h
+    wx/os2/textentry.h
      wx/os2/tglbtn.h
      wx/os2/tglbtn.h
-    wx/os2/timer.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
@@ -2039,298 +2166,328 @@ 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/hid.cpp
-    src/mac/corefoundation/utilsexc_cf.cpp
+    <if cond="PLATFORM_MACOSX=='1'">
+    src/osx/artmac.cpp
+    src/osx/brush.cpp
+    src/osx/dialog_osx.cpp
+    src/osx/fontutil.cpp
+    src/osx/imaglist.cpp
+    src/osx/minifram.cpp
+    src/osx/nonownedwnd_osx.cpp
+    src/osx/palette.cpp
+    src/osx/pen.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'">
+    <!-- Common controls implementation -->
+    src/osx/bmpbuttn_osx.cpp
+    src/osx/button_osx.cpp
+    src/osx/checkbox_osx.cpp
+    src/osx/checklst_osx.cpp
+    src/osx/choice_osx.cpp
+    src/osx/gauge_osx.cpp
+    src/osx/listbox_osx.cpp
+    src/osx/menu_osx.cpp
+    src/osx/menuitem_osx.cpp
+    src/osx/notebook_osx.cpp
+    src/osx/printdlg_osx.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/textctrl_osx.cpp
+    src/osx/tglbtn_osx.cpp
+    src/osx/toolbar_osx.cpp
      <!-- wxWebKit files -->
      src/html/htmlctrl/webkit/webkit.mm
      <!-- Native color/font dialogs -->
      <!-- wxWebKit files -->
      src/html/htmlctrl/webkit/webkit.mm
      <!-- Native color/font dialogs -->
-    src/mac/carbon/fontdlgosx.mm
-    src/mac/carbon/colordlgosx.mm
-</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/evtloop.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/graphics.cpp
-    src/mac/carbon/icon.cpp
-    src/mac/carbon/imaglist.cpp
-    src/mac/carbon/listbox.cpp
-    src/mac/carbon/listctrl_mac.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/overlay.cpp
-    src/mac/carbon/palette.cpp
-    src/mac/carbon/pen.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
-    <!-- Generic implementations used by wxMac: -->
+    src/osx/carbon/colordlgosx.mm
+    src/osx/carbon/fontdlgosx.mm
+    <!-- other shared files -->
+    src/osx/accel.cpp
+    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/core/glgrab.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/renderer.cpp
+    src/osx/carbon/settings.cpp
+    src/osx/carbon/statbrma.cpp
+    src/osx/carbon/region.cpp
+    <!-- cocoa bridge -->
+    src/osx/carbon/utilscocoa.mm
+    <!-- Generic implementations used by wxOSX: -->
      src/generic/caret.cpp
      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/fdrepdlg.cpp
+    src/generic/filedlgg.cpp
+    src/generic/filepickerg.cpp
      src/generic/fontdlgg.cpp
      src/generic/fontdlgg.cpp
+    src/generic/fontpickerg.cpp
      src/generic/listctrl.cpp
      src/generic/prntdlgg.cpp
      src/generic/statusbr.cpp
      src/generic/listctrl.cpp
      src/generic/prntdlgg.cpp
      src/generic/statusbr.cpp
-    src/generic/tabg.cpp
+</if>
  </set>
  
  </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/dnd.h
-    wx/mac/evtloop.h
-    wx/mac/filedlg.h
-    wx/mac/font.h
-    wx/mac/fontdlg.h
-    wx/mac/frame.h
-    wx/mac/gauge.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
-</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/dnd.h
-    wx/mac/carbon/evtloop.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/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
-    <!-- Generic implementations used by wxMac: -->
+<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/printdlg.cpp
+    src/osx/carbon/radiobut.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
+</set>
+
+<!-- Header files like wx/osx/foo.h which include wx/osx/carbon/foo.h -->
+<set var="OSX_SHARED_HDR" hints="files">
+    <!-- wxWebKit headers -->
+    wx/html/webkit.h
+    <!-- other shared headers -->
+    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/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
+    <!-- Generic implementations used by wxOSX: -->
      wx/generic/caret.h
      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/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/listctrl.h
+    wx/generic/prntdlgg.h
      wx/generic/statusbr.h
      wx/generic/statusbr.h
-    wx/generic/tabg.h
-    <!-- wxWebKit headers -->
-    wx/html/webkit.h
+</set>
+<!-- wxMac Carbon header files -->
+<set var="OSX_CARBON_HDR" hints="files">
+    <!-- core files -->
+    wx/osx/core/colour.h
+    <!-- carbon files -->
+    wx/osx/carbon/chkconf.h
+    wx/osx/carbon/evtloop.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/region.h
+    wx/osx/carbon/statbmp.h
+    wx/osx/carbon/uma.h
  </set>
  
  </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/printdlg.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
+</set>
+<set var="OSX_COCOA_HDR" hints="files">
+    wx/osx/cocoa/chkconf.h
+    wx/osx/cocoa/evtloop.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                                   -->
@@ -2338,9 +2495,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/hid.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>
@@ -2351,6 +2507,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
@@ -2383,7 +2540,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/cocoa/drawer.mm
      src/cocoa/evtloop.mm
      src/cocoa/filedlg.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/fontdlg.mm
      src/cocoa/fontenum.mm
      src/cocoa/fontutil.cpp
@@ -2416,22 +2573,25 @@ 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/fdrepdlg.cpp
      src/generic/colrdlgg.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/paletteg.cpp
      src/generic/regiong.cpp
      src/generic/statusbr.cpp
      src/generic/imaglist.cpp
      src/generic/listctrl.cpp
      src/generic/msgdlgg.cpp
      src/generic/paletteg.cpp
      src/generic/regiong.cpp
      src/generic/statusbr.cpp
-    src/generic/tabg.cpp
  </set>
  <set var="COCOA_HDR" hints="files">
      wx/cocoa/NSApplication.h
  </set>
  <set var="COCOA_HDR" hints="files">
      wx/cocoa/NSApplication.h
@@ -2441,6 +2601,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
@@ -2473,6 +2634,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/cocoa/dialog.h
      wx/cocoa/dirdlg.h
      wx/cocoa/drawer.h
      wx/cocoa/dialog.h
      wx/cocoa/dirdlg.h
      wx/cocoa/drawer.h
+    wx/cocoa/evtloop.h
      wx/cocoa/filedlg.h
      wx/cocoa/font.h
      wx/cocoa/fontdlg.h
      wx/cocoa/filedlg.h
      wx/cocoa/font.h
      wx/cocoa/fontdlg.h
@@ -2500,20 +2662,24 @@ 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/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/region.h
      wx/generic/statusbr.h
      wx/generic/imaglist.h
      wx/generic/listctrl.h
      wx/generic/paletteg.h
      wx/generic/region.h
      wx/generic/statusbr.h
-    wx/generic/tabg.h
  </set>
  
  
  </set>
  
  
@@ -2532,22 +2698,24 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  
  <set var="UNIV_SRC" hints="files">
      src/generic/accel.cpp
  
  <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/fontpickerg.cpp
      src/generic/listctrl.cpp
      src/generic/mdig.cpp
      src/generic/msgdlgg.cpp
      src/generic/prntdlgg.cpp
      src/generic/listctrl.cpp
      src/generic/mdig.cpp
      src/generic/msgdlgg.cpp
      src/generic/prntdlgg.cpp
-    src/generic/tabg.cpp
      src/univ/bmpbuttn.cpp
      src/univ/button.cpp
      src/univ/checkbox.cpp
      src/univ/checklst.cpp
      src/univ/choice.cpp
      src/univ/bmpbuttn.cpp
      src/univ/button.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
@@ -2564,6 +2732,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
@@ -2581,13 +2750,19 @@ 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
-    wx/generic/tabg.h
      wx/univ/app.h
      wx/univ/bmpbuttn.h
      wx/univ/button.h
      wx/univ/app.h
      wx/univ/bmpbuttn.h
      wx/univ/button.h
@@ -2624,6 +2799,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/univ/stdrend.h
      wx/univ/textctrl.h
      wx/univ/theme.h
      wx/univ/stdrend.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
      wx/univ/toolbar.h
      wx/univ/toplevel.h
      wx/univ/window.h
@@ -2635,18 +2811,24 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  
  <set var="ADVANCED_CMN_SRC" hints="files">
      src/common/animatecmn.cpp
  
  <set var="ADVANCED_CMN_SRC" hints="files">
      src/common/animatecmn.cpp
+    src/common/bmpcboxcmn.cpp
+    src/common/calctrlcmn.cpp
      src/common/datavcmn.cpp
      src/common/datavcmn.cpp
+    src/common/hyperlnkcmn.cpp
      src/generic/aboutdlgg.cpp
      src/generic/bmpcboxg.cpp
      src/generic/aboutdlgg.cpp
      src/generic/bmpcboxg.cpp
-    src/generic/calctrl.cpp
+    src/generic/calctrlg.cpp
      src/generic/datavgen.cpp
      src/generic/datectlg.cpp
      src/generic/datavgen.cpp
      src/generic/datectlg.cpp
+    src/generic/editlbox.cpp
      src/generic/grid.cpp
      src/generic/gridctrl.cpp
      src/generic/grid.cpp
      src/generic/gridctrl.cpp
+    src/generic/grideditors.cpp
      src/generic/gridsel.cpp
      src/generic/helpext.cpp
      src/generic/gridsel.cpp
      src/generic/helpext.cpp
-    src/generic/hyperlink.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/odcombo.cpp
      src/generic/propdlg.cpp
      src/generic/sashwin.cpp
@@ -2656,24 +2838,28 @@ 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/animate.h
-    wx/animdecod.h
      wx/bmpcbox.h
      wx/calctrl.h
      wx/dataview.h
      wx/bmpcbox.h
      wx/calctrl.h
      wx/dataview.h
+    wx/datectrl.h
      wx/dateevt.h
      wx/dcbuffer.h
      wx/dateevt.h
      wx/dcbuffer.h
-    wx/aboutdlg.h
+    wx/editlbox.h
      wx/generic/aboutdlgg.h
      wx/generic/bmpcbox.h
      wx/generic/aboutdlgg.h
      wx/generic/bmpcbox.h
-    wx/generic/calctrl.h
+    wx/generic/calctrlg.h
      wx/generic/datectrl.h
      wx/generic/dataview.h
      wx/generic/grid.h
      wx/generic/gridctrl.h
      wx/generic/datectrl.h
      wx/generic/dataview.h
      wx/generic/grid.h
      wx/generic/gridctrl.h
+    wx/generic/grideditors.h
      wx/generic/gridsel.h
      wx/generic/helpext.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/propdlg.h
      wx/generic/sashwin.h
      wx/generic/splash.h
@@ -2682,6 +2868,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/hyperlink.h
      wx/joystick.h
      wx/laywin.h
      wx/hyperlink.h
      wx/joystick.h
      wx/laywin.h
+    wx/notifmsg.h
      wx/odcombo.h
      wx/propdlg.h
      wx/sashwin.h
      wx/odcombo.h
      wx/propdlg.h
      wx/sashwin.h
@@ -2689,33 +2876,34 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/splash.h
      wx/taskbar.h
      wx/tipdlg.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
-    wx/dataview.h
-</set>
-
  <set var="ADVANCED_MSW_SRC" hints="files">
  <set var="ADVANCED_MSW_SRC" hints="files">
-    src/generic/animateg.cpp
      src/common/taskbarcmn.cpp
      src/msw/aboutdlg.cpp
      src/common/taskbarcmn.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/generic/animateg.cpp
+    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/generic/animate.h
+    wx/msw/bmpcbox.h
+    wx/msw/calctrl.h
      wx/msw/datectrl.h
  </set>
  
      wx/msw/datectrl.h
  </set>
  
@@ -2727,33 +2915,61 @@ 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/generic/animateg.cpp
+    src/osx/carbon/aboutdlg.cpp
+    src/osx/carbon/drawer.cpp
+    src/osx/dataview_osx.cpp
+    src/osx/carbon/dataview.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/taskbarosx.h
+    wx/osx/carbon/drawer.h
+    wx/osx/carbon/dataview.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/aboutdlg.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/carbon/sound.cpp
+    src/osx/cocoa/aboutdlg.mm
+    src/osx/dataview_osx.cpp
+    src/osx/cocoa/dataview.mm
+    src/osx/cocoa/taskbar.mm
+    src/osx/core/hidjoystick.cpp
  </set>
  </set>
-<set var="ADVANCED_MAC_HDR" hints="files">
+
+<set var="ADVANCED_OSX_COCOA_HDR" hints="files">
      wx/generic/animate.h
      wx/generic/animate.h
-    wx/mac/carbon/drawer.h
-    wx/mac/carbon/sound.h
-    wx/mac/carbon/taskbarosx.h
-    wx/mac/corefoundation/joystick.h
+    wx/osx/dataview.h
+    wx/osx/joystick.h
+    wx/osx/sound.h
+    wx/osx/taskbarosx.h
+    wx/osx/core/joystick.h
+    wx/osx/cocoa/dataview.h
  </set>
  
  <set var="ADVANCED_COCOA_SRC" hints="files">
  </set>
  
  <set var="ADVANCED_COCOA_SRC" hints="files">
-    src/generic/animateg.cpp
      src/cocoa/taskbar.mm
      src/common/taskbarcmn.cpp
      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">
  <set var="ADVANCED_COCOA_HDR" hints="files">
-    wx/generic/animate.h
      wx/cocoa/taskbar.h
      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">
@@ -2779,17 +2995,38 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/unix/taskbarx11.h
  </set>
  
      wx/unix/taskbarx11.h
  </set>
  
-<set var="ADVANCED_GTK_SRC" hints="files">
+<set var="ADVANCED_MOTIF_SRC" hints="files">
      src/generic/animateg.cpp
      src/generic/animateg.cpp
-    src/gtk/aboutdlg.cpp
-    src/gtk/animate.cpp
-    src/gtk/dataview.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
      src/gtk/taskbar.cpp
      src/gtk/eggtrayicon.c
+    src/gtk/hildon/notifmsg.cpp
  </set>
  <set var="ADVANCED_GTK_HDR" hints="files">
  </set>
  <set var="ADVANCED_GTK_HDR" hints="files">
-    wx/generic/animate.h
+    wx/gtk/hildon/notifmsg.h
+    wx/gtk/taskbar.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/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">
  </set>
  
  <set var="ADVANCED_GTK1_SRC" hints="files">
@@ -2801,17 +3038,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/generic/animate.h
  </set>
  
      wx/generic/animate.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_UNIV_SRC" hints="files">
      src/generic/animateg.cpp
  </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 var="ADVANCED_UNIV_HDR" hints="files">
      wx/generic/animate.h
  </set>
@@ -2832,10 +3061,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/msw/mediactrl_am.cpp
      src/msw/mediactrl_wmp10.cpp
      src/msw/mediactrl_qt.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">
@@ -2843,10 +3070,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">
@@ -2959,13 +3192,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/xrc/xh_clrpicker.cpp
      src/xrc/xh_collpane.cpp
      src/xrc/xh_combo.cpp
      src/xrc/xh_clrpicker.cpp
      src/xrc/xh_collpane.cpp
      src/xrc/xh_combo.cpp
+    src/xrc/xh_comboctrl.cpp
      src/xrc/xh_datectrl.cpp
      src/xrc/xh_dirpicker.cpp
      src/xrc/xh_dlg.cpp
      src/xrc/xh_datectrl.cpp
      src/xrc/xh_dirpicker.cpp
      src/xrc/xh_dlg.cpp
-    src/xrc/xh_frame.cpp
-    src/xrc/xh_mdi.cpp
+    src/xrc/xh_editlbox.cpp
+    src/xrc/xh_filectrl.cpp
      src/xrc/xh_filepicker.cpp
      src/xrc/xh_fontpicker.cpp
      src/xrc/xh_filepicker.cpp
      src/xrc/xh_fontpicker.cpp
+    src/xrc/xh_frame.cpp
      src/xrc/xh_gauge.cpp
      src/xrc/xh_gdctl.cpp
      src/xrc/xh_grid.cpp
      src/xrc/xh_gauge.cpp
      src/xrc/xh_gdctl.cpp
      src/xrc/xh_grid.cpp
@@ -2974,12 +3209,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/xrc/xh_listb.cpp
      src/xrc/xh_listbk.cpp
      src/xrc/xh_listc.cpp
      src/xrc/xh_listb.cpp
      src/xrc/xh_listbk.cpp
      src/xrc/xh_listc.cpp
+    src/xrc/xh_mdi.cpp
      src/xrc/xh_menu.cpp
      src/xrc/xh_notbk.cpp
      src/xrc/xh_odcombo.cpp
      src/xrc/xh_panel.cpp
      src/xrc/xh_menu.cpp
      src/xrc/xh_notbk.cpp
      src/xrc/xh_odcombo.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_htmllbox.cpp
      src/xrc/xh_scrol.cpp
      src/xrc/xh_scwin.cpp
      src/xrc/xh_htmllbox.cpp
@@ -2987,6 +3226,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/xrc/xh_slidr.cpp
      src/xrc/xh_spin.cpp
      src/xrc/xh_split.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
@@ -3000,6 +3240,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      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">
      src/xrc/xmlrsall.cpp
  </set>
  <set var="XRC_HDR" hints="files">
@@ -3017,9 +3258,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/xrc/xh_clrpicker.h
      wx/xrc/xh_collpane.h
      wx/xrc/xh_combo.h
      wx/xrc/xh_clrpicker.h
      wx/xrc/xh_collpane.h
      wx/xrc/xh_combo.h
+    wx/xrc/xh_comboctrl.h
      wx/xrc/xh_datectrl.h
      wx/xrc/xh_dirpicker.h
      wx/xrc/xh_dlg.h
      wx/xrc/xh_datectrl.h
      wx/xrc/xh_dirpicker.h
      wx/xrc/xh_dlg.h
+    wx/xrc/xh_editlbox.h
+    wx/xrc/xh_filectrl.h
      wx/xrc/xh_filepicker.h
      wx/xrc/xh_fontpicker.h
      wx/xrc/xh_frame.h
      wx/xrc/xh_filepicker.h
      wx/xrc/xh_fontpicker.h
      wx/xrc/xh_frame.h
@@ -3036,8 +3280,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/xrc/xh_notbk.h
      wx/xrc/xh_odcombo.h
      wx/xrc/xh_panel.h
      wx/xrc/xh_notbk.h
      wx/xrc/xh_odcombo.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_htmllbox.h
      wx/xrc/xh_scrol.h
      wx/xrc/xh_scwin.h
      wx/xrc/xh_htmllbox.h
@@ -3045,6 +3291,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/xrc/xh_slidr.h
      wx/xrc/xh_spin.h
      wx/xrc/xh_split.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
@@ -3081,51 +3328,51 @@ 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' and TOOLKIT_VERSION=='2'">src/gtk/glcanvas.cpp</if>
-    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">src/gtk1/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</if>
+    <if cond="TOOLKIT=='OSX_COCOA'">wx/osx/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' and TOOLKIT_VERSION=='2'">wx/gtk/glcanvas.h</if>
-    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">wx/gtk1/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>
  
-
-
-<!-- ====================================================================== -->
-<!--                              ODBC classes                              -->
-<!-- ====================================================================== -->
-
-<set var="ODBC_SRC" hints="files">
-    src/common/db.cpp
-    src/common/dbtable.cpp
-</set>
-<set var="ODBC_HDR" hints="files">
-    wx/db.h
-    wx/dbkeyg.h
-    wx/dbtable.h
-</set>
-
-<set var="DBGRID_SRC" hints="files">
-    src/common/dbgrid.cpp
-</set>
-<set var="DBGRID_HDR" hints="files">
-    wx/dbgrid.h
+<set var="OPENGL_HDR" hints="files">
+    wx/glcanvas.h
+    $(OPENGL_HDR_PLATFORM)
  </set>
  
  
  </set>
  
  
@@ -3146,6 +3393,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/aui/dockart.cpp
      src/aui/floatpane.cpp
      src/aui/auibook.cpp
      src/aui/dockart.cpp
      src/aui/floatpane.cpp
      src/aui/auibook.cpp
+    src/aui/auibar.cpp
      src/aui/tabmdi.cpp
  </set>
  <set var="AUI_HDR" hints="files">
      src/aui/tabmdi.cpp
  </set>
  <set var="AUI_HDR" hints="files">
@@ -3153,10 +3401,37 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/aui/dockart.h
      wx/aui/floatpane.h
      wx/aui/auibook.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>
  
      wx/aui/tabmdi.h
      wx/aui/aui.h
  </set>
  
+<!-- ====================================================================== -->
+<!--                                  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>
+
  <!-- ====================================================================== -->
  <!--                                  wxRichTextCtrl                        -->
  <!-- ====================================================================== -->
  <!-- ====================================================================== -->
  <!--                                  wxRichTextCtrl                        -->
  <!-- ====================================================================== -->
@@ -3175,6 +3450,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <set var="RICHTEXT_HDR" hints="files">
      wx/richtext/richtextctrl.h
      wx/richtext/richtextbuffer.h
  <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/richtextstyles.h
      wx/richtext/richtextxml.h
      wx/richtext/richtextformatdlg.h
@@ -3183,6 +3459,21 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/richtext/richtextprint.h
  </set>
  
      wx/richtext/richtextprint.h
  </set>
  
+
+<!-- ====================================================================== -->
+<!--                                wxSTC                                   -->
+<!-- ====================================================================== -->
+
+<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>
+
  <!-- ====================================================================== -->
  <!--                    Define sources for specific libraries:              -->
  <!-- ====================================================================== -->
  <!-- ====================================================================== -->
  <!--                    Define sources for specific libraries:              -->
  <!-- ====================================================================== -->
@@ -3191,34 +3482,33 @@ 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_MSDOS=='1'">$(BASE_MSDOS_SRC)</if>
      </set>
      <set var="BASE_AND_GUI_TOOLKIT_SRC" hints="files">
          <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">
-        <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_MSDOS=='1'">$(BASE_AND_GUI_MSDOS_SRC)</if>
          <!-- At the moment, BASE_AND_GUI_TOOLKIT_SRC handles this -->
          <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 -->
@@ -3227,22 +3517,23 @@ 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_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_MSDOS=='1'">$(BASE_MSDOS_HDR)</if>
          <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_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>
@@ -3261,16 +3552,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      <set var="NET_PLATFORM_SRC" hints="files">
          <if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_SRC)</if>
          <if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_SRC) $(NET_WINCE_SRC)</if>
      <set var="NET_PLATFORM_SRC" hints="files">
          <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_MACOSX=='1'">$(NET_UNIX_SRC) $(NET_OSX_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">
-        <if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_HDR)</if>
          <if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_HDR) $(NET_WINCE_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">
@@ -3286,7 +3572,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
          <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=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_SRC)</if>
@@ -3299,7 +3586,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
          <if cond="TOOLKIT=='MOTIF'">$(MOTIF_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=='MOTIF'">$(MOTIF_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=='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=='COCOA'">$(COCOA_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_HDR)</if>
@@ -3307,13 +3595,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
          <if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_HDR)</if>
      </set>
  
          <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">
          <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>
      <set var="GUI_SRC" hints="files">
          <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=='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>
          <if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
          <if cond="TOOLKIT=='PM'">$(OS2_SRC)</if>
      </set>
@@ -3323,17 +3617,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
          <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>
  
@@ -3341,32 +3636,38 @@ 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=='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=='COCOA'">$(ADVANCED_COCOA_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=='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=='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=='COCOA'">$(ADVANCED_COCOA_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=='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=='WINCE'">$(ADVANCED_MSW_NATIVE_SRC)</if>
      </set>
      <set var="ADVANCED_PLATFORM_NATIVE_HDR" hints="files">
          <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">
+        <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=='WINCE'">$(ADVANCED_MSW_NATIVE_HDR)</if>
      </set>
          <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_HDR)</if>
          <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_NATIVE_HDR)</if>
      </set>
@@ -3376,7 +3677,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
          <if cond="WXUNIV=='1'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC) $(ADVANCED_UNIV_SRC)</if>
      </set>
      <set var="ADVANCED_HDR" hints="files">
          <if cond="WXUNIV=='1'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC) $(ADVANCED_UNIV_SRC)</if>
      </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=='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>
  
          <if cond="WXUNIV=='1'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_UNIV_HDR)</if>
      </set>
  
@@ -3384,7 +3685,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      <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 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>
@@ -3394,7 +3696,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>
@@ -3416,15 +3718,16 @@ 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) $(AUI_HDR) $(RICHTEXT_HDR)
+            $(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(PROPGRID_HDR)
+            $(RICHTEXT_HDR) $(STC_HDR)
          </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)
          </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)
-        $(XML_HDR) $(ODBC_HDR)
+        $(NET_CMN_HDR)
+        $(XML_HDR)
      </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)
@@ -3436,32 +3739,28 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
          $(BASE_CMN_HDR)
          $(BASE_UNIX_HDR)
          $(BASE_WIN32_HDR) $(BASE_WINCE_HDR)
          $(BASE_CMN_HDR)
          $(BASE_UNIX_HDR)
          $(BASE_WIN32_HDR) $(BASE_WINCE_HDR)
-        $(BASE_MACOSX_HDR)
+        $(BASE_OSX_HDR)
          $(BASE_PALMOS_HDR)
          $(BASE_MSDOS_HDR)
          $(NET_CMN_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)
-        $(NET_MAC_CARBONLIB_HDR)
-        $(XML_HDR) $(ODBC_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>
  
      <!-- 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)
-        $(BASE_MAC_SRC)
+        $(BASE_OSX_SRC)
          $(BASE_OS2_SRC)
          $(BASE_MSDOS_SRC)
          $(BASE_PALMOS_SRC)
          $(BASE_AND_GUI_CMN_SRC)
          $(BASE_OS2_SRC)
          $(BASE_MSDOS_SRC)
          $(BASE_PALMOS_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)
          $(BASE_AND_GUI_WIN32_SRC)
-        $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_WINCE_SRC)
-        $(XML_SRC) $(ODBC_SRC)
+        $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_OSX_SRC)
+        $(NET_WIN32_SRC) $(NET_WINCE_SRC)
+        $(XML_SRC)
      </set>
  
  
      </set>