synchronize GTK2 minimum version in docs

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

index 979f455b8cc4c59603855daf6ae72990f95a4099..2f827564444975dfb00c12972aff63eda518295e 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -58,28 +58,33 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <set var="BASE_UNIX_AND_DARWIN_SRC" hints="files">
      src/common/fdiodispatcher.cpp
      src/common/selectdispatcher.cpp
  <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/appunix.cpp
-    src/unix/evtloopunix.cpp
+    src/unix/dir.cpp
      src/unix/dlunix.cpp
      src/unix/dlunix.cpp
+    src/unix/epolldispatcher.cpp
+    src/unix/evtloopunix.cpp
+    src/unix/fdiounix.cpp
      src/unix/snglinst.cpp
      src/unix/snglinst.cpp
+    src/unix/stackwalk.cpp
      src/unix/stdpaths.cpp
      src/unix/timerunx.cpp
      src/unix/stdpaths.cpp
      src/unix/timerunx.cpp
-    src/unix/stackwalk.cpp
+    src/unix/threadpsx.cpp
      src/unix/utilsunx.cpp
      src/unix/utilsunx.cpp
+    src/unix/fswatcher_kqueue.cpp
  </set>
  
  <set var="BASE_UNIX_AND_DARWIN_HDR" hints="files">
  </set>
  
  <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/evtloop.h
      wx/unix/app.h
      wx/unix/apptbase.h
      wx/unix/apptrait.h
      wx/unix/chkconf.h
      wx/unix/evtloop.h
+    wx/unix/evtloopsrc.h
      wx/unix/pipe.h
      wx/unix/stdpaths.h
      wx/unix/stackwalk.h
      wx/unix/pipe.h
      wx/unix/stdpaths.h
      wx/unix/stackwalk.h
+    wx/unix/tls.h
+    wx/unix/fswatcher_kqueue.h
  </set>
  
  <!--
  </set>
  
  <!--
@@ -89,16 +94,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
   -->
  <set var="BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC" hints="files">
      $(BASE_UNIX_AND_DARWIN_SRC)
   -->
  <set var="BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC" hints="files">
      $(BASE_UNIX_AND_DARWIN_SRC)
-    src/unix/dir.cpp
      src/unix/mimetype.cpp
      src/unix/mimetype.cpp
-    src/unix/threadpsx.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>
  
  <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>
  
  <!--
  </set>
  
  <!--
@@ -109,11 +111,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
   -->
  <set var="BASE_UNIX_SRC" hints="files">
      $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)
   -->
  <set var="BASE_UNIX_SRC" hints="files">
      $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)
-    src/common/gsocketiohandler.cpp
+    src/unix/fswatcher_inotify.cpp
  </set>
  <set var="BASE_UNIX_HDR" hints="files">
      $(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR)
  </set>
  <set var="BASE_UNIX_HDR" hints="files">
      $(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR)
-    wx/private/gsocketiohandler.h
+    wx/unix/fswatcher_inotify.h
  </set>
  
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
  </set>
  
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
@@ -137,6 +139,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/msw/timer.cpp
      src/msw/utils.cpp
      src/msw/utilsexc.cpp
      src/msw/timer.cpp
      src/msw/utils.cpp
      src/msw/utilsexc.cpp
+    src/msw/fswatcher.cpp
  </set>
  <set var="BASE_AND_GUI_WIN32_SRC" hints="files">
      src/msw/evtloop.cpp
  </set>
  <set var="BASE_AND_GUI_WIN32_SRC" hints="files">
      src/msw/evtloop.cpp
@@ -168,6 +171,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/msw/wrapcctl.h
      wx/msw/wrapcdlg.h
      wx/msw/wrapwin.h
      wx/msw/wrapcctl.h
      wx/msw/wrapcdlg.h
      wx/msw/wrapwin.h
+    wx/msw/fswatcher.h
  </set>
  <set var="BASE_WINCE_HDR" hints="files">
      <if cond="TOOLKIT=='WINCE'">
  </set>
  <set var="BASE_WINCE_HDR" hints="files">
      <if cond="TOOLKIT=='WINCE'">
@@ -180,81 +184,54 @@ 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/gsockosx.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/evtloop_cf.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/cfdataref.h
-    wx/mac/corefoundation/cfref.h
-    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/thread.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/objcid.h
+    wx/osx/core/private.h
+    wx/osx/core/stdpaths.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
-    src/mac/carbon/utilsexc.cpp
-</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)
-    $(BASE_UNIX_AND_DARWIN_SRC)
+<!-- 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)
-    $(BASE_UNIX_AND_DARWIN_HDR)
+
+<set var="BASE_AND_GUI_OSX_COCOA_SRC" hints="files">
+    src/osx/cocoa/utils.mm
+</set>
+
+<set var="BASE_AND_GUI_OSX_IPHONE_SRC" hints="files">
+    src/osx/iphone/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">
+<set var="BASE_OSX_NOTWXMAC_SRC" hints="files">
      $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)
      $(BASE_COREFOUNDATION_SRC)
  </set>
      $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)
      $(BASE_COREFOUNDATION_SRC)
  </set>
-<set var="BASE_MACOSX_NOTWXMAC_HDR" hints="files">
+<set var="BASE_OSX_NOTWXMAC_HDR" hints="files">
      $(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR)
      $(BASE_COREFOUNDATION_HDR)
  </set>
      $(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR)
      $(BASE_COREFOUNDATION_HDR)
  </set>
@@ -266,12 +243,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
  <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/unix/appunix.cpp
      src/unix/evtloopunix.cpp
      src/unix/timerunx.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
@@ -280,9 +257,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <set var="BASE_AND_GUI_OS2_SRC" hints="files">
  </set>
  <set var="BASE_OS2_HDR" hints="files">
  <set var="BASE_AND_GUI_OS2_SRC" hints="files">
  </set>
  <set var="BASE_OS2_HDR" hints="files">
-    wx/private/fdiodispatcher.h
-    wx/private/selectdispatcher.h
-    wx/private/gsocketiohandler.h
      wx/unix/app.h
      wx/os2/apptbase.h
      wx/os2/apptrait.h
      wx/unix/app.h
      wx/os2/apptbase.h
      wx/os2/apptrait.h
@@ -294,35 +268,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/os2/wxrsc.h
  </set>
  
      wx/os2/wxrsc.h
  </set>
  
-<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
-<!--                              PalmOS                                    -->
-<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
-
-<set var="BASE_PALMOS_SRC" hints="files">
-    src/palmos/base.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
-</set>
-
-<set var="BASE_AND_GUI_PALMOS_SRC" hints="files">
-    src/palmos/main.cpp
-    src/palmos/volume.cpp
-</set>
-
-<set var="BASE_PALMOS_HDR" hints="files">
-    wx/palmos/apptbase.h
-    wx/palmos/apptrait.h
-    wx/palmos/chkconf.h
-    wx/palmos/mimetype.h
-    wx/palmos/missing.h
-    wx/palmos/stdpaths.h
-</set>
-
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
  <!--                               MSDOS                                    -->
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
  <!--                               MSDOS                                    -->
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
@@ -342,6 +287,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <!--                              Common                                    -->
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
  <set var="BASE_CMN_SRC" hints="files">
  <!--                              Common                                    -->
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
  <set var="BASE_CMN_SRC" hints="files">
+    src/common/any.cpp
      src/common/appbase.cpp
      src/common/arcall.cpp
      src/common/arcfind.cpp
      src/common/appbase.cpp
      src/common/arcall.cpp
      src/common/arcfind.cpp
@@ -353,6 +299,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/common/config.cpp
      src/common/convauto.cpp
      src/common/datetime.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/datstrm.cpp
      src/common/dircmn.cpp
      src/common/dynarray.cpp
@@ -378,6 +325,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/common/init.cpp
      src/common/intl.cpp
      src/common/ipcbase.cpp
      src/common/init.cpp
      src/common/intl.cpp
      src/common/ipcbase.cpp
+    src/common/languageinfo.cpp
      src/common/list.cpp
      src/common/log.cpp
      src/common/longlong.cpp
      src/common/list.cpp
      src/common/log.cpp
      src/common/longlong.cpp
@@ -385,6 +333,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/common/mimecmn.cpp
      src/common/module.cpp
      src/common/mstream.cpp
      src/common/mimecmn.cpp
      src/common/module.cpp
      src/common/mstream.cpp
+    src/common/numformatter.cpp
      src/common/object.cpp
      src/common/platinfo.cpp
      src/common/powercmn.cpp
      src/common/object.cpp
      src/common/platinfo.cpp
      src/common/powercmn.cpp
@@ -392,6 +341,7 @@ 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/stopwatch.cpp
      src/common/strconv.cpp
      src/common/stream.cpp
@@ -403,12 +353,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/common/tarstrm.cpp
      src/common/textbuf.cpp
      src/common/textfile.cpp
      src/common/tarstrm.cpp
      src/common/textbuf.cpp
      src/common/textfile.cpp
+    src/common/time.cpp
      src/common/timercmn.cpp
      src/common/timerimpl.cpp
      src/common/tokenzr.cpp
      src/common/timercmn.cpp
      src/common/timerimpl.cpp
      src/common/tokenzr.cpp
+    src/common/translation.cpp
      src/common/txtstrm.cpp
      src/common/unichar.cpp
      src/common/uri.cpp
      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/variant.cpp
      src/common/wfstream.cpp
      src/common/wxcrt.cpp
@@ -418,6 +371,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/common/xtistrm.cpp
      src/common/zipstrm.cpp
      src/common/zstream.cpp
      src/common/xtistrm.cpp
      src/common/zipstrm.cpp
      src/common/zstream.cpp
+    src/common/fswatchercmn.cpp
+    src/generic/fswatcherg.cpp
  </set>
  <set var="BASE_AND_GUI_CMN_SRC" hints="files">
      src/common/event.cpp
  </set>
  <set var="BASE_AND_GUI_CMN_SRC" hints="files">
      src/common/event.cpp
@@ -427,6 +382,8 @@ 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/any.h
+    wx/anystr.h
      wx/app.h
      wx/apptrait.h
      wx/archive.h
      wx/app.h
      wx/apptrait.h
      wx/archive.h
@@ -438,6 +395,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/buffer.h
      wx/build.h
      wx/chartype.h
      wx/buffer.h
      wx/build.h
      wx/chartype.h
+    wx/checkeddelete.h
      wx/chkconf.h
      wx/clntdata.h
      wx/cmdargs.h
      wx/chkconf.h
      wx/clntdata.h
      wx/cmdargs.h
@@ -455,11 +413,14 @@ 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/encconv.h
      wx/event.h
      wx/dynarray.h
      wx/dynlib.h
      wx/dynload.h
      wx/encconv.h
      wx/event.h
+    wx/eventfilter.h
+    wx/evtloop.h
      wx/except.h
      wx/features.h
      wx/flags.h
      wx/except.h
      wx/features.h
      wx/flags.h
@@ -486,6 +447,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/ioswrap.h
      wx/ipc.h
      wx/ipcbase.h
      wx/ioswrap.h
      wx/ipc.h
      wx/ipcbase.h
+    wx/kbdstate.h
+    wx/language.h
      wx/link.h
      wx/list.h
      wx/listimpl.cpp
      wx/link.h
      wx/list.h
      wx/listimpl.cpp
