X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/70550b222cae5f52efa621d5f9e29dd4b21b4323..673ae68a3c63f85da2f58f50c858efb9deeff79c:/build/bakefiles/files.bkl?ds=sidebyside

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 2b48015a98..a42a93fe19 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -53,39 +53,68 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 <!--                               UNIX                                     -->
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
-<set var="BASE_UNIX_SRC" hints="files">
+
+<!-- Files used on all Unix systems, including Darwin -->
+<set var="BASE_UNIX_AND_DARWIN_SRC" hints="files">
     src/common/fdiodispatcher.cpp
     src/common/selectdispatcher.cpp
+    src/unix/epolldispatcher.cpp
     src/unix/appunix.cpp
-    src/unix/baseunix.cpp
+    src/unix/evtloopunix.cpp
     src/unix/dir.cpp
     src/unix/dlunix.cpp
-    src/unix/epolldispatcher.cpp
-    src/unix/evtloopunix.cpp
-    src/unix/mimetype.cpp
     src/unix/snglinst.cpp
-    src/unix/stackwalk.cpp
     src/unix/stdpaths.cpp
-    src/unix/threadpsx.cpp
     src/unix/timerunx.cpp
-</set>
-<set var="BASE_AND_GUI_UNIX_SRC" hints="files">
+    src/unix/threadpsx.cpp
+    src/unix/stackwalk.cpp
     src/unix/utilsunx.cpp
 </set>
-<set var="BASE_UNIX_HDR" hints="files">
+
+<set var="BASE_UNIX_AND_DARWIN_HDR" hints="files">
     wx/private/fdiodispatcher.h
     wx/private/selectdispatcher.h
     wx/unix/app.h
     wx/unix/apptbase.h
     wx/unix/apptrait.h
     wx/unix/chkconf.h
-    wx/unix/execute.h
     wx/unix/evtloop.h
-    wx/unix/mimetype.h
     wx/unix/pipe.h
-    wx/unix/private.h
-    wx/unix/stackwalk.h
     wx/unix/stdpaths.h
+    wx/unix/stackwalk.h
+    wx/unix/tls.h
+</set>
+
+<!--
+    Files used on all Unix systems, including Darwin with any port but wxMac
+    (this is really an aberration, we should also use these files for wxMac,
+     it's not done because of some OS 9 support leftovers only now)
+ -->
+<set var="BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC" hints="files">
+    $(BASE_UNIX_AND_DARWIN_SRC)
+    src/unix/mimetype.cpp
+</set>
+
+<set var="BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR" hints="files">
+    $(BASE_UNIX_AND_DARWIN_HDR)
+    wx/unix/execute.h
+    wx/unix/mimetype.h
+    wx/unix/private.h
+</set>
+
+<!--
+    Files used on all non-Darwin Unix systems (because Darwin provides other,
+    better, native equivalents of the functionality they implement (e.g.
+    CFSocket instead of BSD sockets) or doesn't provide it at all (epoll,
+    backtrace())
+ -->
+<set var="BASE_UNIX_SRC" hints="files">
+    $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)
+    src/common/gsocketiohandler.cpp
+</set>
+<set var="BASE_UNIX_HDR" hints="files">
+    $(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR)
+    wx/private/gsocketiohandler.h
 </set>
 
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
@@ -152,96 +181,51 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!--                                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">
-    src/mac/corefoundation/cfstring.cpp
-    src/mac/corefoundation/stdpaths_cf.cpp
-    src/mac/corefoundation/strconv_cf.cpp
-    src/mac/corefoundation/utilsexc_base.cpp
+    src/osx/core/cfstring.cpp
+    src/osx/core/gsockosx.cpp
+    src/osx/core/stdpaths_cf.cpp
+    src/osx/core/strconv_cf.cpp
+    src/osx/core/utilsexc_base.cpp
 </set>
 <set var="BASE_COREFOUNDATION_HDR" hints="files">
-    wx/mac/corefoundation/cfstring.h
-    wx/mac/corefoundation/hid.h
-    wx/mac/corefoundation/stdpaths.h
-    wx/mac/corefoundation/private/strconv_cf.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_UNIX_AND_DARWIN_SRC)
 </set>
-<set var="BASE_MAC_HDR" hints="files">
+<set var="BASE_OSX_SHARED_HDR" hints="files">
     $(BASE_COREFOUNDATION_HDR)
+    $(BASE_UNIX_AND_DARWIN_HDR)
 </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/common/fdiodispatcher.cpp
-    src/common/selectdispatcher.cpp
-    src/unix/appunix.cpp
-    src/unix/baseunix.cpp
-    src/unix/evtloopunix.cpp
-    src/unix/dlunix.cpp
-    src/unix/snglinst.cpp
-    src/unix/stdpaths.cpp
-    src/unix/timerunx.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 var="BASE_MACOSX_WXMAC_HDR" hints="files">
-    $(BASE_MAC_HDR)
-    wx/private/fdiodispatcher.h
-    wx/private/selectdispatcher.h
-    wx/unix/app.h
-    wx/unix/apptbase.h
-    wx/unix/apptrait.h
-    wx/unix/chkconf.h
-    wx/unix/evtloop.h
-    wx/unix/pipe.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 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>
-<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>
 
@@ -250,6 +234,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 
 <set var="BASE_OS2_SRC" hints="files">
+    src/common/fdiodispatcher.cpp
+    src/common/selectdispatcher.cpp
+    src/common/gsocketiohandler.cpp
+    src/unix/appunix.cpp
+    src/unix/evtloopunix.cpp
+    src/unix/timerunx.cpp
     src/os2/dir.cpp
     src/os2/mimetype.cpp
     src/os2/stdpaths.cpp
@@ -260,8 +250,13 @@ 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">
+    wx/private/fdiodispatcher.h
+    wx/private/selectdispatcher.h
+    wx/private/gsocketiohandler.h
+    wx/unix/app.h
     wx/os2/apptbase.h
     wx/os2/apptrait.h
+    wx/unix/evtloop.h
     wx/os2/mimetype.h
     wx/os2/private.h
     wx/os2/stdpaths.h
@@ -278,6 +273,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/palmos/dir.cpp
     src/palmos/prefconf.cpp
     src/palmos/snglinst.cpp
+    src/palmos/stdall.c
     src/palmos/thread.cpp
     src/palmos/utils.cpp
     src/palmos/utilsexc.cpp
@@ -293,6 +289,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/missing.h
     wx/palmos/stdpaths.h
 </set>
 
@@ -382,10 +379,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/txtstrm.cpp
     src/common/unichar.cpp
     src/common/uri.cpp
+    src/common/ustring.cpp
     src/common/variant.cpp
     src/common/wfstream.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
@@ -412,6 +411,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/chartype.h
     wx/chkconf.h
     wx/clntdata.h
+    wx/cmdargs.h
     wx/cmdline.h
     wx/confbase.h
     wx/config.h
@@ -426,6 +426,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/defs.h
     wx/dir.h
     wx/dlimpexp.h
+    wx/dlist.h
     wx/dynarray.h
     wx/dynlib.h
     wx/dynload.h
@@ -457,8 +458,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -470,6 +470,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/memtext.h
     wx/mimetype.h
     wx/module.h
+    wx/mousestate.h
     wx/msgout.h
     wx/mstream.h
     wx/object.h
@@ -478,6 +479,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/power.h
     wx/process.h
     wx/ptr_scpd.h
+    wx/ptr_shrd.h
     wx/recguard.h
     wx/regex.h
     wx/scopeguard.h
@@ -502,15 +504,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/thrimpl.cpp
     wx/timer.h
     wx/tokenzr.h
+    wx/tracker.h
     wx/txtstrm.h
     wx/types.h
     wx/unichar.h
     wx/uri.h
+    wx/ustring.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
@@ -518,10 +523,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/wxcrtbase.h
     wx/wxcrtvararg.h
     wx/wxprec.h
+    wx/xlocale.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>
 
 
@@ -538,6 +548,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="NET_WIN32_SRC" hints="files">
     src/msw/gsocket.cpp
+    src/msw/gsockmsw.cpp
     src/msw/urlmsw.cpp
 </set>
 <set var="NET_WIN32_HDR" hints="files">
@@ -557,13 +568,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="NET_OS2_HDR" hints="files">
     wx/unix/gsockunx.h
 </set>
-<!-- Net files used only by CarbonLib (not Classic or OS X) -->
-<set var="NET_MAC_CARBONLIB_SRC" hints="files">
-    src/mac/carbon/gsocket.cpp
-</set>
-<set var="NET_MAC_CARBONLIB_HDR" hints="files">
-    wx/mac/carbon/gsockmac.h
-</set>
 
 <set var="NET_CMN_SRC" hints="files">
     src/common/fs_inet.cpp
@@ -618,6 +622,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -643,6 +648,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/dseldlg.cpp
     src/common/effects.cpp
     src/common/fddlgcmn.cpp
+    src/common/filectrlcmn.cpp
     src/common/filepickercmn.cpp
     src/common/fontpickercmn.cpp
     src/common/fldlgcmn.cpp
@@ -695,25 +701,25 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/stockitem.cpp
     src/common/tbarbase.cpp
     src/common/textcmn.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/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/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/filepickerg.cpp
-    src/generic/fontpickerg.cpp
+    src/generic/filectrlg.cpp
     src/generic/listbkg.cpp
     src/generic/logg.cpp
     src/generic/numdlgg.cpp
@@ -726,6 +732,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/spinctlg.cpp
     src/generic/splitter.cpp
     src/generic/srchctlg.cpp
+    src/generic/statbmpg.cpp
     src/generic/textdlgg.cpp
     src/generic/tipwin.cpp
     src/generic/toolbkg.cpp
@@ -738,6 +745,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/bmpbuttn.h
     wx/brush.h
     wx/button.h
+    wx/cairo.h
     wx/checkbox.h
     wx/checklst.h
     wx/choicdlg.h
@@ -768,17 +776,12 @@ 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/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/filedlgg.h
-    wx/generic/filepickerg.h
-    wx/generic/fontdlgg.h
-    wx/generic/fontpickerg.h
+    wx/generic/filectrlg.h
     wx/generic/logg.h
     wx/generic/msgdlgg.h
     wx/generic/numdlgg.h
@@ -791,6 +794,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/spinctlg.h
     wx/generic/splitter.h
     wx/generic/srchctlg.h
+    wx/generic/statbmpg.h
     wx/generic/textdlgg.h
     wx/generic/treectlg.h
     wx/graphics.h
@@ -801,6 +805,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mdi.h
     wx/menu.h
     wx/msgdlg.h
+    wx/nativewin.h
     wx/numdlg.h
     wx/overlay.h
     wx/palette.h
@@ -823,15 +828,20 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/statusbr.h
     wx/textctrl.h
     wx/textdlg.h
+    wx/textentry.h
+    wx/tls.h
     wx/toolbar.h
     wx/validate.h
     wx/valtext.h
     wx/window.h
+    wx/windowid.h
+    wx/wrapsizer.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
@@ -858,6 +868,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/effects.h
     wx/evtloop.h
     wx/fdrepdlg.h
+    wx/filectrl.h
     wx/filepicker.h
     wx/fontpicker.h
     wx/fmappriv.h
@@ -901,7 +912,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/printdlg.h
     wx/prntbase.h
     wx/progdlg.h
-    wx/ptr_scpd.h
     wx/quantize.h
     wx/rawbmp.h
     wx/region.h
@@ -931,6 +941,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/xpmhand.h
 </set>
 
+<!-- ====================================================================== -->
+<!--                            Common Unix files:                          -->
+<!-- ====================================================================== -->
+
+<set var="UNIX_SRC" hints="files">
+    src/unix/apptraits.cpp
+</set>
 
 <!-- ====================================================================== -->
 <!--                            Common X11 code:                            -->
@@ -975,11 +992,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/dcscreen.cpp
     src/gtk/dnd.cpp
     src/gtk/evtloop.cpp
+    src/gtk/filectrl.cpp
     src/gtk/font.cpp
     src/gtk/gsockgtk.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
@@ -987,7 +1006,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/win_gtk.c
+    src/gtk/win_gtk.cpp
     src/gtk/window.cpp
 </set>
 <set var="GTK_LOWLEVEL_HDR" hints="files">
@@ -1013,27 +1032,26 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/minifram.h
     wx/gtk/pen.h
     wx/gtk/popupwin.h
+    wx/gtk/private/win_gtk.h
     wx/gtk/region.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
-    src/generic/colrdlgg.cpp
-    src/generic/dirdlgg.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/msgdlgg.cpp
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
     src/generic/tabg.cpp
     <!-- Generic implementations used by wxGPE: -->
     src/generic/fontdlgg.cpp
+    src/generic/msgdlgg.cpp
     <!-- GTK+ specific files: -->
     src/gtk/artgtk.cpp
     src/gtk/bmpbuttn.cpp
@@ -1056,10 +1074,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/print.cpp
     src/gtk/listbox.cpp
     src/gtk/mdi.cpp
     src/gtk/menu.cpp
+    src/gtk/mnemonics.cpp
     src/gtk/msgdlg.cpp
+    src/gtk/nativewin.cpp
     src/gtk/notebook.cpp
     src/gtk/radiobox.cpp
     src/gtk/radiobut.cpp
@@ -1074,13 +1095,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/stattext.cpp
     src/gtk/tbargtk.cpp
     src/gtk/textctrl.cpp
+    src/gtk/textentry.cpp
     src/gtk/tglbtn.cpp
     src/gtk/treeentry_gtk.c
 </set>
 <set var="GTK_HDR" hints="files">
-    wx/generic/colrdlgg.h
-    wx/generic/dirdlgg.h
     wx/generic/fdrepdlg.h
+    wx/generic/filepickerg.h
+    wx/generic/fontdlgg.h
     wx/generic/listctrl.h
     wx/generic/statusbr.h
     wx/generic/tabg.h
@@ -1098,6 +1120,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/filectrl.h
     wx/gtk/filedlg.h
     wx/gtk/fontpicker.h
     wx/gtk/filepicker.h
@@ -1106,6 +1129,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/print.h
     wx/gtk/listbox.h
     wx/gtk/mdi.h
     wx/gtk/menu.h
@@ -1125,8 +1149,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/textentry.h
     wx/gtk/tglbtn.h
-    wx/gtk/treectrl.h
     wx/gtk/treeentry_gtk.h
 </set>
 