@@ -497,8 +460,11 @@ 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/msgout.h
+    wx/msgqueue.h
      wx/mstream.h
      wx/mstream.h
+    wx/numformatter.h
      wx/object.h
      wx/platform.h
      wx/platinfo.h
      wx/object.h
      wx/platform.h
      wx/platinfo.h
@@ -508,12 +474,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/ptr_shrd.h
      wx/recguard.h
      wx/regex.h
      wx/ptr_shrd.h
      wx/recguard.h
      wx/regex.h
+    wx/rtti.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/stockitem.h
      wx/stopwatch.h
      wx/strconv.h
@@ -528,17 +499,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/textfile.h
      wx/thread.h
      wx/thrimpl.cpp
      wx/textfile.h
      wx/thread.h
      wx/thrimpl.cpp
+    wx/time.h
      wx/timer.h
      wx/timer.h
+    wx/tls.h
      wx/tokenzr.h
      wx/tracker.h
      wx/tokenzr.h
      wx/tracker.h
+    wx/translation.h
      wx/txtstrm.h
      wx/txtstrm.h
+    wx/typeinfo.h
      wx/types.h
      wx/unichar.h
      wx/uri.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/utils.h
      wx/variant.h
      wx/vector.h
      wx/version.h
+    wx/versioninfo.h
      wx/volume.h
      wx/weakref.h
      wx/wfstream.h
      wx/volume.h
      wx/weakref.h
      wx/wfstream.h
@@ -550,13 +527,22 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/wxprec.h
      wx/xlocale.h
      wx/xti.h
      wx/wxprec.h
      wx/xlocale.h
      wx/xti.h
+    wx/xti2.h
      wx/xtistrm.h
      wx/xtistrm.h
+    wx/xtictor.h
+    wx/xtihandler.h
+    wx/xtiprop.h
+    wx/xtitypes.h
      wx/zipstrm.h
      wx/zstream.h
      wx/meta/convertible.h
      wx/meta/if.h
      wx/zipstrm.h
      wx/zstream.h
      wx/meta/convertible.h
      wx/meta/if.h
+    wx/meta/implicitconversion.h
      wx/meta/int2type.h
      wx/meta/movable.h
      wx/meta/int2type.h
      wx/meta/movable.h
+    wx/meta/pod.h
+    wx/fswatcher.h
+    wx/generic/fswatcher.h
  </set>
  
  
  </set>
  
  
@@ -565,19 +551,19 @@ 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/gsockmsw.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
  </set>
  
  <set var="NET_WINCE_SRC" hints="files">
  </set>
  
  <set var="NET_WINCE_SRC" hints="files">
@@ -588,17 +574,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">
@@ -615,10 +591,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
@@ -648,17 +624,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/common/accelcmn.cpp
      src/common/accesscmn.cpp
      src/common/anidecod.cpp
      src/common/accelcmn.cpp
      src/common/accesscmn.cpp
      src/common/anidecod.cpp
+    src/common/affinematrix2d.cpp
      src/common/appcmn.cpp
      src/common/artprov.cpp
      src/common/artstd.cpp
      src/common/appcmn.cpp
      src/common/artprov.cpp
      src/common/artstd.cpp
+    src/common/arttango.cpp
      src/common/bmpbase.cpp
      src/common/bmpbase.cpp
+    src/common/bmpbtncmn.cpp
      src/common/bookctrl.cpp
      src/common/btncmn.cpp
      src/common/cairo.cpp
      src/common/bookctrl.cpp
      src/common/btncmn.cpp
      src/common/cairo.cpp
+    src/common/checkboxcmn.cpp
+    src/common/checklstcmn.cpp
      src/common/choiccmn.cpp
      src/common/clipcmn.cpp
      src/common/clrpickercmn.cpp
      src/common/colourcmn.cpp
      src/common/choiccmn.cpp
      src/common/clipcmn.cpp
      src/common/clrpickercmn.cpp
      src/common/colourcmn.cpp
+    src/common/colourdata.cpp
      src/common/combocmn.cpp
      src/common/cmdproc.cpp
      src/common/cmndata.cpp
      src/common/combocmn.cpp
      src/common/cmdproc.cpp
      src/common/cmndata.cpp
@@ -666,11 +648,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/common/cshelp.cpp
      src/common/ctrlcmn.cpp
      src/common/ctrlsub.cpp
      src/common/cshelp.cpp
      src/common/ctrlcmn.cpp
      src/common/ctrlsub.cpp
-    src/common/datacmn.cpp
      src/common/dcbase.cpp
      src/common/dcbufcmn.cpp
      src/common/dcgraph.cpp
      src/common/dcsvg.cpp
      src/common/dcbase.cpp
      src/common/dcbufcmn.cpp
      src/common/dcgraph.cpp
      src/common/dcsvg.cpp
+    src/common/dirctrlcmn.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
@@ -681,10 +663,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/common/effects.cpp
      src/common/fddlgcmn.cpp
      src/common/filectrlcmn.cpp
      src/common/effects.cpp
      src/common/fddlgcmn.cpp
      src/common/filectrlcmn.cpp
+    src/common/filehistorycmn.cpp
      src/common/filepickercmn.cpp
      src/common/fontpickercmn.cpp
      src/common/fldlgcmn.cpp
      src/common/fontcmn.cpp
      src/common/filepickercmn.cpp
      src/common/fontpickercmn.cpp
      src/common/fldlgcmn.cpp
      src/common/fontcmn.cpp
+    src/common/fontdata.cpp
+    src/generic/graphicc.cpp
      src/common/fontenumcmn.cpp
      src/common/fontmap.cpp
      src/common/fontutilcmn.cpp
      src/common/fontenumcmn.cpp
      src/common/fontmap.cpp
      src/common/fontutilcmn.cpp
@@ -695,6 +680,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
@@ -713,22 +700,36 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/common/layout.cpp
      src/common/lboxcmn.cpp
      src/common/listctrlcmn.cpp
      src/common/layout.cpp
      src/common/lboxcmn.cpp
      src/common/listctrlcmn.cpp
+    src/common/markupparser.cpp
      src/common/matrix.cpp
      src/common/menucmn.cpp
      src/common/matrix.cpp
      src/common/menucmn.cpp
+    src/common/mousemanager.cpp
      src/common/nbkbase.cpp
      src/common/overlaycmn.cpp
      src/common/nbkbase.cpp
      src/common/overlaycmn.cpp
+    src/common/ownerdrwcmn.cpp
      src/common/paper.cpp
      src/common/paper.cpp
+    src/common/panelcmn.cpp
+    src/common/persist.cpp
      src/common/pickerbase.cpp
      src/common/popupcmn.cpp
      src/common/prntbase.cpp
      src/common/quantize.cpp
      src/common/pickerbase.cpp
      src/common/popupcmn.cpp
      src/common/prntbase.cpp
      src/common/quantize.cpp
+    src/common/radiobtncmn.cpp
      src/common/radiocmn.cpp
      src/common/radiocmn.cpp
+    src/common/rearrangectrl.cpp
      src/common/rendcmn.cpp
      src/common/rgncmn.cpp
      src/common/rendcmn.cpp
      src/common/rgncmn.cpp
+    src/common/scrolbarcmn.cpp
      src/common/settcmn.cpp
      src/common/sizer.cpp
      src/common/settcmn.cpp
      src/common/sizer.cpp
+    src/common/slidercmn.cpp
+    src/common/spinbtncmn.cpp
+    src/common/spinctrlcmn.cpp
      src/common/srchcmn.cpp
      src/common/statbar.cpp
      src/common/srchcmn.cpp
      src/common/statbar.cpp
+    src/common/statbmpcmn.cpp
+    src/common/statboxcmn.cpp
+    src/common/statlinecmn.cpp
      src/common/stattextcmn.cpp
      src/common/stockitem.cpp
      src/common/tbarbase.cpp
      src/common/stattextcmn.cpp
      src/common/stockitem.cpp
      src/common/tbarbase.cpp
@@ -736,11 +737,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/common/textentrycmn.cpp
      src/common/toplvcmn.cpp
      src/common/treebase.cpp
      src/common/textentrycmn.cpp
      src/common/toplvcmn.cpp
      src/common/treebase.cpp
+    src/common/uiactioncmn.cpp
      src/common/valgen.cpp
      src/common/validate.cpp
      src/common/valtext.cpp
      src/common/valgen.cpp
      src/common/validate.cpp
      src/common/valtext.cpp
+    src/common/valnum.cpp
      src/common/wincmn.cpp
      src/common/windowid.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/common/xpmdecod.cpp
      src/generic/busyinfo.cpp
      src/generic/buttonbar.cpp
@@ -751,18 +755,24 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/generic/dirctrlg.cpp
      src/generic/dragimgg.cpp
      src/generic/filectrlg.cpp
      src/generic/dirctrlg.cpp
      src/generic/dragimgg.cpp
      src/generic/filectrlg.cpp
+    src/generic/headerctrlg.cpp
+    src/generic/infobar.cpp
      src/generic/listbkg.cpp
      src/generic/logg.cpp
      src/generic/listbkg.cpp
      src/generic/logg.cpp
+    src/generic/markuptext.cpp
+    src/generic/msgdlgg.cpp
      src/generic/numdlgg.cpp
      src/generic/numdlgg.cpp
-    src/generic/panelg.cpp
      src/generic/progdlgg.cpp
      src/generic/printps.cpp
      src/generic/renderg.cpp
      src/generic/progdlgg.cpp
      src/generic/printps.cpp
      src/generic/renderg.cpp
+    src/generic/richmsgdlgg.cpp
      src/generic/scrlwing.cpp
      src/generic/selstore.cpp
      src/generic/spinctlg.cpp
      src/generic/splitter.cpp
      src/generic/srchctlg.cpp
      src/generic/scrlwing.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
@@ -772,6 +782,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/generic/vscroll.cpp
  </set>
  <set var="GUI_CMN_HDR" hints="files">
      src/generic/vscroll.cpp
  </set>
  <set var="GUI_CMN_HDR" hints="files">
+    wx/affinematrix2dbase.h
+    wx/affinematrix2d.h
+    wx/anybutton.h
      wx/bmpbuttn.h
      wx/brush.h
      wx/button.h
      wx/bmpbuttn.h
      wx/brush.h
      wx/button.h
@@ -784,9 +797,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/collpane.h
      wx/combo.h
      wx/combobox.h
      wx/collpane.h
      wx/combo.h
      wx/combobox.h
+    wx/compositewin.h
      wx/control.h
      wx/ctrlsub.h
      wx/cursor.h
      wx/control.h
      wx/ctrlsub.h
      wx/cursor.h
+    wx/custombgwin.h
      wx/dc.h
      wx/dcclient.h
      wx/dcgraph.h
      wx/dc.h
      wx/dcclient.h
      wx/dcgraph.h
@@ -808,10 +823,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/generic/choicdgg.h
      wx/generic/colrdlgg.h
      wx/generic/combo.h
      wx/generic/choicdgg.h
      wx/generic/colrdlgg.h
      wx/generic/combo.h
+    wx/generic/custombgwin.h
      wx/generic/dcpsg.h
      wx/generic/dirctrlg.h
      wx/generic/dragimgg.h
      wx/generic/filectrlg.h
      wx/generic/dcpsg.h
      wx/generic/dirctrlg.h
      wx/generic/dragimgg.h
      wx/generic/filectrlg.h