@@ -1200,17 +1224,20 @@ 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
+    src/generic/clrpickerg.cpp
+    src/generic/collpaneg.cpp
     src/generic/colrdlgg.cpp
     src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp
     src/generic/filedlgg.cpp
+    src/generic/filepickerg.cpp
+    src/generic/fontdlgg.cpp
+    src/generic/fontpickerg.cpp
     src/generic/listctrl.cpp
     src/generic/msgdlgg.cpp
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
     src/generic/tabg.cpp
-    <!-- Generic implementations used by wxGPE: -->
-    src/generic/fontdlgg.cpp
     <!-- GTK1 specific files: -->
     src/gtk1/bmpbuttn.cpp
     src/gtk1/button.cpp
@@ -1244,9 +1271,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk1/tglbtn.cpp
 </set>
 <set var="GTK1_HDR" hints="files">
+    wx/generic/clrpickerg.h
+    wx/generic/collpaneg.h
     wx/generic/colrdlgg.h
     wx/generic/dirdlgg.h
     wx/generic/fdrepdlg.h
+    wx/generic/filedlgg.h
+    wx/generic/filepickerg.h
+    wx/generic/fontdlgg.h
+    wx/generic/fontpickerg.h
     wx/generic/listctrl.h
     wx/generic/statusbr.h
     wx/generic/tabg.h
@@ -1295,6 +1328,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     $(XWIN_LOWLEVEL_SRC)
     src/x11/bitmap.cpp
     src/x11/brush.cpp
+    src/x11/palette.cpp
     src/x11/pen.cpp
     src/x11/region.cpp
     src/x11/utilsx.cpp
@@ -1303,6 +1337,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     $(XWIN_LOWLEVEL_HDR)
     wx/x11/bitmap.h
     wx/x11/brush.h
+    wx/x11/palette.h
     wx/x11/pen.h
     wx/x11/region.h
 </set>
@@ -1342,7 +1377,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/motif/menuitem.cpp
     src/motif/minifram.cpp
     src/motif/msgdlg.cpp
-    src/motif/palette.cpp
     src/motif/popupwin.cpp
     src/motif/radiobox.cpp
     src/motif/radiobut.cpp
@@ -1354,6 +1388,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/motif/statbox.cpp
     src/motif/stattext.cpp
     src/motif/textctrl.cpp
+    src/motif/textentry.cpp
     src/motif/timer.cpp
     src/motif/toolbar.cpp
     src/motif/toplevel.cpp
@@ -1361,10 +1396,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/motif/window.cpp
     src/motif/xmcombo/xmcombo.c
     <!-- Generic files used by wxMotif: -->
+    src/generic/clrpickerg.cpp
+    src/generic/collpaneg.cpp
     src/generic/colrdlgg.cpp
     src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp
+    src/generic/filepickerg.cpp
     src/generic/fontdlgg.cpp
+    src/generic/fontpickerg.cpp
     src/generic/listctrl.cpp
     src/generic/notebook.cpp
     src/generic/prntdlgg.cpp
@@ -1373,11 +1412,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/tabg.cpp
 </set>
 <set var="MOTIF_HDR" hints="files">
+    wx/generic/clrpickerg.h
+    wx/generic/collpaneg.h
     wx/generic/colrdlgg.h
     wx/generic/ctrlsub.h
     wx/generic/dirdlgg.h
     wx/generic/fdrepdlg.h
+    wx/generic/filepickerg.h
     wx/generic/fontdlgg.h
+    wx/generic/fontpickerg.h
     wx/generic/listctrl.h
     wx/generic/notebook.h
     wx/generic/prntdlgg.h
@@ -1420,7 +1463,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/motif/menuitem.h
     wx/motif/minifram.h
     wx/motif/msgdlg.h
-    wx/motif/palette.h
     wx/motif/popupwin.h
     wx/motif/print.h
     wx/motif/private.h
@@ -1433,6 +1475,7 @@ 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/textentry.h
     wx/motif/tglbtn.h
     wx/motif/toolbar.h
     wx/motif/toplevel.h
@@ -1447,7 +1490,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="X11_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)
-    src/common/gsocketiohandler.cpp
     src/generic/icon.cpp
     src/generic/timer.cpp
     src/x11/app.cpp
@@ -1542,7 +1584,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/gdiobj.cpp
     src/msw/gdiplus.cpp
     src/msw/graphics.cpp
-    src/msw/gsockmsw.cpp
     src/msw/icon.cpp
     src/msw/imaglist.cpp
     src/msw/minifram.cpp
@@ -1584,6 +1625,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </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
@@ -1600,7 +1645,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/dragimag.cpp
     src/msw/filedlg.cpp
     src/msw/frame.cpp
-    src/msw/gauge95.cpp
+    src/msw/gauge.cpp
     src/msw/iniconf.cpp
     src/msw/listbox.cpp
     src/msw/listctrl.cpp
@@ -1610,30 +1655,33 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/metafile.cpp
     src/msw/msgdlg.cpp
     src/msw/nativdlg.cpp
+    src/msw/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/slider95.cpp
+    src/msw/slider.cpp
     src/msw/spinbutt.cpp
     src/msw/spinctrl.cpp
     src/msw/statbmp.cpp
     src/msw/statbox.cpp
-    src/msw/statbr95.cpp
+    src/msw/statusbar.cpp
     src/msw/statline.cpp
     src/msw/stattext.cpp
     src/msw/tabctrl.cpp
-    src/msw/tbar95.cpp
+    src/msw/toolbar.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
-    wx/generic/fontpickerg.h
+    wx/generic/collpaneg.h
     wx/generic/filepickerg.h
+    wx/generic/fontpickerg.h
     wx/msw/accel.h
     wx/msw/app.h
     wx/msw/bitmap.h
@@ -1665,7 +1713,7 @@ 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/gauge95.h
+    wx/msw/gauge.h
     wx/msw/gdiimage.h
     wx/msw/icon.h
     wx/msw/imaglist.h
@@ -1698,17 +1746,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/slider95.h
+    wx/msw/slider.h
     wx/msw/spinbutt.h
     wx/msw/spinctrl.h
     wx/msw/statbmp.h
     wx/msw/statbox.h
-    wx/msw/statbr95.h
+    wx/msw/statusbar.h
     wx/msw/statline.h
     wx/msw/stattext.h
     wx/msw/tabctrl.h
-    wx/msw/tbar95.h
+    wx/msw/toolbar.h
     wx/msw/textctrl.h
+    wx/msw/textentry.h
     wx/msw/tglbtn.h
     wx/msw/tooltip.h
     wx/msw/toplevel.h
@@ -1864,7 +1913,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="DFB_LOWLEVEL_SRC" hints="files">
     src/common/fontmgrcmn.cpp
-    src/common/gsocketiohandler.cpp
     src/generic/caret.cpp
     src/generic/colour.cpp
     src/generic/icon.cpp
@@ -1935,9 +1983,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
+    src/generic/clrpickerg.cpp
+    src/generic/collpaneg.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
@@ -1985,6 +2037,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/minifram.cpp
     src/os2/msgdlg.cpp
     src/os2/nativdlg.cpp
     src/os2/notebook.cpp
@@ -2007,6 +2060,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/os2/stattext.cpp
     src/os2/tabctrl.cpp
     src/os2/textctrl.cpp
+    src/os2/textentry.cpp
     src/os2/tglbtn.cpp
     src/os2/timer.cpp
     src/os2/toolbar.cpp
@@ -2017,6 +2071,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="OS2_HDR" hints="files">
     wx/generic/caret.h
+    wx/generic/clrpickerg.h
+    wx/generic/collpaneg.h
     wx/generic/colrdlgg.h
     wx/generic/dirdlgg.h
     wx/generic/fdrepdlg.h
@@ -2083,6 +2139,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/stattext.h
     wx/os2/tabctrl.h
     wx/os2/textctrl.h
+    wx/os2/textentry.h
     wx/os2/tglbtn.h
     wx/os2/toolbar.h
     wx/os2/tooltip.h
@@ -2096,295 +2153,332 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!--                                wxMac                                   -->
 <!-- ====================================================================== -->
 
-<set var="MAC_OSX_LOWLEVEL_SRC" hints="files">
+<set var="OSX_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
+    <if cond="PLATFORM_MACOSX=='1'">
+    src/osx/accel.cpp
+    src/osx/artmac.cpp
+    src/osx/bmpbuttn_osx.cpp
+    src/osx/brush.cpp
+    src/osx/button_osx.cpp
+    src/osx/checkbox_osx.cpp
+    src/osx/checklst_osx.cpp
+    src/osx/choice_osx.cpp
+    src/osx/dialog_osx.cpp
+    src/osx/fontutil.cpp
+    src/osx/gauge_osx.cpp
+    src/osx/imaglist.cpp
+    src/osx/listbox_osx.cpp
+    src/osx/menu_osx.cpp
+    src/osx/menuitem_osx.cpp
+    src/osx/minifram.cpp
+    src/osx/nonownedwnd_osx.cpp
+    src/osx/notebook_osx.cpp
+    src/osx/palette.cpp
+    src/osx/pen.cpp
+    src/osx/radiobox_osx.cpp
+    src/osx/radiobut_osx.cpp
+    src/osx/scrolbar_osx.cpp
+    src/osx/slider_osx.cpp
+    src/osx/spinbutt_osx.cpp
+    src/osx/spinctrl_osx.cpp
+    src/osx/srchctrl_osx.cpp
+    src/osx/statbox_osx.cpp
+    src/osx/statline_osx.cpp
+    src/osx/stattext_osx.cpp
+    src/osx/tabctrl_osx.cpp
+    src/osx/textctrl_osx.cpp
+    src/osx/tglbtn_osx.cpp
+    src/osx/toolbar_osx.cpp
+    src/osx/toplevel_osx.cpp
+    src/osx/utils_osx.cpp
+    <!-- src/osx/treectrl.cpp -->
+    src/osx/window_osx.cpp
+
+    src/osx/core/bitmap.cpp
+    src/osx/core/colour.cpp
+    src/osx/core/dcmemory.cpp
+    src/osx/core/display.cpp
+    src/osx/core/fontenum.cpp
+    src/osx/core/hid.cpp
+    src/osx/core/printmac.cpp
+    src/osx/core/timer.cpp
+    src/osx/core/utilsexc_cf.cpp
+    </if>
 </set>
 
-<set var="MAC_OSX_LOWLEVEL_HDR" hints="files">
+<set var="OSX_LOWLEVEL_HDR" hints="files">
 </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 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 var="MAC_OSX_SRC" hints="files">
+<set var="OSX_CARBON_COCOA_SRC" hints="files">
 <if cond="PLATFORM_MACOSX=='1'">
     <!-- wxWebKit files -->
-    src/html/htmlctrl/webkit/webkit.mm
+    <!-- (TODO Move one level up) -->
     <!-- Native color/font dialogs -->
-    src/mac/carbon/fontdlgosx.mm
-    src/mac/carbon/colordlgosx.mm
+    src/osx/carbon/colordlgosx.mm
+    src/osx/carbon/fontdlgosx.mm
+    <!-- other shared files -->
+    src/osx/carbon/clipbrd.cpp
+    src/osx/carbon/cursor.cpp
+    src/osx/carbon/fontdlg.cpp
+    src/osx/carbon/gdiobj.cpp
+    src/osx/carbon/icon.cpp
+    src/osx/carbon/app.cpp
+    src/osx/carbon/combobox.cpp
+    src/osx/carbon/control.cpp
+    src/osx/carbon/dataobj.cpp
+    src/osx/carbon/dcclient.cpp
+    src/osx/carbon/dcprint.cpp
+    src/osx/carbon/dcscreen.cpp
+    src/osx/carbon/graphics.cpp
+    src/osx/carbon/dnd.cpp
+    src/osx/carbon/font.cpp
+    src/osx/carbon/frame.cpp
+    src/osx/carbon/mdi.cpp
+    src/osx/carbon/metafile.cpp
+    src/osx/carbon/overlay.cpp
+    src/osx/carbon/popupwin.cpp
+    src/osx/carbon/printdlg.cpp
+    src/osx/carbon/renderer.cpp
+    src/osx/carbon/settings.cpp
+    src/osx/carbon/statbrma.cpp
+    src/osx/carbon/tabctrl.cpp
+    <!-- cocoa bridge -->
+    src/osx/carbon/utilscocoa.mm
 </if>
 </set>
 
-<set var="MAC_SRC" hints="files">
-    src/mac/carbon/accel.cpp
-    src/mac/carbon/aga.cpp
-    src/mac/carbon/app.cpp
-    src/mac/carbon/artmac.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/srchctrl.cpp
-    src/mac/carbon/statbmp.cpp
-    src/mac/carbon/statbox.cpp
-    src/mac/carbon/statbrma.cpp
-    src/mac/carbon/statlmac.cpp
-    src/mac/carbon/stattext.cpp
-    src/mac/carbon/tabctrl.cpp
-    src/mac/carbon/textctrl.cpp
-    src/mac/carbon/timer.cpp
-    src/mac/carbon/tglbtn.cpp
-    src/mac/carbon/toolbar.cpp
-    src/mac/carbon/tooltip.cpp
-    src/mac/carbon/toplevel.cpp
-    src/mac/carbon/window.cpp
+<set var="OSX_CARBON_SRC" hints="files">
+    <!-- carbon files -->
+    $(OSX_CARBON_COCOA_SRC)
+    src/osx/carbon/bmpbuttn.cpp
+    src/osx/carbon/button.cpp
+    src/osx/carbon/checkbox.cpp
+    src/osx/carbon/choice.cpp
+    src/osx/carbon/colordlg.cpp
+    src/osx/carbon/dialog.cpp
+    src/osx/carbon/dirdlg.cpp
+    src/osx/carbon/evtloop.cpp
+    src/osx/carbon/filedlg.cpp
+    src/osx/carbon/gauge.cpp
+    src/osx/carbon/listbox.cpp
+    src/osx/carbon/listctrl_mac.cpp
+    src/osx/carbon/menu.cpp
+    src/osx/carbon/menuitem.cpp
+    src/osx/carbon/msgdlg.cpp
+    src/osx/carbon/nonownedwnd.cpp
+    src/osx/carbon/notebmac.cpp
+    src/osx/carbon/radiobut.cpp
+    src/osx/carbon/region.cpp
+    src/osx/carbon/scrolbar.cpp
+    src/osx/carbon/slider.cpp
+    src/osx/carbon/spinbutt.cpp
+    src/osx/carbon/srchctrl.cpp
+    src/osx/carbon/statbmp.cpp
+    src/osx/carbon/statbox.cpp
+    src/osx/carbon/statlmac.cpp
+    src/osx/carbon/stattext.cpp
+    src/osx/carbon/textctrl.cpp
+    src/osx/carbon/tglbtn.cpp
+    src/osx/carbon/toolbar.cpp
+    src/osx/carbon/tooltip.cpp
+    src/osx/carbon/window.cpp
+    
+    src/html/htmlctrl/webkit/webkit.mm
     <!-- Generic implementations used by wxMac: -->
     src/generic/caret.cpp