+    wx/generic/headerctrlg.h
+    wx/generic/infobar.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
@@ -820,19 +838,27 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/generic/prntdlgg.h
      wx/generic/printps.h
      wx/generic/progdlgg.h
      wx/generic/prntdlgg.h
      wx/generic/printps.h
      wx/generic/progdlgg.h
+    wx/generic/richmsgdlgg.h
      wx/generic/scrolwin.h
      wx/generic/spinctlg.h
      wx/generic/splitter.h
      wx/generic/srchctlg.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/treectlg.h
      wx/graphics.h
      wx/generic/textdlgg.h
      wx/generic/treectlg.h
      wx/graphics.h
+    wx/headercol.h
+    wx/headerctrl.h
      wx/helphtml.h
      wx/icon.h
      wx/helphtml.h
      wx/icon.h
+    wx/infobar.h
+    wx/itemid.h
      wx/layout.h
      wx/listbox.h
      wx/mdi.h
      wx/menu.h
      wx/layout.h
      wx/listbox.h
      wx/mdi.h
      wx/menu.h
+    wx/mousemanager.h
      wx/msgdlg.h
      wx/nativewin.h
      wx/numdlg.h
      wx/msgdlg.h
      wx/nativewin.h
      wx/numdlg.h
@@ -843,7 +869,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/position.h
      wx/radiobox.h
      wx/radiobut.h
      wx/position.h
      wx/radiobox.h
      wx/radiobut.h
+    wx/range.h
+    wx/rearrangectrl.h
      wx/renderer.h
      wx/renderer.h
+    wx/richmsgdlg.h
      wx/scrolbar.h
      wx/scrolbar.h
      wx/scrolwin.h
      wx/scrolbar.h
      wx/scrolbar.h
      wx/scrolwin.h
@@ -855,14 +884,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/statbox.h
      wx/stattext.h
      wx/statusbr.h
      wx/statbox.h
      wx/stattext.h
      wx/statusbr.h
+    wx/textcompleter.h
      wx/textctrl.h
      wx/textdlg.h
      wx/textentry.h
      wx/textctrl.h
      wx/textdlg.h
      wx/textentry.h
+    wx/textwrapper.h
      wx/toolbar.h
      wx/validate.h
      wx/valtext.h
      wx/toolbar.h
      wx/validate.h
      wx/valtext.h
+    wx/valnum.h
      wx/window.h
      wx/windowid.h
      wx/window.h
      wx/windowid.h
+    wx/withimages.h
+    wx/wrapsizer.h
      wx/wupdlock.h
  
      wx/accel.h
      wx/wupdlock.h
  
      wx/accel.h
@@ -881,6 +915,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/cmdproc.h
      wx/colordlg.h
      wx/colour.h
      wx/cmdproc.h
      wx/colordlg.h
      wx/colour.h
+    wx/colourdata.h
      wx/cshelp.h
      wx/dataobj.h
      wx/dcmirror.h
      wx/cshelp.h
      wx/dataobj.h
      wx/dcmirror.h
@@ -893,13 +928,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/docmdi.h
      wx/docview.h
      wx/effects.h
      wx/docmdi.h
      wx/docview.h
      wx/effects.h
-    wx/evtloop.h
+    wx/evtloopsrc.h
      wx/fdrepdlg.h
      wx/filectrl.h
      wx/fdrepdlg.h
      wx/filectrl.h
+    wx/filehistory.h
      wx/filepicker.h
      wx/fontpicker.h
      wx/fmappriv.h
      wx/font.h
      wx/filepicker.h
      wx/fontpicker.h
      wx/fmappriv.h
      wx/font.h
+    wx/fontdata.h
      wx/fontdlg.h
      wx/fontenum.h
      wx/fontutil.h
      wx/fontdlg.h
      wx/fontenum.h
      wx/fontutil.h
@@ -933,6 +970,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      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/splitter.h
+    wx/persist/toplevel.h
+    wx/persist/treebook.h
+    wx/persist/window.h
      wx/pickerbase.h
      wx/popupwin.h
      wx/print.h
      wx/pickerbase.h
      wx/popupwin.h
      wx/print.h
@@ -948,8 +991,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/splitter.h
      wx/srchctrl.h
      wx/statline.h
      wx/splitter.h
      wx/srchctrl.h
      wx/statline.h
-    wx/tab.h
-    wx/tabctrl.h
      wx/tbarbase.h
      wx/tglbtn.h
      wx/tipwin.h
      wx/tbarbase.h
      wx/tglbtn.h
      wx/tipwin.h
@@ -959,6 +1000,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/treebase.h
      wx/treebook.h
      wx/treectrl.h
      wx/treebase.h
      wx/treebook.h
      wx/treectrl.h
+    wx/uiaction.h
      wx/valgen.h
      wx/vidmode.h
      wx/vlbox.h
      wx/valgen.h
      wx/vidmode.h
      wx/vlbox.h
@@ -984,10 +1026,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/generic/caret.cpp
      src/generic/imaglist.cpp
      src/unix/dialup.cpp
      src/generic/caret.cpp
      src/generic/imaglist.cpp
      src/unix/dialup.cpp
+    src/unix/displayx11.cpp
      src/unix/fontenum.cpp
      src/unix/fontutil.cpp
      src/unix/fontenum.cpp
      src/unix/fontutil.cpp
+    src/unix/uiactionx11.cpp
      src/unix/utilsx11.cpp
      src/unix/utilsx11.cpp
-    src/unix/displayx11.cpp
  </set>
  <set var="XWIN_LOWLEVEL_HDR" hints="files">
      wx/generic/caret.h
  </set>
  <set var="XWIN_LOWLEVEL_HDR" hints="files">
      wx/generic/caret.h
@@ -1001,12 +1044,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <!--                                wxGTK                                   -->
  <!-- ====================================================================== -->
  
  <!--                                wxGTK                                   -->
  <!-- ====================================================================== -->
  
+<set var="GTK_PLATFORM_SRC" hints="files">
+    <if cond="PLATFORM_UNIX=='1'">$(XWIN_LOWLEVEL_SRC)</if>
+</set>
+<set var="GTK_PLATFORM_HDR" hints="files">
+    <if cond="PLATFORM_UNIX=='1'">$(XWIN_LOWLEVEL_HDR)</if>
+</set>
  <set var="GTK_LOWLEVEL_SRC" hints="files">
  <set var="GTK_LOWLEVEL_SRC" hints="files">
-    $(XWIN_LOWLEVEL_SRC)
+    $(GTK_PLATFORM_SRC)
      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/assertdlg_gtk.cpp
      src/gtk/bitmap.cpp
      src/gtk/brush.cpp
      src/gtk/clipbrd.cpp
      src/gtk/bitmap.cpp
      src/gtk/brush.cpp
      src/gtk/clipbrd.cpp
@@ -1014,17 +1063,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/gtk/cursor.cpp
      src/gtk/dataobj.cpp
      src/gtk/dc.cpp
      src/gtk/cursor.cpp
      src/gtk/dataobj.cpp
      src/gtk/dc.cpp
-    src/gtk/dcclient.cpp
-    src/gtk/dcmemory.cpp
-    src/gtk/dcscreen.cpp
      src/gtk/dnd.cpp
      src/gtk/evtloop.cpp
      src/gtk/filectrl.cpp
      src/gtk/dnd.cpp
      src/gtk/evtloop.cpp
      src/gtk/filectrl.cpp
+    src/gtk/filehistory.cpp
      src/gtk/font.cpp
      src/gtk/font.cpp
-    src/gtk/gsockgtk.cpp
+    src/gtk/sockgtk.cpp
      src/gtk/minifram.cpp
      src/gtk/minifram.cpp
+    src/gtk/nonownedwnd.cpp
      src/gtk/pen.cpp
      src/gtk/popupwin.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
@@ -1035,8 +1084,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/gtk/win_gtk.cpp
      src/gtk/window.cpp
  </set>
      src/gtk/win_gtk.cpp
      src/gtk/window.cpp
  </set>
+<set var="GTK2_LOWLEVEL_SRC" hints="files">
+    $(GTK_LOWLEVEL_SRC)
+    src/gtk/dcclient.cpp
+    src/gtk/dcmemory.cpp
+    src/gtk/dcscreen.cpp
+</set>
  <set var="GTK_LOWLEVEL_HDR" hints="files">
  <set var="GTK_LOWLEVEL_HDR" hints="files">
-    $(XWIN_LOWLEVEL_HDR)
+    $(GTK_PLATFORM_HDR)
      wx/generic/icon.h
      wx/generic/paletteg.h
      wx/gtk/app.h
      wx/generic/icon.h
      wx/generic/paletteg.h
      wx/gtk/app.h
@@ -1049,13 +1104,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/gtk/dataform.h
      wx/gtk/dataobj.h
      wx/gtk/dataobj2.h
      wx/gtk/dataform.h
      wx/gtk/dataobj.h
      wx/gtk/dataobj2.h
-    wx/gtk/dc.h
-    wx/gtk/dcclient.h
-    wx/gtk/dcmemory.h
-    wx/gtk/dcscreen.h
      wx/gtk/dnd.h
      wx/gtk/dnd.h
+    wx/gtk/evtloop.h
+    wx/gtk/evtloopsrc.h
      wx/gtk/font.h
      wx/gtk/font.h
+    wx/gtk/filehistory.h
      wx/gtk/minifram.h
      wx/gtk/minifram.h
+    wx/gtk/nonownedwnd.h
      wx/gtk/pen.h
      wx/gtk/popupwin.h
      wx/gtk/region.h
      wx/gtk/pen.h
      wx/gtk/popupwin.h
      wx/gtk/region.h
@@ -1069,15 +1124,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/generic/fdrepdlg.cpp
      <!-- Needed as long as we support GTK+ < 2.6 -->
      src/generic/filepickerg.cpp
      src/generic/fdrepdlg.cpp
      <!-- Needed as long as we support GTK+ < 2.6 -->
      src/generic/filepickerg.cpp
-    src/generic/graphicc.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
-    <!-- Generic implementations used by wxGPE: -->
-    src/generic/fontdlgg.cpp
-    src/generic/msgdlgg.cpp
      <!-- GTK+ specific files: -->
      <!-- GTK+ specific files: -->
+    src/gtk/anybutton.cpp
      src/gtk/artgtk.cpp
      src/gtk/bmpbuttn.cpp
      src/gtk/button.cpp
      src/gtk/artgtk.cpp
      src/gtk/bmpbuttn.cpp
      src/gtk/button.cpp
@@ -1097,9 +1148,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/gtk/fontdlg.cpp
      src/gtk/frame.cpp
      src/gtk/gauge.cpp
      src/gtk/fontdlg.cpp
      src/gtk/frame.cpp
      src/gtk/gauge.cpp
-    src/gtk/gnome/gprint.cpp
      src/gtk/gnome/gvfs.cpp
      src/gtk/gnome/gvfs.cpp
-    src/gtk/print.cpp
+    src/gtk/infobar.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
@@ -1107,6 +1157,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/gtk/msgdlg.cpp
      src/gtk/nativewin.cpp
      src/gtk/notebook.cpp
      src/gtk/msgdlg.cpp
      src/gtk/nativewin.cpp
      src/gtk/notebook.cpp