+    src/generic/clrpickerg.cpp
+    src/generic/collpaneg.cpp
     src/generic/fdrepdlg.cpp
+    src/generic/filepickerg.cpp
     src/generic/fontdlgg.cpp
+    src/generic/fontpickerg.cpp
     src/generic/listctrl.cpp
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
     src/generic/tabg.cpp
 </set>
 
-<!-- Header files like wx/mac/foo.h which include wx/mac/carbon/foo.h -->
-<set var="MAC_CMN_HDR" hints="files">
-    wx/mac/accel.h
-    wx/mac/aga.h
-    wx/mac/app.h
-    wx/mac/bitmap.h
-    wx/mac/bmpbuttn.h
-    wx/mac/brush.h
-    wx/mac/button.h
-    wx/mac/checkbox.h
-    wx/mac/checklst.h
-    wx/mac/chkconf.h
-    wx/mac/choice.h
-    wx/mac/clipbrd.h
-    wx/mac/colordlg.h
-    wx/mac/colour.h
-    wx/mac/combobox.h
-    wx/mac/control.h
-    wx/mac/cursor.h
-    wx/mac/dataform.h
-    wx/mac/dataobj.h
-    wx/mac/dataobj2.h
-    wx/mac/dc.h
-    wx/mac/dcclient.h
-    wx/mac/dcmemory.h
-    wx/mac/dcprint.h
-    wx/mac/dcscreen.h
-    wx/mac/dialog.h
-    wx/mac/dirdlg.h
-    wx/mac/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/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/srchctrl.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/tglbtn.h
-    wx/mac/toolbar.h
-    wx/mac/tooltip.h
-    wx/mac/toplevel.h
-    wx/mac/treectrl.h
-    wx/mac/uma.h
-    wx/mac/window.h
+<!-- Header files like wx/osx/foo.h which include wx/osx/carbon/foo.h -->
+<set var="OSX_SHARED_HDR" hints="files">
+    wx/osx/accel.h
+    wx/osx/app.h
+    wx/osx/bitmap.h
+    wx/osx/bmpbuttn.h
+    wx/osx/brush.h
+    wx/osx/button.h
+    wx/osx/checkbox.h
+    wx/osx/checklst.h
+    wx/osx/chkconf.h
+    wx/osx/choice.h
+    wx/osx/clipbrd.h
+    wx/osx/colordlg.h
+    wx/osx/colour.h
+    wx/osx/combobox.h
+    wx/osx/control.h
+    wx/osx/cursor.h
+    wx/osx/dataform.h
+    wx/osx/dataobj.h
+    wx/osx/dataobj2.h
+    wx/osx/dc.h
+    wx/osx/dcclient.h
+    wx/osx/dcmemory.h
+    wx/osx/dcprint.h
+    wx/osx/dcscreen.h
+    wx/osx/dialog.h
+    wx/osx/dirdlg.h
+    wx/osx/dnd.h
+    wx/osx/evtloop.h
+    wx/osx/filedlg.h
+    wx/osx/font.h
+    wx/osx/fontdlg.h
+    wx/osx/frame.h
+    wx/osx/gauge.h
+    wx/osx/helpxxxx.h
+    wx/osx/icon.h
+    wx/osx/imaglist.h
+    wx/osx/listbox.h
+    wx/osx/listctrl.h
+    wx/osx/mdi.h
+    wx/osx/menu.h
+    wx/osx/menuitem.h
+    wx/osx/metafile.h
+    wx/osx/mimetype.h
+    wx/osx/minifram.h
+    wx/osx/msgdlg.h
+    wx/osx/nonownedwnd.h
+    wx/osx/notebook.h
+    wx/osx/palette.h
+    wx/osx/pen.h
+    wx/osx/popupwin.h
+    wx/osx/pnghand.h
+    wx/osx/pngread.h
+    wx/osx/printdlg.h
+    wx/osx/printmac.h
+    wx/osx/private.h
+    wx/osx/radiobox.h
+    wx/osx/radiobut.h
+    wx/osx/region.h
+    wx/osx/scrolbar.h
+    wx/osx/slider.h
+    wx/osx/spinbutt.h
+    wx/osx/spinctrl.h
+    wx/osx/srchctrl.h
+    wx/osx/statbmp.h
+    wx/osx/statbox.h
+    wx/osx/statline.h
+    wx/osx/stattext.h
+    wx/osx/statusbr.h
+    wx/osx/tabctrl.h
+    wx/osx/taskbarosx.h
+    wx/osx/textctrl.h
+    wx/osx/tglbtn.h
+    wx/osx/toolbar.h
+    wx/osx/tooltip.h
+    wx/osx/toplevel.h
+    wx/osx/treectrl.h
+    wx/osx/uma.h
+    wx/osx/window.h
 </set>
 <!-- wxMac Carbon header files -->
-<set 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/private/mactext.h
-    wx/mac/carbon/private/overlay.h
-    wx/mac/carbon/private/print.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/srchctrl.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/tglbtn.h
-    wx/mac/carbon/toolbar.h
-    wx/mac/carbon/tooltip.h
-    wx/mac/carbon/toplevel.h
-    wx/mac/carbon/treectrl.h
-    wx/mac/carbon/uma.h
-    wx/mac/carbon/window.h
+<set var="OSX_CARBON_HDR" hints="files">
+    <!-- core files -->
+    wx/osx/core/colour.h
+    <!-- carbon files -->
+    wx/osx/carbon/accel.h
+    wx/osx/carbon/app.h
+    wx/osx/carbon/bitmap.h
+    wx/osx/carbon/bmpbuttn.h
+    wx/osx/carbon/button.h
+    wx/osx/carbon/checkbox.h
+    wx/osx/carbon/checklst.h
+    wx/osx/carbon/chkconf.h
+    wx/osx/carbon/choice.h
+    wx/osx/carbon/clipbrd.h
+    wx/osx/carbon/colordlg.h
+    wx/osx/carbon/combobox.h
+    wx/osx/carbon/control.h
+    wx/osx/carbon/cursor.h
+    wx/osx/carbon/dataform.h
+    wx/osx/carbon/dataobj.h
+    wx/osx/carbon/dataobj2.h
+    wx/osx/carbon/dc.h
+    wx/osx/carbon/dcclient.h
+    wx/osx/carbon/dcmemory.h
+    wx/osx/carbon/dcprint.h
+    wx/osx/carbon/dcscreen.h
+    wx/osx/carbon/dialog.h
+    wx/osx/carbon/dirdlg.h
+    wx/osx/carbon/dnd.h
+    wx/osx/carbon/evtloop.h
+    wx/osx/carbon/filedlg.h
+    wx/osx/carbon/font.h
+    wx/osx/carbon/fontdlg.h
+    wx/osx/carbon/frame.h
+    wx/osx/carbon/gauge.h
+    wx/osx/carbon/helpxxxx.h
+    wx/osx/carbon/icon.h
+    wx/osx/carbon/imaglist.h
+    wx/osx/carbon/listbox.h
+    wx/osx/carbon/listctrl.h
+    wx/osx/carbon/mdi.h
+    wx/osx/carbon/menu.h
+    wx/osx/carbon/menuitem.h
+    wx/osx/carbon/metafile.h
+    wx/osx/carbon/mimetype.h
+    wx/osx/carbon/minifram.h
+    wx/osx/carbon/msgdlg.h
+    wx/osx/carbon/nonownedwnd.h
+    wx/osx/carbon/notebook.h
+    wx/osx/carbon/palette.h
+    wx/osx/carbon/popupwin.h
+    wx/osx/carbon/pnghand.h
+    wx/osx/carbon/pngread.h
+    wx/osx/carbon/printdlg.h
+    wx/osx/carbon/printmac.h
+    wx/osx/carbon/private.h
+    wx/osx/carbon/private/mactext.h
+    wx/osx/carbon/private/overlay.h
+    wx/osx/carbon/private/print.h
+    wx/osx/carbon/radiobox.h
+    wx/osx/carbon/radiobut.h
+    wx/osx/carbon/region.h
+    wx/osx/carbon/scrolbar.h
+    wx/osx/carbon/slider.h
+    wx/osx/carbon/spinbutt.h
+    wx/osx/carbon/spinctrl.h
+    wx/osx/carbon/srchctrl.h
+    wx/osx/carbon/statbmp.h
+    wx/osx/carbon/statbox.h
+    wx/osx/carbon/statline.h
+    wx/osx/carbon/stattext.h
+    wx/osx/carbon/statusbr.h
+    wx/osx/carbon/tabctrl.h
+    wx/osx/carbon/textctrl.h
+    wx/osx/carbon/tglbtn.h
+    wx/osx/carbon/toolbar.h
+    wx/osx/carbon/tooltip.h
+    wx/osx/carbon/toplevel.h
+    wx/osx/carbon/treectrl.h
+    wx/osx/carbon/uma.h
+    wx/osx/carbon/window.h
     <!-- Generic implementations used by wxMac: -->
     wx/generic/caret.h
+    wx/generic/clrpickerg.h
+    wx/generic/collpaneg.h
     wx/generic/fdrepdlg.h
+    wx/generic/filepickerg.h
     wx/generic/fontdlgg.h
+    wx/generic/fontpickerg.h
     wx/generic/listctrl.h
     wx/generic/statusbr.h
     wx/generic/tabg.h
@@ -2392,6 +2486,69 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/html/webkit.h
 </set>
 
+<!-- ====================================================================== -->
+<!--                              wxMac/Cocoa                               -->
+<!-- ====================================================================== -->
+
+<set var="OSX_COCOA_SRC" hints="files">
+    $(OSX_CARBON_COCOA_SRC)
+    src/osx/cocoa/bmpbuttn.mm
+    src/osx/cocoa/button.mm
+    src/osx/cocoa/checkbox.mm
+    src/osx/cocoa/choice.mm
+    src/osx/cocoa/dialog.mm
+    src/osx/cocoa/dirdlg.mm
+    src/osx/cocoa/evtloop.mm
+    src/osx/cocoa/filedlg.mm
+    src/osx/cocoa/gauge.mm
+    src/osx/cocoa/listbox.mm
+    src/osx/cocoa/menu.mm
+    src/osx/cocoa/menuitem.mm
+    src/osx/cocoa/msgdlg.mm
+    src/osx/cocoa/nonownedwnd.mm
+    src/osx/cocoa/notebook.mm
+    src/osx/cocoa/radiobut.mm
+    src/osx/cocoa/scrolbar.mm
+    src/osx/cocoa/slider.mm
+    src/osx/cocoa/spinbutt.mm
+    src/osx/cocoa/srchctrl.mm
+    src/osx/cocoa/statbox.mm
+    src/osx/cocoa/statline.mm
+    src/osx/cocoa/stattext.mm
+    src/osx/cocoa/textctrl.mm
+    src/osx/cocoa/tglbtn.mm
+    src/osx/cocoa/toolbar.mm
+    src/osx/cocoa/tooltip.mm
+    src/osx/cocoa/window.mm
+    src/generic/caret.cpp
+    src/generic/clrpickerg.cpp
+    src/generic/collpaneg.cpp
+    src/generic/fdrepdlg.cpp
+    src/generic/filepickerg.cpp
+    src/generic/fontdlgg.cpp
+    src/generic/fontpickerg.cpp
+    src/generic/listctrl.cpp
+    src/generic/prntdlgg.cpp
+    src/generic/regiong.cpp
+    src/generic/statusbr.cpp
+    src/generic/tabg.cpp
+</set>
+<set var="OSX_COCOA_HDR" hints="files">
+    wx/osx/cocoa/chkconf.h
+    wx/osx/cocoa/private.h
+    $(OSX_CARBON_HDR) <!-- FIXME: these headers need moved somewhere shared... -->
+    wx/generic/region.h
+</set>
+
+<!-- ====================================================================== -->
+<!--                              wxMac/iPhone                              -->
+<!-- ====================================================================== -->
+
+<set var="OSX_IPHONE_SRC" hints="files">
+src/osx/iphone/nonownedwnd.mm
+src/osx/iphone/utils.mm
+src/osx/iphone/window.mm
+</set>
 
 <!-- ====================================================================== -->
 <!--                              wxCocoa                                   -->
@@ -2399,9 +2556,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="COCOA_LOWLEVEL_SRC" hints="files">
     <!-- Shared wxMac and wxCocoa files -->
-    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>
@@ -2445,7 +2601,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/font.cpp
+    src/cocoa/font.mm
     src/cocoa/fontdlg.mm
     src/cocoa/fontenum.mm
     src/cocoa/fontutil.cpp
@@ -2484,9 +2640,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <!-- 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/filepickerg.cpp
     src/generic/fontdlgg.cpp
+    src/generic/fontpickerg.cpp
     src/generic/imaglist.cpp
     src/generic/listctrl.cpp
     src/generic/msgdlgg.cpp
@@ -2571,8 +2731,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cocoa/objc/objc_uniquifying.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/fontpickerg.h
     wx/generic/imaglist.h
     wx/generic/listctrl.h
     wx/generic/paletteg.h
@@ -2597,11 +2760,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <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/filepickerg.cpp
     src/generic/fontdlgg.cpp
+    src/generic/fontpickerg.cpp
     src/generic/listctrl.cpp
     src/generic/mdig.cpp
     src/generic/msgdlgg.cpp
@@ -2612,7 +2779,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/univ/checkbox.cpp
     src/univ/checklst.cpp
     src/univ/choice.cpp
-    src/univ/colschem.cpp
     src/univ/combobox.cpp
     src/univ/control.cpp
     src/univ/ctrlrend.cpp
@@ -2629,6 +2795,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/univ/scrarrow.cpp
     src/univ/scrolbar.cpp
     src/univ/scrthumb.cpp
+    src/univ/settingsuniv.cpp
     src/univ/slider.cpp
     src/univ/spinbutt.cpp
     src/univ/statbmp.cpp
@@ -2646,10 +2813,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </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/filedlgg.h
+    wx/generic/filepickerg.h
     wx/generic/fontdlgg.h