+    src/gtk/print.cpp
      src/gtk/radiobox.cpp
      src/gtk/radiobut.cpp
      src/gtk/scrolbar.cpp
      src/gtk/radiobox.cpp
      src/gtk/radiobut.cpp
      src/gtk/scrolbar.cpp
@@ -1118,20 +1169,26 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/gtk/statbox.cpp
      src/gtk/statline.cpp
      src/gtk/stattext.cpp
      src/gtk/statbox.cpp
      src/gtk/statline.cpp
      src/gtk/stattext.cpp
-    src/gtk/tbargtk.cpp
+    src/gtk/toolbar.cpp
      src/gtk/textctrl.cpp
      src/gtk/textentry.cpp
      src/gtk/tglbtn.cpp
      src/gtk/treeentry_gtk.c
  </set>
      src/gtk/textctrl.cpp
      src/gtk/textentry.cpp
      src/gtk/tglbtn.cpp
      src/gtk/treeentry_gtk.c
  </set>
+<set var="GTK2_SRC" hints="files">
+    $(GTK_SRC)
+    <!-- Generic implementations used by wxGPE: -->
+    src/generic/fontdlgg.cpp
+    <!-- GTK+ specific files: -->
+    src/gtk/gnome/gprint.cpp
+</set>
  <set var="GTK_HDR" hints="files">
      wx/generic/fdrepdlg.h
      wx/generic/filepickerg.h
  <set var="GTK_HDR" hints="files">
      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/accel.h
+    wx/gtk/anybutton.h
      wx/gtk/bmpbuttn.h
      wx/gtk/button.h
      wx/gtk/checkbox.h
      wx/gtk/bmpbuttn.h
      wx/gtk/button.h
      wx/gtk/checkbox.h
@@ -1152,15 +1209,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/gtk/fontdlg.h
      wx/gtk/frame.h
      wx/gtk/gauge.h
      wx/gtk/fontdlg.h
      wx/gtk/frame.h
      wx/gtk/gauge.h
-    wx/gtk/gnome/gprint.h
      wx/gtk/gnome/gvfs.h
      wx/gtk/gnome/gvfs.h
-    wx/gtk/print.h
+    wx/gtk/infobar.h
      wx/gtk/listbox.h
      wx/gtk/mdi.h
      wx/gtk/menu.h
      wx/gtk/menuitem.h
      wx/gtk/msgdlg.h
      wx/gtk/notebook.h
      wx/gtk/listbox.h
      wx/gtk/mdi.h
      wx/gtk/menu.h
      wx/gtk/menuitem.h
      wx/gtk/msgdlg.h
      wx/gtk/notebook.h
+    wx/gtk/print.h
      wx/gtk/radiobox.h
      wx/gtk/radiobut.h
      wx/gtk/scrolbar.h
      wx/gtk/radiobox.h
      wx/gtk/radiobut.h
      wx/gtk/scrolbar.h
@@ -1172,13 +1229,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/gtk/statbox.h
      wx/gtk/statline.h
      wx/gtk/stattext.h
      wx/gtk/statbox.h
      wx/gtk/statline.h
      wx/gtk/stattext.h
-    wx/gtk/tbargtk.h
+    wx/gtk/toolbar.h
      wx/gtk/textctrl.h
      wx/gtk/textentry.h
      wx/gtk/tglbtn.h
      wx/gtk/textctrl.h
      wx/gtk/textentry.h
      wx/gtk/tglbtn.h
-    wx/gtk/treectrl.h
      wx/gtk/treeentry_gtk.h
  </set>
      wx/gtk/treeentry_gtk.h
  </set>
+<set var="GTK2_HDR" hints="files">
+    wx/generic/fontdlgg.h
+    wx/gtk/gnome/gprint.h
+</set>
  
  
  <!-- ====================================================================== -->
  
  
  <!-- ====================================================================== -->
@@ -1204,7 +1264,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
@@ -1260,10 +1320,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/generic/fontdlgg.cpp
      src/generic/fontpickerg.cpp
      src/generic/listctrl.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/prntdlgg.cpp
      src/generic/statusbr.cpp
-    src/generic/tabg.cpp
      <!-- GTK1 specific files: -->
      src/gtk1/bmpbuttn.cpp
      src/gtk1/button.cpp
      <!-- GTK1 specific files: -->
      src/gtk1/bmpbuttn.cpp
      src/gtk1/button.cpp
@@ -1280,6 +1338,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/gtk1/listbox.cpp
      src/gtk1/mdi.cpp
      src/gtk1/menu.cpp
      src/gtk1/listbox.cpp
      src/gtk1/mdi.cpp
      src/gtk1/menu.cpp
+    src/gtk1/mnemonics.cpp
      src/gtk1/notebook.cpp
      src/gtk1/radiobox.cpp
      src/gtk1/radiobut.cpp
      src/gtk1/notebook.cpp
      src/gtk1/radiobox.cpp
      src/gtk1/radiobut.cpp
@@ -1292,7 +1351,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/gtk1/statbox.cpp
      src/gtk1/statline.cpp
      src/gtk1/stattext.cpp
      src/gtk1/statbox.cpp
      src/gtk1/statline.cpp
      src/gtk1/stattext.cpp
-    src/gtk1/tbargtk.cpp
+    src/gtk1/toolbar.cpp
      src/gtk1/textctrl.cpp
      src/gtk1/tglbtn.cpp
  </set>
      src/gtk1/textctrl.cpp
      src/gtk1/tglbtn.cpp
  </set>
@@ -1308,7 +1367,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/generic/fontpickerg.h
      wx/generic/listctrl.h
      wx/generic/statusbr.h
      wx/generic/fontpickerg.h
      wx/generic/listctrl.h
      wx/generic/statusbr.h
-    wx/generic/tabg.h
      wx/gtk1/accel.h
      wx/gtk1/bmpbuttn.h
      wx/gtk1/button.h
      wx/gtk1/accel.h
      wx/gtk1/bmpbuttn.h
      wx/gtk1/button.h
@@ -1339,7 +1397,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/gtk1/statbox.h
      wx/gtk1/statline.h
      wx/gtk1/stattext.h
      wx/gtk1/statbox.h
      wx/gtk1/statline.h
      wx/gtk1/stattext.h
-    wx/gtk1/tbargtk.h
+    wx/gtk1/toolbar.h
      wx/gtk1/textctrl.h
      wx/gtk1/tglbtn.h
      wx/gtk1/treectrl.h
      wx/gtk1/textctrl.h
      wx/gtk1/tglbtn.h
      wx/gtk1/treectrl.h
@@ -1394,11 +1452,10 @@ 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/menu.cpp
      src/motif/menuitem.cpp
      src/motif/minifram.cpp
@@ -1431,6 +1488,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/generic/fontdlgg.cpp
      src/generic/fontpickerg.cpp
      src/generic/listctrl.cpp
      src/generic/fontdlgg.cpp
      src/generic/fontpickerg.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
@@ -1448,6 +1506,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/generic/fontdlgg.h
      wx/generic/fontpickerg.h
      wx/generic/listctrl.h
      wx/generic/fontdlgg.h
      wx/generic/fontpickerg.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
@@ -1484,7 +1543,6 @@ 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/menu.h
      wx/motif/menuitem.h
      wx/motif/minifram.h
@@ -1586,6 +1644,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
@@ -1613,6 +1672,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/msw/icon.cpp
      src/msw/imaglist.cpp
      src/msw/minifram.cpp
      src/msw/icon.cpp
      src/msw/imaglist.cpp
      src/msw/minifram.cpp
+    src/msw/nonownedwnd.cpp
      src/msw/ole/dataobj.cpp
      src/msw/ole/dropsrc.cpp
      src/msw/ole/droptgt.cpp
      src/msw/ole/dataobj.cpp
      src/msw/ole/dropsrc.cpp
      src/msw/ole/droptgt.cpp
@@ -1627,11 +1687,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/msw/settings.cpp
      src/msw/tooltip.cpp
      src/msw/toplevel.cpp
      src/msw/settings.cpp
      src/msw/tooltip.cpp
      src/msw/toplevel.cpp
+    src/msw/uiaction.cpp
      src/msw/utilsgui.cpp
      src/msw/uxtheme.cpp
      src/msw/window.cpp
  </set>
  <set var="MSW_LOWLEVEL_HDR" hints="files">
      src/msw/utilsgui.cpp
      src/msw/uxtheme.cpp
      src/msw/window.cpp
  </set>
  <set var="MSW_LOWLEVEL_HDR" hints="files">
+    wx/msw/nonownedwnd.h
+    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
@@ -1658,6 +1721,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      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/anybutton.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
@@ -1672,6 +1737,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/msw/filedlg.cpp
      src/msw/frame.cpp
      src/msw/gauge.cpp
      src/msw/filedlg.cpp
      src/msw/frame.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
@@ -1685,8 +1751,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/msw/notebook.cpp
      src/msw/ole/access.cpp
      src/msw/ownerdrw.cpp
      src/msw/notebook.cpp
      src/msw/ole/access.cpp
      src/msw/ownerdrw.cpp
+    src/msw/panel.cpp
+    src/msw/progdlg.cpp
      src/msw/radiobox.cpp
      src/msw/radiobut.cpp
      src/msw/radiobox.cpp
      src/msw/radiobut.cpp
+    src/msw/richmsgdlg.cpp
      src/msw/scrolbar.cpp
      src/msw/slider.cpp
      src/msw/spinbutt.cpp
      src/msw/scrolbar.cpp
      src/msw/slider.cpp
      src/msw/spinbutt.cpp
@@ -1696,7 +1765,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/msw/statusbar.cpp
      src/msw/statline.cpp
      src/msw/stattext.cpp
      src/msw/statusbar.cpp
      src/msw/statline.cpp
      src/msw/stattext.cpp
-    src/msw/tabctrl.cpp
      src/msw/toolbar.cpp
      src/msw/textctrl.cpp
      src/msw/textentry.cpp
      src/msw/toolbar.cpp
      src/msw/textctrl.cpp
      src/msw/textentry.cpp
@@ -1709,6 +1777,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/generic/filepickerg.h
      wx/generic/fontpickerg.h
      wx/msw/accel.h
      wx/generic/filepickerg.h
      wx/generic/fontpickerg.h
      wx/msw/accel.h
+    wx/msw/anybutton.h
      wx/msw/app.h
      wx/msw/bitmap.h
      wx/msw/bmpbuttn.h
      wx/msw/app.h
      wx/msw/bitmap.h
      wx/msw/bmpbuttn.h
@@ -1725,6 +1794,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/msw/control.h
      wx/msw/ctrlsub.h
      wx/msw/cursor.h
      wx/msw/control.h
      wx/msw/ctrlsub.h
      wx/msw/cursor.h
+    wx/msw/custombgwin.h
      wx/msw/dc.h
      wx/msw/dcclient.h
      wx/msw/dcmemory.h
      wx/msw/dc.h
      wx/msw/dcclient.h
      wx/msw/dcmemory.h
@@ -1741,9 +1811,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/msw/frame.h
      wx/msw/gauge.h
      wx/msw/gdiimage.h
      wx/msw/frame.h
      wx/msw/gauge.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
+    wx/msw/init.h
      wx/msw/listbox.h
      wx/msw/listctrl.h
      wx/msw/mdi.h
      wx/msw/listbox.h
      wx/msw/listctrl.h
      wx/msw/mdi.h
@@ -1762,16 +1834,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/msw/ole/dropsrc.h
      wx/msw/ole/droptgt.h
      wx/msw/ole/oleutils.h
      wx/msw/ole/dropsrc.h
      wx/msw/ole/droptgt.h
      wx/msw/ole/oleutils.h
+    wx/msw/ownerdrw.h
      wx/msw/palette.h
      wx/msw/palette.h
+    wx/msw/panel.h
      wx/msw/pen.h
      wx/msw/printdlg.h
      wx/msw/printwin.h
      wx/msw/pen.h
      wx/msw/printdlg.h
      wx/msw/printwin.h
+    wx/msw/progdlg.h
      wx/msw/radiobox.h
      wx/msw/radiobut.h
      wx/msw/region.h
      wx/msw/rcdefs.h
      wx/msw/radiobox.h
      wx/msw/radiobut.h
      wx/msw/region.h
      wx/msw/rcdefs.h
+    wx/msw/richmsgdlg.h
      wx/msw/scrolbar.h
      wx/msw/scrolbar.h
-    wx/msw/setup0.h
      wx/msw/slider.h
      wx/msw/spinbutt.h
      wx/msw/spinctrl.h
      wx/msw/slider.h
      wx/msw/spinbutt.h
      wx/msw/spinctrl.h
@@ -1780,7 +1855,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/msw/statusbar.h
      wx/msw/statline.h
      wx/msw/stattext.h
      wx/msw/statusbar.h
      wx/msw/statline.h
      wx/msw/stattext.h
-    wx/msw/tabctrl.h
      wx/msw/toolbar.h
      wx/msw/textctrl.h
      wx/msw/textentry.h
      wx/msw/toolbar.h
      wx/msw/textctrl.h
      wx/msw/textentry.h
@@ -1870,69 +1944,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  </set>
  
  
  </set>
  
  
-<!-- ====================================================================== -->
-<!--                                wxMGL                                   -->
-<!-- ====================================================================== -->
-
-<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/imaglist.cpp
-    src/generic/mask.cpp
-    src/generic/timer.cpp
-    src/mgl/app.cpp
-    src/mgl/bitmap.cpp
-    src/mgl/brush.cpp
-    src/mgl/clipbrd.cpp
-    src/mgl/cursor.cpp
-    src/mgl/data.cpp
-    src/mgl/dc.cpp
-    src/mgl/dcclient.cpp
-    src/mgl/dcmemory.cpp
-    src/mgl/dcscreen.cpp
-    src/mgl/dirmgl.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/region.cpp
-    src/mgl/settings.cpp
-    src/mgl/toplevel.cpp
-    src/mgl/utils.cpp
-    src/mgl/window.cpp
-</set>
-<set var="MGL_LOWLEVEL_HDR" hints="files">
-    wx/generic/caret.h
-    wx/generic/colour.h
-    wx/generic/icon.h
-    wx/generic/imaglist.h
-    wx/generic/mask.h
-    wx/mgl/app.h
-    wx/mgl/bitmap.h
-    wx/mgl/brush.h
-    wx/mgl/chkconf.h
-    wx/mgl/clipbrd.h
-    wx/mgl/cursor.h
-    wx/mgl/dc.h
-    wx/mgl/dcclient.h
-    wx/mgl/dcmemory.h
-    wx/mgl/dcscreen.h
-    wx/mgl/font.h
-    wx/mgl/palette.h
-    wx/mgl/pen.h
-    wx/mgl/popupwin.h
-    wx/mgl/private.h
-    wx/mgl/region.h
-    wx/mgl/toplevel.h
-    wx/mgl/window.h
-</set>
-
-
  <!-- ====================================================================== -->
  <!--                                wxDFB                                   -->
  <!-- ====================================================================== -->
  <!-- ====================================================================== -->
  <!--                                wxDFB                                   -->
  <!-- ====================================================================== -->
@@ -1944,7 +1955,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/generic/icon.cpp
      src/generic/imaglist.cpp
      src/generic/mask.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
@@ -2054,7 +2064,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
@@ -2063,6 +2073,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
@@ -2083,7 +2094,6 @@ 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/textentry.cpp
      src/os2/tglbtn.cpp
      src/os2/textctrl.cpp
      src/os2/textentry.cpp
      src/os2/tglbtn.cpp
@@ -2144,6 +2154,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/os2/minifram.h
      wx/os2/msgdlg.h
      wx/os2/notebook.h
      wx/os2/minifram.h
      wx/os2/msgdlg.h
      wx/os2/notebook.h
+    wx/os2/ownerdrw.h
      wx/os2/palette.h
      wx/os2/pen.h
      wx/os2/pnghand.h
      wx/os2/palette.h
      wx/os2/pen.h
      wx/os2/pnghand.h
@@ -2154,7 +2165,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/os2/region.h
      wx/os2/scrolbar.h
      wx/os2/settings.h
      wx/os2/region.h
      wx/os2/scrolbar.h
      wx/os2/settings.h
-    wx/os2/setup0.h
      wx/os2/slider.h
      wx/os2/spinbutt.h
      wx/os2/spinctrl.h
      wx/os2/slider.h
      wx/os2/spinbutt.h
      wx/os2/spinctrl.h
@@ -2162,7 +2172,6 @@ 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/textentry.h
      wx/os2/tglbtn.h
      wx/os2/textctrl.h
      wx/os2/textentry.h
      wx/os2/tglbtn.h
@@ -2175,318 +2184,369 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  
  
  <!-- ====================================================================== -->
  
  
  <!-- ====================================================================== -->
-<!--                                wxMac                                   -->
+<!--                                wxOSX Common                            -->
  <!-- ====================================================================== -->
  
  <!-- ====================================================================== -->
  
-<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/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/uiaction_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/anybutton_osx.cpp
+    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/combobox_osx.cpp
+    src/osx/dnd_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/textentry_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
+    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/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 -->
      <!-- cocoa bridge -->
-    src/mac/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/nonownedwnd.cpp
-    src/mac/carbon/notebmac.cpp
-    src/mac/carbon/overlay.cpp
-    src/mac/carbon/palette.cpp
-    src/mac/carbon/pen.cpp
-    src/mac/carbon/popupwin.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
-    <!-- Generic implementations used by wxMac: -->
+    src/osx/carbon/utilscocoa.mm
+    <!-- Generic implementations used by wxOSX: -->
      src/generic/caret.cpp
      src/generic/clrpickerg.cpp
      src/generic/collpaneg.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/fontpickerg.cpp
      src/generic/listctrl.cpp
      src/generic/prntdlgg.cpp
      src/generic/statusbr.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
+</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/gsockmac.h
-    wx/mac/helpxxxx.h
-    wx/mac/icon.h
-    wx/mac/imaglist.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/nonownedwnd.h
-    wx/mac/notebook.h
-    wx/mac/palette.h
-    wx/mac/pen.h
-    wx/mac/popupwin.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/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
-</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/nonownedwnd.h
-    wx/mac/carbon/notebook.h
-    wx/mac/carbon/palette.h
-    wx/mac/carbon/pen.h
-    wx/mac/carbon/popupwin.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
-    <!-- Generic implementations used by wxMac: -->
+<!-- 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/anybutton.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/evtloopsrc.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/textentry.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/clrpickerg.h
      wx/generic/collpaneg.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/fontpickerg.h
      wx/generic/listctrl.h
      wx/generic/filepickerg.h
      wx/generic/fontdlgg.h
      wx/generic/fontpickerg.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>
  
  </set>
  
+<!-- ====================================================================== -->
+<!--                              wxOSX/Carbon                              -->
+<!-- ====================================================================== -->
+
+<set var="OSX_CARBON_SRC" hints="files">
+    <!-- carbon files -->
+    $(OSX_CARBON_COCOA_SRC)
+    src/osx/carbon/anybutton.cpp
+    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/dnd.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>
+
+<!-- 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/region.h
+    wx/osx/carbon/statbmp.h
+    wx/osx/carbon/uma.h
+</set>
+
+<!-- ====================================================================== -->
+<!--                              wxOSX/Cocoa                               -->
+<!-- ====================================================================== -->
+
+<set var="OSX_COCOA_SRC" hints="files">
+    $(OSX_CARBON_COCOA_SRC)
+    src/osx/cocoa/anybutton.mm
+    src/osx/cocoa/button.mm
+    src/osx/cocoa/checkbox.mm
+    src/osx/cocoa/choice.mm
+    src/osx/cocoa/colour.mm
+    src/osx/cocoa/combobox.mm
+    src/osx/cocoa/dialog.mm
+    src/osx/cocoa/dirdlg.mm
+    src/osx/cocoa/dnd.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>
+
+<!-- ====================================================================== -->
+<!--                              wxOSX/iPhone                              -->
+<!-- ====================================================================== -->
+
+<set var="OSX_IPHONE_SRC" hints="files">
+    $(OSX_CARBON_COCOA_SRC)
+    src/generic/regiong.cpp
+    src/generic/icon.cpp
+    <!-- iphone files -->
+    src/osx/iphone/anybutton.mm
+    src/osx/iphone/button.mm
+    src/osx/iphone/checkbox.mm
+    src/osx/iphone/dialog.mm
+    src/osx/iphone/evtloop.mm
+    src/osx/iphone/gauge.mm
+    src/osx/iphone/msgdlg.mm
+    src/osx/iphone/nonownedwnd.mm
+    src/osx/iphone/scrolbar.mm
+    src/osx/iphone/slider.mm
+    src/osx/iphone/stattext.mm
+    src/osx/iphone/textctrl.mm
+    src/osx/iphone/toolbar.mm
+    src/osx/iphone/utils.mm
+    src/osx/iphone/window.mm
+</set>
+
+<set var="OSX_IPHONE_HDR" hints="files">
+    wx/osx/iphone/chkconf.h
+    wx/osx/iphone/evtloop.h
+    wx/osx/iphone/private.h
+    $(OSX_CARBON_HDR) <!-- FIXME: these headers need moved somewhere shared... -->
+    wx/generic/region.h
+</set>
  
  <!-- ====================================================================== -->
  <!--                              wxCocoa                                   -->
  
  <!-- ====================================================================== -->
  <!--                              wxCocoa                                   -->
@@ -2494,8 +2554,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/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>
@@ -2587,11 +2647,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/generic/fontpickerg.cpp
      src/generic/imaglist.cpp
      src/generic/listctrl.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/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
@@ -2634,6 +2692,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
@@ -2679,7 +2738,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/generic/paletteg.h
      wx/generic/region.h
      wx/generic/statusbr.h
      wx/generic/paletteg.h
      wx/generic/region.h
      wx/generic/statusbr.h
-    wx/generic/tabg.h
  </set>
  
  
  </set>
  
  
@@ -2709,15 +2767,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/generic/fontpickerg.cpp
      src/generic/listctrl.cpp
      src/generic/mdig.cpp
      src/generic/fontpickerg.cpp
      src/generic/listctrl.cpp
      src/generic/mdig.cpp
-    src/generic/msgdlgg.cpp
      src/generic/prntdlgg.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