+    wx/generic/fontpickerg.h
     wx/generic/listctrl.h
     wx/generic/mdig.h
     wx/generic/statusbr.h
@@ -2702,12 +2875,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <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/hyperlnkcmn.cpp
     src/generic/aboutdlgg.cpp
-    src/generic/animateg.cpp
     src/generic/bmpcboxg.cpp
-    src/generic/calctrl.cpp
+    src/generic/calctrlg.cpp
     src/generic/datavgen.cpp
     src/generic/datectlg.cpp
     src/generic/editlbox.cpp
@@ -2717,6 +2891,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/helpext.cpp
     src/generic/hyperlinkg.cpp
     src/generic/laywin.cpp
+    src/generic/notifmsgg.cpp
     src/generic/odcombo.cpp
     src/generic/propdlg.cpp
     src/generic/sashwin.cpp
@@ -2728,17 +2903,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="ADVANCED_CMN_HDR" hints="files">
     wx/aboutdlg.h
     wx/animate.h
-    wx/animdecod.h
     wx/bmpcbox.h
     wx/calctrl.h
     wx/dataview.h
+    wx/datectrl.h
     wx/dateevt.h
     wx/dcbuffer.h
     wx/editlbox.h
     wx/generic/aboutdlgg.h
-    wx/generic/animate.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
@@ -2747,6 +2921,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/helpext.h
     wx/generic/hyperlink.h
     wx/generic/laywin.h
+    wx/generic/notifmsg.h
     wx/generic/propdlg.h
     wx/generic/sashwin.h
     wx/generic/splash.h
@@ -2755,6 +2930,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/hyperlink.h
     wx/joystick.h
     wx/laywin.h
+    wx/notifmsg.h
     wx/odcombo.h
     wx/propdlg.h
     wx/sashwin.h
@@ -2765,27 +2941,32 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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">
     src/common/taskbarcmn.cpp
+    src/generic/animateg.cpp
     src/msw/aboutdlg.cpp
+    src/msw/notifmsg.cpp
     src/msw/sound.cpp
     src/msw/taskbar.cpp
 </set>
 <set var="ADVANCED_MSW_HDR" hints="files">
+    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">
+    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">
+    wx/msw/bmpcbox.h
+    wx/msw/calctrl.h
+    wx/msw/datecontrols.h
     wx/msw/datectrl.h
 </set>
 
@@ -2797,40 +2978,72 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/joystick.h
 </set>
 
-<set var="ADVANCED_MAC_SRC" hints="files">
+<set var="ADVANCED_OSX_CARBON_SRC" hints="files">
+    src/common/taskbarcmn.cpp
+    src/generic/animateg.cpp
+    src/osx/carbon/aboutdlg.cpp
+    src/osx/carbon/drawer.cpp
+    src/osx/carbon/dataview.cpp
+    src/osx/carbon/databrow.cpp
+    src/osx/carbon/sound.cpp
+    src/osx/carbon/taskbar.cpp
+    src/osx/core/hidjoystick.cpp
+</set>
+
+<set var="ADVANCED_OSX_CARBON_HDR" hints="files">
+    wx/generic/animate.h
+    wx/osx/dataview.h
+    wx/osx/joystick.h
+    wx/osx/sound.h
+    wx/osx/carbon/drawer.h
+    wx/osx/carbon/dataview.h
+    wx/osx/carbon/databrow.h
+    wx/osx/carbon/sound.h
+    wx/osx/carbon/taskbarosx.h
+    wx/osx/core/joystick.h
+</set>
+
+<set var="ADVANCED_OSX_COCOA_SRC" hints="files">
     src/common/taskbarcmn.cpp
-    src/mac/carbon/aboutdlg.cpp
-    src/mac/carbon/drawer.cpp
-    src/mac/carbon/dataview.cpp
-    src/mac/carbon/databrow.cpp
-    src/mac/carbon/sound.cpp
-    src/mac/carbon/taskbar.cpp
-    src/mac/corefoundation/hidjoystick.cpp
-</set>
-<set var="ADVANCED_MAC_HDR" hints="files">
-    wx/mac/carbon/drawer.h
-    wx/mac/carbon/dataview.h
-    wx/mac/carbon/databrow.h
-    wx/mac/carbon/sound.h
-    wx/mac/carbon/taskbarosx.h
-    wx/mac/corefoundation/joystick.h
+    src/generic/animateg.cpp
+    src/osx/cocoa/aboutdlg.mm
+    src/osx/cocoa/taskbar.mm
+    src/osx/core/hidjoystick.cpp
+</set>
+
+<set var="ADVANCED_OSX_COCOA_HDR" hints="files">
+    wx/generic/animate.h
+    wx/osx/dataview.h
+    wx/osx/joystick.h
+    wx/osx/sound.h
+    <!--wx/osx/carbon/drawer.h -->
+    <!--wx/osx/carbon/dataview.h -->
+    <!--wx/osx/carbon/databrow.h -->
+    wx/osx/carbon/sound.h
+    wx/osx/carbon/taskbarosx.h
+    wx/osx/core/joystick.h
 </set>
 
 <set var="ADVANCED_COCOA_SRC" hints="files">
     src/cocoa/taskbar.mm
     src/common/taskbarcmn.cpp
-    src/mac/corefoundation/hidjoystick.cpp
+    src/generic/animateg.cpp
+    src/osx/core/hidjoystick.cpp
 </set>
+
 <set var="ADVANCED_COCOA_HDR" hints="files">
     wx/cocoa/taskbar.h
-    wx/mac/corefoundation/joystick.h
+    wx/generic/animate.h
+    wx/osx/core/joystick.h
 </set>
 
 <set var="ADVANCED_OS2_SRC" hints="files">
+    src/generic/animateg.cpp
     src/os2/joystick.cpp
     src/os2/sound.cpp
 </set>
 <set var="ADVANCED_OS2_HDR" hints="files">
+    wx/generic/animate.h
     wx/os2/joystick.h
     wx/os2/sound.h
 </set>
@@ -2847,24 +3060,53 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/unix/taskbarx11.h
 </set>
 
+<set var="ADVANCED_MOTIF_SRC" hints="files">
+    src/generic/animateg.cpp
+</set>
+
+<set var="ADVANCED_MOTIF_HDR" hints="files">
+    wx/generic/animate.h
+</set>
+
 <set var="ADVANCED_GTK_SRC" hints="files">
+    src/gtk/taskbar.cpp
+    src/gtk/eggtrayicon.c
+    src/gtk/hildon/notifmsg.cpp
+</set>
+<set var="ADVANCED_GTK_HDR" hints="files">
+    wx/gtk/hildon/notifmsg.h
+</set>
+
+<set var="ADVANCED_GTK_NATIVE_SRC" hints="files">
     src/gtk/aboutdlg.cpp
     src/gtk/animate.cpp
+    src/gtk/bmpcbox.cpp
+    src/gtk/calctrl.cpp
     src/gtk/dataview.cpp
     src/gtk/hyperlink.cpp
-    src/gtk/taskbar.cpp
-    src/gtk/eggtrayicon.c
 </set>
-<set var="ADVANCED_GTK_HDR" hints="files">
+<set var="ADVANCED_GTK_NATIVE_HDR" hints="files">
     wx/gtk/animate.h