@@ -2734,6 +2789,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
@@ -2764,7 +2820,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      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/anybutton.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
@@ -2775,6 +2831,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/univ/colschem.h
      wx/univ/combobox.h
      wx/univ/control.h
      wx/univ/colschem.h
      wx/univ/combobox.h
      wx/univ/control.h
+    wx/univ/custombgwin.h
      wx/univ/dialog.h
      wx/univ/frame.h
      wx/univ/gauge.h
      wx/univ/dialog.h
      wx/univ/frame.h
      wx/univ/gauge.h
@@ -2784,6 +2841,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/univ/menu.h
      wx/univ/menuitem.h
      wx/univ/notebook.h
      wx/univ/menu.h
      wx/univ/menuitem.h
      wx/univ/notebook.h
+    wx/univ/panel.h
      wx/univ/radiobox.h
      wx/univ/radiobut.h
      wx/univ/renderer.h
      wx/univ/radiobox.h
      wx/univ/radiobut.h
      wx/univ/renderer.h
@@ -2813,16 +2871,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/gridcmn.cpp
      src/common/hyperlnkcmn.cpp
      src/common/hyperlnkcmn.cpp
+    src/common/odcombocmn.cpp
+    src/common/richtooltipcmn.cpp
      src/generic/aboutdlgg.cpp
      src/generic/aboutdlgg.cpp
+    src/generic/bannerwindow.cpp
      src/generic/bmpcboxg.cpp
      src/generic/bmpcboxg.cpp
-    src/generic/calctrl.cpp
+    src/generic/calctrlg.cpp
+    src/generic/commandlinkbuttong.cpp
      src/generic/datavgen.cpp
      src/generic/datectlg.cpp
      src/generic/editlbox.cpp
      src/generic/grid.cpp
      src/generic/gridctrl.cpp
      src/generic/datavgen.cpp
      src/generic/datectlg.cpp
      src/generic/editlbox.cpp
      src/generic/grid.cpp
      src/generic/gridctrl.cpp
+    src/generic/grideditors.cpp
      src/generic/gridsel.cpp
      src/generic/helpext.cpp
      src/generic/hyperlinkg.cpp
      src/generic/gridsel.cpp
      src/generic/helpext.cpp
      src/generic/hyperlinkg.cpp
@@ -2830,29 +2896,39 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/generic/notifmsgg.cpp
      src/generic/odcombo.cpp
      src/generic/propdlg.cpp
      src/generic/notifmsgg.cpp
      src/generic/odcombo.cpp
      src/generic/propdlg.cpp
+    src/generic/richtooltipg.cpp
      src/generic/sashwin.cpp
      src/generic/splash.cpp
      src/generic/sashwin.cpp
      src/generic/splash.cpp
+    src/generic/timectrlg.cpp
      src/generic/tipdlg.cpp
      src/generic/tipdlg.cpp
+    src/generic/treelist.cpp
      src/generic/wizard.cpp
  </set>
  
  <set var="ADVANCED_CMN_HDR" hints="files">
      wx/aboutdlg.h
      wx/animate.h
      src/generic/wizard.cpp
  </set>
  
  <set var="ADVANCED_CMN_HDR" hints="files">
      wx/aboutdlg.h
      wx/animate.h
+    wx/bannerwindow.h
      wx/bmpcbox.h
      wx/calctrl.h
      wx/bmpcbox.h
      wx/calctrl.h
+    wx/commandlinkbutton.h
      wx/dataview.h
      wx/datectrl.h
      wx/dateevt.h
      wx/dataview.h
      wx/datectrl.h
      wx/dateevt.h
+    wx/datetimectrl.h
      wx/dcbuffer.h
      wx/dcbuffer.h
+    wx/dvrenderers.h
      wx/editlbox.h
      wx/generic/aboutdlgg.h
      wx/generic/bmpcbox.h
      wx/editlbox.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/datectrl.h
      wx/generic/dataview.h
+    wx/generic/dvrenderer.h
+    wx/generic/dvrenderers.h
      wx/generic/grid.h
      wx/generic/gridctrl.h
      wx/generic/grid.h
      wx/generic/gridctrl.h
+    wx/generic/grideditors.h
      wx/generic/gridsel.h
      wx/generic/helpext.h
      wx/generic/hyperlink.h
      wx/generic/gridsel.h
      wx/generic/helpext.h
      wx/generic/hyperlink.h
@@ -2861,6 +2937,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/generic/propdlg.h
      wx/generic/sashwin.h
      wx/generic/splash.h
      wx/generic/propdlg.h
      wx/generic/sashwin.h
      wx/generic/splash.h
+    wx/generic/timectrl.h
      wx/generic/wizard.h
      wx/grid.h
      wx/hyperlink.h
      wx/generic/wizard.h
      wx/grid.h
      wx/hyperlink.h
@@ -2869,24 +2946,26 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/notifmsg.h
      wx/odcombo.h
      wx/propdlg.h
      wx/notifmsg.h
      wx/odcombo.h
      wx/propdlg.h
+    wx/richtooltip.h
      wx/sashwin.h
      wx/sound.h
      wx/splash.h
      wx/taskbar.h
      wx/sashwin.h
      wx/sound.h
      wx/splash.h
      wx/taskbar.h
+    wx/timectrl.h
      wx/tipdlg.h
      wx/tipdlg.h
+    wx/treelist.h
      wx/wizard.h
  </set>
  
  <set var="ADVANCED_MSW_SRC" hints="files">
      src/common/taskbarcmn.cpp
      wx/wizard.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/aboutdlg.cpp
      src/msw/notifmsg.cpp
+    src/msw/richtooltip.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
      wx/msw/notifmsg.h
      wx/msw/sound.h
      wx/msw/taskbar.h
@@ -2894,10 +2973,25 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  
  <!-- not used with wxUniv -->
  <set var="ADVANCED_MSW_NATIVE_SRC" hints="files">
  
  <!-- 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/commandlinkbutton.cpp
+    src/msw/datecontrols.cpp
      src/msw/datectrl.cpp
      src/msw/datectrl.cpp
+    src/msw/datetimectrl.cpp
+    src/msw/hyperlink.cpp
+    src/msw/timectrl.cpp
  </set>
  <set var="ADVANCED_MSW_NATIVE_HDR" hints="files">
  </set>
  <set var="ADVANCED_MSW_NATIVE_HDR" hints="files">
+    wx/generic/animate.h
+    wx/msw/bmpcbox.h
+    wx/msw/commandlinkbutton.h
+    wx/msw/calctrl.h
      wx/msw/datectrl.h
      wx/msw/datectrl.h
+    wx/msw/datetimectrl.h
+    wx/msw/hyperlink.h
+    wx/msw/timectrl.h
  </set>
  
  <!-- not built on WindowsCE: -->
  </set>
  
  <!-- not built on WindowsCE: -->
@@ -2908,40 +3002,86 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/msw/joystick.h
  </set>
  
      wx/msw/joystick.h
  </set>
  
-<set var="ADVANCED_MAC_SRC" hints="files">
+<set var="ADVANCED_OSX_CARBON_SRC" hints="files">
+    src/common/taskbarcmn.cpp
+    src/generic/animateg.cpp
+    src/osx/carbon/aboutdlg.cpp
+    src/osx/carbon/drawer.cpp
+    src/osx/dataview_osx.cpp
+    src/osx/carbon/dataview.cpp
+    src/osx/sound_osx.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/dvrenderer.h
+    wx/osx/dvrenderers.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/generic/animateg.cpp
      src/common/taskbarcmn.cpp
      src/generic/animateg.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">
+    src/osx/datetimectrl_osx.cpp
+    src/osx/datectrl_osx.cpp
+    src/osx/sound_osx.cpp
+    src/osx/timectrl_osx.cpp
+    src/osx/carbon/sound.cpp
+    src/osx/core/sound.cpp
+    src/osx/cocoa/aboutdlg.mm
+    src/osx/dataview_osx.cpp
+    src/osx/cocoa/dataview.mm
+    src/osx/cocoa/datetimectrl.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/generic/animate.h
-    wx/mac/dataview.h
-    wx/mac/joystick.h
-    wx/mac/sound.h
-    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
+    wx/osx/dataview.h
+    wx/osx/datectrl.h
+    wx/osx/datetimectrl.h
+    wx/osx/dvrenderer.h
+    wx/osx/dvrenderers.h
+    wx/osx/joystick.h
+    wx/osx/sound.h
+    wx/osx/taskbarosx.h
+    wx/osx/timectrl.h
+    wx/osx/core/joystick.h
+    wx/osx/cocoa/dataview.h
+</set>
+
+<set var="ADVANCED_OSX_IPHONE_SRC" hints="files">
+    src/generic/animateg.cpp
+    src/osx/sound_osx.cpp
+    src/osx/core/sound.cpp
+</set>
+
+<set var="ADVANCED_OSX_IPHONE_HDR" hints="files">
+    wx/generic/animate.h
+    wx/osx/sound.h
  </set>
  
  <set var="ADVANCED_COCOA_SRC" hints="files">
      src/cocoa/taskbar.mm
      src/common/taskbarcmn.cpp
      src/generic/animateg.cpp
  </set>
  
  <set var="ADVANCED_COCOA_SRC" hints="files">
      src/cocoa/taskbar.mm
      src/common/taskbarcmn.cpp
      src/generic/animateg.cpp
-    src/mac/corefoundation/hidjoystick.cpp
+    src/osx/core/hidjoystick.cpp
  </set>
  </set>
+
  <set var="ADVANCED_COCOA_HDR" hints="files">
      wx/cocoa/taskbar.h
      wx/generic/animate.h
  <set var="ADVANCED_COCOA_HDR" hints="files">
      wx/cocoa/taskbar.h
      wx/generic/animate.h
-    wx/mac/corefoundation/joystick.h
+    wx/osx/core/joystick.h
  </set>
  
  <set var="ADVANCED_OS2_SRC" hints="files">
  </set>
  
  <set var="ADVANCED_OS2_SRC" hints="files">
@@ -2975,24 +3115,45 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/generic/animate.h
  </set>
  
      wx/generic/animate.h
  </set>
  
+<set var="ADVANCED_GTK_PLATFORM_SRC" hints="files">
+    <if cond="PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_SRC)</if>
+</set>
+<set var="ADVANCED_GTK_PLATFORM_HDR" hints="files">
+    <if cond="PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_HDR)</if>
+</set>
  <set var="ADVANCED_GTK_SRC" hints="files">
  <set var="ADVANCED_GTK_SRC" hints="files">
+    $(ADVANCED_GTK_PLATFORM_SRC)
      src/gtk/taskbar.cpp
      src/gtk/taskbar.cpp
+</set>
+<set var="ADVANCED_GTK2_SRC" hints="files">
+    $(ADVANCED_GTK_SRC)
      src/gtk/eggtrayicon.c
      src/gtk/hildon/notifmsg.cpp
  </set>
  <set var="ADVANCED_GTK_HDR" hints="files">
      src/gtk/eggtrayicon.c
      src/gtk/hildon/notifmsg.cpp
  </set>
  <set var="ADVANCED_GTK_HDR" hints="files">