+    wx/gtk/bmpcbox.h
+    wx/gtk/calctrl.h
+    wx/gtk/dataview.h
     wx/gtk/hyperlink.h
 </set>
 
 <set var="ADVANCED_GTK1_SRC" hints="files">
+    src/generic/animateg.cpp
     src/gtk1/eggtrayicon.c
     src/gtk1/taskbar.cpp
 </set>
 <set var="ADVANCED_GTK1_HDR" hints="files">
+    wx/generic/animate.h
+</set>
+
+<set var="ADVANCED_UNIV_SRC" hints="files">
+    src/generic/animateg.cpp
+</set>
+<set var="ADVANCED_UNIV_HDR" hints="files">
+    wx/generic/animate.h
 </set>
 
 <!-- ====================================================================== -->
@@ -2894,10 +3136,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="MEDIA_MSW_DESKTOP_HDR" hints="files">
 </set>
 
-<set var="MEDIA_MAC_SRC" hints="files">
-    src/mac/carbon/mediactrl.cpp
+<set var="MEDIA_OSX_CARBON_SRC" hints="files">
+    src/osx/carbon/mediactrl.cpp
+</set>
+<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_MAC_HDR" hints="files">
+<set var="MEDIA_OSX_COCOA_HDR" hints="files">
 </set>
 
 <set var="MEDIA_COCOA_SRC" hints="files">
@@ -3055,6 +3303,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/xmladv.cpp
     src/xrc/xmlrsall.cpp
 </set>
 <set var="XRC_HDR" hints="files">
@@ -3140,8 +3389,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <set var="OPENGL_SRC_PLATFORM" hints="files">
-    src/common/glcmn.cpp
-    <if cond="TOOLKIT=='MAC'">src/mac/carbon/glcanvas.cpp</if>
+    <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=='GTK' and TOOLKIT_VERSION=='2'">
         src/gtk/glcanvas.cpp
@@ -3164,7 +3413,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="OPENGL_HDR_PLATFORM" hints="files">
-    <if cond="TOOLKIT=='MAC'">wx/mac/glcanvas.h wx/mac/carbon/glcanvas.h</if>
+    <if cond="TOOLKIT=='OSX_CARBON'">wx/osx/glcanvas.h wx/osx/carbon/glcanvas.h</if>
     <if cond="TOOLKIT=='COCOA'">wx/cocoa/glcanvas.h</if>
     <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
         wx/gtk/glcanvas.h
@@ -3186,28 +3435,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </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>
-
-
 <!-- ====================================================================== -->
 <!--                             Misc plugin sources:                       -->
 <!-- ====================================================================== -->
@@ -3225,6 +3452,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/auibar.cpp
     src/aui/tabmdi.cpp
 </set>
 <set var="AUI_HDR" hints="files">
@@ -3232,10 +3460,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/auibar.h
     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                        -->
 <!-- ====================================================================== -->
@@ -3286,34 +3541,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 -->
-    <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 -->
-        <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>
-        <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="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">
-        <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_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 -->
@@ -3322,22 +3576,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 -->
-    <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 -->
-        <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>
-        <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>
@@ -3357,7 +3612,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_SRC)</if>
         <if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_SRC) $(NET_WINCE_SRC)</if>
         <if cond="PLATFORM_MACOSX=='1'">$(NET_UNIX_SRC)</if>
-        <if cond="PLATFORM_MACOS=='1'">$(NET_MAC_CARBONLIB_SRC)</if>
         <if cond="PLATFORM_OS2=='1'">$(NET_OS2_SRC)</if>
     </set>
     <set var="NET_PLATFORM_HDR" hints="files">
@@ -3365,7 +3619,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_HDR) $(NET_WINCE_HDR)</if>
         <if cond="PLATFORM_OS2=='1'">$(NET_OS2_HDR)</if>
         <if cond="PLATFORM_MACOSX=='1'">$(NET_UNIX_HDR)</if>
-        <if cond="PLATFORM_MACOS=='1'">$(NET_MAC_CARBONLIB_HDR)</if>
     </set>
 
     <set var="NET_SRC" hints="files">
@@ -3381,7 +3634,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=='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>
@@ -3394,7 +3648,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=='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>
@@ -3402,13 +3657,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <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>
-        <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>
@@ -3418,17 +3679,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=='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'">
-            $(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'">
-            $(LOWLEVEL_SRC) $(UNIV_SRC) $(UNIV_THEMES_SRC) $(GUI_CMN_SRC)
+            $(LOWLEVEL_SRC) $(PLATFORM_SRC) $(UNIV_SRC) $(UNIV_THEMES_SRC) $(GUI_CMN_SRC)
         </if>
     </set>
 
@@ -3436,9 +3698,10 @@ 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>
-        <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)</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>
@@ -3448,9 +3711,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <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)</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>
@@ -3460,28 +3724,31 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
     <!-- 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=='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>
 
     <set var="ADVANCED_SRC" hints="files">
         <if cond="WXUNIV=='0'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC) $(ADVANCED_PLATFORM_NATIVE_SRC)</if>
-        <if cond="WXUNIV=='1'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC)</if>
+        <if cond="WXUNIV=='1'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC) $(ADVANCED_UNIV_SRC)</if>
     </set>
     <set var="ADVANCED_HDR" hints="files">
-        <if cond="WXUNIV=='0'">$(ADVANCED_CMN_HDR) $(ADVANCED_CMN_NATIVE_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_PLATFORM_NATIVE_HDR)</if>
-        <if cond="WXUNIV=='1'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR)</if>
+        <if cond="WXUNIV=='0'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_PLATFORM_NATIVE_HDR)</if>
+        <if cond="WXUNIV=='1'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_UNIV_HDR)</if>
     </set>
 
     <!-- wxMedia files: -->
     <set var="MEDIA_PLATFORM_SRC" hints="files">
         <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_SRC) $(MEDIA_MSW_DESKTOP_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_SRC)</if>
-        <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>
@@ -3491,7 +3758,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="MEDIA_PLATFORM_HDR" hints="files">
         <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_HDR) $(MEDIA_MSW_DESKTOP_HDR)</if>
         <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_HDR)</if>
-        <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>
@@ -3513,8 +3780,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
             $(LOWLEVEL_HDR)
             $(GUI_CORE_HEADERS)
             $(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
-            $(OPENGL_HDR) $(QA_HDR) $(DBGRID_HDR) $(XRC_HDR) $(AUI_HDR) $(RICHTEXT_HDR)
-            $(STC_HDR)
+            $(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(PROPGRID_HDR)
+            $(RICHTEXT_HDR) $(STC_HDR)
         </if>
     </set>
 
@@ -3522,7 +3789,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="ALL_BASE_HEADERS" make_var="1" hints="files">
         $(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
         $(NET_CMN_HDR) $(NET_PLATFORM_HDR)
-        $(XML_HDR) $(ODBC_HDR)
+        $(XML_HDR)
     </set>
     <set var="ALL_HEADERS" make_var="1" hints="files">
         $(ALL_BASE_HEADERS) $(ALL_GUI_HEADERS)
@@ -3534,7 +3801,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(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)
@@ -3542,24 +3809,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(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)
-        $(BASE_MAC_SRC)
+        $(BASE_OSX_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)
         $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_WINCE_SRC)
-        $(XML_SRC) $(ODBC_SRC)
+        $(XML_SRC)
     </set>