+    $(ADVANCED_GTK_PLATFORM_HDR)
+    wx/gtk/taskbar.h
+</set>
+<set var="ADVANCED_GTK2_HDR" hints="files">
+    $(ADVANCED_GTK_HDR)
      wx/gtk/hildon/notifmsg.h
  </set>
  
  <set var="ADVANCED_GTK_NATIVE_SRC" hints="files">
      src/gtk/aboutdlg.cpp
      src/gtk/animate.cpp
      wx/gtk/hildon/notifmsg.h
  </set>
  
  <set var="ADVANCED_GTK_NATIVE_SRC" hints="files">
      src/gtk/aboutdlg.cpp
      src/gtk/animate.cpp
+    src/gtk/bmpcbox.cpp
+    src/gtk/calctrl.cpp
      src/gtk/dataview.cpp
      src/gtk/hyperlink.cpp
  </set>
  <set var="ADVANCED_GTK_NATIVE_HDR" hints="files">
      wx/gtk/animate.h
      src/gtk/dataview.cpp
      src/gtk/hyperlink.cpp
  </set>
  <set var="ADVANCED_GTK_NATIVE_HDR" hints="files">
      wx/gtk/animate.h
+    wx/gtk/bmpcbox.h
+    wx/gtk/calctrl.h
      wx/gtk/dataview.h
      wx/gtk/dataview.h
+    wx/gtk/dvrenderer.h
+    wx/gtk/dvrenderers.h
      wx/gtk/hyperlink.h
  </set>
  
      wx/gtk/hyperlink.h
  </set>
  
@@ -3028,10 +3189,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">
@@ -3039,10 +3198,22 @@ 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 var="MEDIA_OSX_CARBON_HDR" hints="files">
+</set>
+
+<set var="MEDIA_OSX_COCOA_SRC" hints="files">
+    <!-- src/osx/cocoa/mediactrl.mm -->
  </set>
  </set>
-<set var="MEDIA_MAC_HDR" hints="files">
+<set var="MEDIA_OSX_COCOA_HDR" hints="files">
+</set>
+
+<set var="MEDIA_OSX_IPHONE_SRC" hints="files">
+    <!-- src/osx/iphone/mediactrl.mm -->
+</set>
+<set var="MEDIA_OSX_IPHONE_HDR" hints="files">
  </set>
  
  <set var="MEDIA_COCOA_SRC" hints="files">
  </set>
  
  <set var="MEDIA_COCOA_SRC" hints="files">
@@ -3104,8 +3275,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/html/m_links.cpp
      src/html/m_list.cpp
      src/html/m_pre.cpp
      src/html/m_links.cpp
      src/html/m_list.cpp
      src/html/m_pre.cpp
+    src/html/m_span.cpp
      src/html/m_style.cpp
      src/html/m_tables.cpp
      src/html/m_style.cpp
      src/html/m_tables.cpp
+    src/html/styleparams.cpp
      src/html/winpars.cpp
      <!-- wxHTML users: -->
      src/generic/htmllbox.cpp
      src/html/winpars.cpp
      <!-- wxHTML users: -->
      src/generic/htmllbox.cpp
@@ -3128,6 +3301,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/html/htmlwin.h
      wx/html/htmprint.h
      wx/html/m_templ.h
      wx/html/htmlwin.h
      wx/html/htmprint.h
      wx/html/m_templ.h
+    wx/html/styleparams.h
      wx/html/winpars.h
      wx/wxhtml.h
      <!-- wxHTML users: -->
      wx/html/winpars.h
      wx/wxhtml.h
      <!-- wxHTML users: -->
@@ -3135,7 +3309,40 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      $(MSW_HTML_HDR)
  </set>
  
      $(MSW_HTML_HDR)
  </set>
  
+<!-- ====================================================================== -->
+<!--                                wxWEBVIEW                               -->
+<!-- ====================================================================== -->
+
+<set var="WEBVIEW_SRC_PLATFORM">
+    <if cond="TOOLKIT=='MSW'">src/msw/webview_ie.cpp</if>
+    <if cond="TOOLKIT=='GTK'">src/gtk/webview_webkit.cpp</if>
+    <if cond="PLATFORM_MACOSX=='1'">src/osx/webview_webkit.mm</if>
+</set>
+<set var="WEBVIEW_SRC" hints="files">
+    $(WEBVIEW_SRC_PLATFORM)
+    src/common/webview.cpp
+    src/common/webviewarchivehandler.cpp
+</set>
  
  
+<set var="WEBVIEW_HDR_PLATFORM" hints="files">
+    <if cond="TOOLKIT=='MSW'">
+        wx/msw/webviewhistoryitem_ie.h
+        wx/msw/webview_ie.h
+    </if>
+    <if cond="TOOLKIT=='GTK'">
+        wx/gtk/webviewhistoryitem_webkit.h
+        wx/gtk/webview_webkit.h
+    </if>
+    <if cond="PLATFORM_MACOSX=='1'">
+        wx/osx/webviewhistoryitem_webkit.h
+        wx/osx/webview_webkit.h
+    </if>
+</set>
+<set var="WEBVIEW_HDR" hints="files">
+    $(WEBVIEW_HDR_PLATFORM)
+    wx/webview.h
+    wx/webviewarchivehandler.h
+</set>
  
  <!-- ====================================================================== -->
  <!--                                wxXRC                                   -->
  
  <!-- ====================================================================== -->
  <!--                                wxXRC                                   -->
@@ -3143,6 +3350,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  
  <set var="XRC_SRC" hints="files">
      src/xrc/xh_animatctrl.cpp
  
  <set var="XRC_SRC" hints="files">
      src/xrc/xh_animatctrl.cpp
+    src/xrc/xh_bannerwindow.cpp
      src/xrc/xh_bmp.cpp
      src/xrc/xh_bmpcbox.cpp
      src/xrc/xh_bmpbt.cpp
      src/xrc/xh_bmp.cpp
      src/xrc/xh_bmpcbox.cpp
      src/xrc/xh_bmpbt.cpp
@@ -3153,15 +3361,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/xrc/xh_choic.cpp
      src/xrc/xh_choicbk.cpp
      src/xrc/xh_clrpicker.cpp
      src/xrc/xh_choic.cpp
      src/xrc/xh_choicbk.cpp
      src/xrc/xh_clrpicker.cpp
+    src/xrc/xh_cmdlinkbn.cpp
      src/xrc/xh_collpane.cpp
      src/xrc/xh_combo.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
@@ -3170,6 +3381,7 @@ 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_menu.cpp
      src/xrc/xh_notbk.cpp
      src/xrc/xh_odcombo.cpp
@@ -3194,17 +3406,21 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/xrc/xh_sttxt.cpp
      src/xrc/xh_text.cpp
      src/xrc/xh_tglbtn.cpp
      src/xrc/xh_sttxt.cpp
      src/xrc/xh_text.cpp
      src/xrc/xh_tglbtn.cpp
+    src/xrc/xh_timectrl.cpp
      src/xrc/xh_toolb.cpp
      src/xrc/xh_toolb.cpp
+    src/xrc/xh_toolbk.cpp
      src/xrc/xh_tree.cpp
      src/xrc/xh_treebk.cpp
      src/xrc/xh_unkwn.cpp
      src/xrc/xh_wizrd.cpp
      src/xrc/xmlres.cpp
      src/xrc/xh_tree.cpp
      src/xrc/xh_treebk.cpp
      src/xrc/xh_unkwn.cpp
      src/xrc/xh_wizrd.cpp
      src/xrc/xmlres.cpp
+    src/xrc/xmladv.cpp
      src/xrc/xmlrsall.cpp
  </set>
  <set var="XRC_HDR" hints="files">
      wx/xrc/xh_all.h
      wx/xrc/xh_animatctrl.h
      src/xrc/xmlrsall.cpp
  </set>
  <set var="XRC_HDR" hints="files">
      wx/xrc/xh_all.h
      wx/xrc/xh_animatctrl.h
+    wx/xrc/xh_bannerwindow.h
      wx/xrc/xh_bmpbt.h
      wx/xrc/xh_bmp.h
      wx/xrc/xh_bmpcbox.h
      wx/xrc/xh_bmpbt.h
      wx/xrc/xh_bmp.h
      wx/xrc/xh_bmpcbox.h
@@ -3215,11 +3431,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/xrc/xh_choic.h
      wx/xrc/xh_choicbk.h
      wx/xrc/xh_clrpicker.h
      wx/xrc/xh_choic.h
      wx/xrc/xh_choicbk.h
      wx/xrc/xh_clrpicker.h
+    wx/xrc/xh_cmdlinkbn.h
      wx/xrc/xh_collpane.h
      wx/xrc/xh_combo.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
@@ -3255,7 +3475,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/xrc/xh_sttxt.h
      wx/xrc/xh_text.h
      wx/xrc/xh_tglbtn.h
      wx/xrc/xh_sttxt.h
      wx/xrc/xh_text.h
      wx/xrc/xh_tglbtn.h
+    wx/xrc/xh_timectrl.h
      wx/xrc/xh_toolb.h
      wx/xrc/xh_toolb.h
+    wx/xrc/xh_toolbk.h
      wx/xrc/xh_tree.h
      wx/xrc/xh_treebk.h
      wx/xrc/xh_unkwn.h
      wx/xrc/xh_tree.h
      wx/xrc/xh_treebk.h
      wx/xrc/xh_unkwn.h
@@ -3285,9 +3507,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <!-- ====================================================================== -->
  
  <set var="OPENGL_SRC_PLATFORM" hints="files">
  <!-- ====================================================================== -->
  
  <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=='OSX_IPHONE'">src/osx/iphone/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=='3'">
+        src/unix/glx11.cpp
+        src/gtk/glcanvas.cpp
+    </if>
      <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
          src/gtk/glcanvas.cpp
          src/unix/glx11.cpp
      <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
          src/gtk/glcanvas.cpp
          src/unix/glx11.cpp
@@ -3309,8 +3536,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  </set>
  
  <set var="OPENGL_HDR_PLATFORM" hints="files">
  </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</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=='3'">
+        wx/gtk/glcanvas.h
+        wx/unix/glx11.h
+    </if>
      <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
          wx/gtk/glcanvas.h
          wx/unix/glx11.h
      <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
          wx/gtk/glcanvas.h
          wx/unix/glx11.h
@@ -3343,20 +3575,90 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <!--                                  wxAUI                                 -->
  <!-- ====================================================================== -->
  
  <!--                                  wxAUI                                 -->
  <!-- ====================================================================== -->
  
+<set var="AUI_GTK_SRC" hints="files">
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
+        src/aui/tabartgtk.cpp
+    </if>
+</set>
+<set var="AUI_GTK_HDR" hints="files">
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
+        wx/aui/tabartgtk.h
+    </if>
+</set>
  <set var="AUI_SRC" hints="files">
      src/aui/framemanager.cpp
      src/aui/dockart.cpp
      src/aui/floatpane.cpp
      src/aui/auibook.cpp
  <set var="AUI_SRC" hints="files">
      src/aui/framemanager.cpp
      src/aui/dockart.cpp
      src/aui/floatpane.cpp
      src/aui/auibook.cpp
+    src/aui/auibar.cpp
      src/aui/tabmdi.cpp
      src/aui/tabmdi.cpp
+    src/aui/tabart.cpp
+    $(AUI_GTK_SRC)
  </set>
  <set var="AUI_HDR" hints="files">
      wx/aui/framemanager.h
      wx/aui/dockart.h
      wx/aui/floatpane.h
      wx/aui/auibook.h
  </set>
  <set var="AUI_HDR" hints="files">
      wx/aui/framemanager.h
      wx/aui/dockart.h
      wx/aui/floatpane.h
      wx/aui/auibook.h
+    wx/aui/auibar.h
      wx/aui/tabmdi.h
      wx/aui/aui.h
      wx/aui/tabmdi.h
      wx/aui/aui.h
+    wx/aui/tabart.h
+    $(AUI_GTK_HDR)
+</set>
+
+<!-- ====================================================================== -->
+<!--                                  wxRibbon                              -->
+<!-- ====================================================================== -->
+
+<set var="RIBBON_SRC" hints="files">
+    src/ribbon/art_internal.cpp
+    src/ribbon/art_msw.cpp
+    src/ribbon/art_aui.cpp
+    src/ribbon/bar.cpp
+    src/ribbon/buttonbar.cpp
+    src/ribbon/control.cpp
+    src/ribbon/gallery.cpp
+    src/ribbon/page.cpp
+    src/ribbon/panel.cpp
+    src/ribbon/toolbar.cpp
+</set>
+<set var="RIBBON_HDR" hints="files">
+    wx/ribbon/art.h
+    wx/ribbon/art_internal.h
+    wx/ribbon/bar.h
+    wx/ribbon/buttonbar.h
+    wx/ribbon/control.h
+    wx/ribbon/gallery.h
+    wx/ribbon/page.h
+    wx/ribbon/panel.h
+    wx/ribbon/toolbar.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>
  
  <!-- ====================================================================== -->
  </set>
  
  <!-- ====================================================================== -->
@@ -3364,26 +3666,39 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <!-- ====================================================================== -->
  
  <set var="RICHTEXT_SRC" hints="files">
  <!-- ====================================================================== -->
  
  <set var="RICHTEXT_SRC" hints="files">
-    src/richtext/richtextctrl.cpp
      src/richtext/richtextbuffer.cpp
      src/richtext/richtextbuffer.cpp
-    src/richtext/richtextstyles.cpp
-    src/richtext/richtextxml.cpp
-    src/richtext/richtexthtml.cpp
+    src/richtext/richtextctrl.cpp
      src/richtext/richtextformatdlg.cpp
      src/richtext/richtextformatdlg.cpp
-    src/richtext/richtextsymboldlg.cpp
-    src/richtext/richtextstyledlg.cpp
+    src/richtext/richtexthtml.cpp
+    src/richtext/richtextimagedlg.cpp
      src/richtext/richtextprint.cpp
      src/richtext/richtextprint.cpp
+    src/richtext/richtextstyledlg.cpp
+    src/richtext/richtextstyles.cpp
+    src/richtext/richtextsymboldlg.cpp
+    src/richtext/richtextxml.cpp
  </set>
  <set var="RICHTEXT_HDR" hints="files">
  </set>
  <set var="RICHTEXT_HDR" hints="files">
-    wx/richtext/richtextctrl.h
+    wx/richtext/richtextbackgroundpage.h
+    wx/richtext/richtextborderspage.h
      wx/richtext/richtextbuffer.h
      wx/richtext/richtextbuffer.h
+    wx/richtext/richtextbulletspage.h
+    wx/richtext/richtextctrl.h
+    wx/richtext/richtextdialogpage.h
+    wx/richtext/richtextfontpage.h
+    wx/richtext/richtextformatdlg.h
      wx/richtext/richtexthtml.h
      wx/richtext/richtexthtml.h
+    wx/richtext/richtextimagedlg.h
+    wx/richtext/richtextindentspage.h
+    wx/richtext/richtextliststylepage.h
+    wx/richtext/richtextmarginspage.h
+    wx/richtext/richtextprint.h
+    wx/richtext/richtextsizepage.h
+    wx/richtext/richtextstyledlg.h
+    wx/richtext/richtextstylepage.h
      wx/richtext/richtextstyles.h
      wx/richtext/richtextstyles.h
-    wx/richtext/richtextxml.h
-    wx/richtext/richtextformatdlg.h
      wx/richtext/richtextsymboldlg.h
      wx/richtext/richtextsymboldlg.h
-    wx/richtext/richtextstyledlg.h
-    wx/richtext/richtextprint.h
+    wx/richtext/richtextuicustomization.h
+    wx/richtext/richtextxml.h
  </set>
  
  
  </set>
  
  
@@ -3409,33 +3724,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=='OSX_IPHONE'">$(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_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_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_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
      </set>
      <set var="BASE_AND_GUI_PLATFORM_SRC" hints="files">
          <if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
-        <if cond="PLATFORM_PALMOS=='1'">$(BASE_AND_GUI_PALMOS_SRC)</if>
          <if cond="PLATFORM_MSDOS=='1'">$(BASE_AND_GUI_MSDOS_SRC)</if>
          <!-- At the moment, BASE_AND_GUI_TOOLKIT_SRC handles this -->
          <!-- if cond="PLATFORM_MACOS=='1'">$(BASE_AND_GUI_MAC_SRC)</if -->
          <if cond="PLATFORM_MSDOS=='1'">$(BASE_AND_GUI_MSDOS_SRC)</if>
          <!-- At the moment, BASE_AND_GUI_TOOLKIT_SRC handles this -->
          <!-- if cond="PLATFORM_MACOS=='1'">$(BASE_AND_GUI_MAC_SRC)</if -->
@@ -3443,23 +3758,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_PALMOS=='1'">$(BASE_PALMOS_HDR)</if>
+        <if cond="PLATFORM_MACOSX=='1'">$(BASE_OSX_HDR)</if>
          <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_HDR)</if>
          <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_HDR)</if>
      </set>
          <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_HDR)</if>
          <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_HDR)</if>
      </set>
@@ -3477,16 +3792,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">
@@ -3497,29 +3807,33 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      <!-- GUI sources: -->
  
      <set var="LOWLEVEL_SRC" hints="files">
      <!-- GUI sources: -->
  
      <set var="LOWLEVEL_SRC" hints="files">
-        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_LOWLEVEL_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_LOWLEVEL_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK2_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_DESKTOP_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_DESKTOP_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_SRC)</if>
-        <if cond="TOOLKIT=='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=='OSX_IPHONE'">$(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>
-        <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_SRC)</if>
      </set>
      <set var="LOWLEVEL_HDR" hints="files">
          <if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_SRC)</if>
      </set>
      <set var="LOWLEVEL_HDR" hints="files">
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR) $(MSW_DESKTOP_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='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=='OSX_IPHONE'">$(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>
-        <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_HDR)</if>
      </set>
  
          <if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_HDR)</if>
      </set>
  
@@ -3529,22 +3843,28 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      </set>
  
      <set var="GUI_SRC" hints="files">
      </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=='3'">$(GTK_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK2_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=='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=='OSX_IPHONE'">$(OSX_IPHONE_SRC)</if>
          <if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
          <if cond="TOOLKIT=='PM'">$(OS2_SRC)</if>
      </set>
      <set var="GUI_HDR" hints="files">
          <if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
          <if cond="TOOLKIT=='PM'">$(OS2_SRC)</if>
      </set>
      <set var="GUI_HDR" hints="files">
-        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_HDR)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_HDR)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK2_HDR)</if>
          <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_HDR)</if>
          <if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
          <if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_DESKTOP_HDR)</if>
          <if cond="TOOLKIT=='WINCE'">$(MSW_HDR) $(WINCE_HDR)</if>
          <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_HDR)</if>
          <if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
          <if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_DESKTOP_HDR)</if>
          <if cond="TOOLKIT=='WINCE'">$(MSW_HDR) $(WINCE_HDR)</if>
-        <if cond="TOOLKIT=='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=='OSX_IPHONE'">$(OSX_SHARED_HDR) $(OSX_IPHONE_HDR)</if>
          <if cond="TOOLKIT=='COCOA'">$(COCOA_HDR)</if>
          <if cond="TOOLKIT=='PM'">$(OS2_HDR)</if>
      </set>
          <if cond="TOOLKIT=='COCOA'">$(COCOA_HDR)</if>
          <if cond="TOOLKIT=='PM'">$(OS2_HDR)</if>
      </set>
@@ -3562,35 +3882,41 @@ 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=='OSX_IPHONE'">$(ADVANCED_OSX_IPHONE_SRC)</if>
          <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_SRC)</if>
          <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC) $(ADVANCED_MOTIF_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=='3'">$(ADVANCED_GTK_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK2_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=='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=='OSX_IPHONE'">$(ADVANCED_OSX_IPHONE_HDR)</if>
          <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_HDR)</if>
          <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR) $(ADVANCED_MOTIF_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=='3'">$(ADVANCED_GTK_HDR)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK2_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=='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=='3'">$(ADVANCED_GTK_NATIVE_SRC)</if>
          <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_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=='3'">$(ADVANCED_GTK_NATIVE_HDR)</if>
          <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>
          <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>
@@ -3609,7 +3935,9 @@ 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=='OSX_IPHONE'">$(MEDIA_OSX_IPHONE_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>
@@ -3619,7 +3947,9 @@ 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=='OSX_COCOA'">$(MEDIA_OSX_COCOA_HDR)</if>
+        <if cond="TOOLKIT=='OSX_IPHONE'">$(MEDIA_OSX_IPHONE_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>
@@ -3641,15 +3971,15 @@ 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) $(XRC_HDR) $(AUI_HDR) $(RICHTEXT_HDR)
-            $(STC_HDR)
+            $(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(PROPGRID_HDR)
+            $(RIBBON_HDR) $(RICHTEXT_HDR) $(STC_HDR) $(WEBVIEW_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)
+        $(NET_CMN_HDR)
          $(XML_HDR)
      </set>
      <set var="ALL_HEADERS" make_var="1" hints="files">
          $(XML_HDR)
      </set>
      <set var="ALL_HEADERS" make_var="1" hints="files">
@@ -3662,15 +3992,9 @@ 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_PALMOS_HDR)
+        $(BASE_OSX_HDR)
          $(BASE_MSDOS_HDR)
          $(NET_CMN_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)
      </set>
  
          $(XML_HDR)
      </set>
  
@@ -3678,14 +4002,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      <set var="ALL_BASE_SOURCES" make_var="1" hints="files">
          $(BASE_CMN_SRC)
          $(BASE_UNIX_SRC) $(BASE_WIN32_SRC) $(BASE_WINCE_SRC)
      <set var="ALL_BASE_SOURCES" make_var="1" hints="files">
          $(BASE_CMN_SRC)
          $(BASE_UNIX_SRC) $(BASE_WIN32_SRC) $(BASE_WINCE_SRC)
-        $(BASE_MAC_SRC)
+        $(BASE_OSX_SRC)
          $(BASE_OS2_SRC)
          $(BASE_MSDOS_SRC)
          $(BASE_OS2_SRC)
          $(BASE_MSDOS_SRC)
-        $(BASE_PALMOS_SRC)
          $(BASE_AND_GUI_CMN_SRC)
          $(BASE_AND_GUI_CMN_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)
+        $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_OSX_SRC)
+        $(NET_WIN32_SRC) $(NET_WINCE_SRC)
          $(XML_SRC)
      </set>
  
          $(XML_SRC)
      </set>