Fixed capitalisation

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

index 99bc346a9915abd8558a0967a6ea05741ef2aa07..a297dfcf8c334d60f6b80ea857689f80ec6ee9a1 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1,5 +1,4 @@
  <?xml version="1.0" ?>
  <?xml version="1.0" ?>
-<!-- $Id$ -->
  <makefile>
  
  <!--
  <makefile>
  
  <!--
@@ -44,7 +43,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  
       ====================================================================== -->
  
  
       ====================================================================== -->
  
-
+<if cond="FORMAT in ['borland','mingw','msvc','watcom']">
+    <define-rule name="__mm-to-$(OBJEXT[1:])" extends="__any,compilation_rule">
+    </define-rule>
+</if>
  
  <!-- ====================================================================== -->
  <!--                               wxBase                                   -->
  
  <!-- ====================================================================== -->
  <!--                               wxBase                                   -->
@@ -58,31 +60,34 @@ 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/dir.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/threadpsx.cpp
      src/unix/stdpaths.cpp
      src/unix/timerunx.cpp
      src/unix/threadpsx.cpp
-    src/unix/stackwalk.cpp
      src/unix/utilsunx.cpp
      src/unix/utilsunx.cpp
+    src/unix/wakeuppipe.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/tls.h
      wx/unix/pipe.h
      wx/unix/stdpaths.h
      wx/unix/stackwalk.h
      wx/unix/tls.h
+    wx/unix/fswatcher_kqueue.h
  </set>
  
  <!--
  </set>
  
  <!--
@@ -109,9 +114,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/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/unix/fswatcher_inotify.h
  </set>
  
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
  </set>
  
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
@@ -124,6 +131,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/msw/dde.cpp
      src/msw/dir.cpp
      src/msw/dlmsw.cpp
      src/msw/dde.cpp
      src/msw/dir.cpp
      src/msw/dlmsw.cpp
+    src/msw/evtloopconsole.cpp
      src/msw/mimetype.cpp
      src/msw/power.cpp
      src/msw/regconf.cpp
      src/msw/mimetype.cpp
      src/msw/power.cpp
      src/msw/regconf.cpp
@@ -135,9 +143,9 @@ 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">
  </set>
  <set var="BASE_AND_GUI_WIN32_SRC" hints="files">
-    src/msw/evtloop.cpp
      src/msw/main.cpp
      src/msw/mslu.cpp
      src/msw/volume.cpp
      src/msw/main.cpp
      src/msw/mslu.cpp
      src/msw/volume.cpp
@@ -152,6 +160,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/msw/crashrpt.h
      wx/msw/dde.h
      wx/msw/debughlp.h
      wx/msw/crashrpt.h
      wx/msw/dde.h
      wx/msw/debughlp.h
+    wx/msw/evtloopconsole.h
      wx/msw/gccpriv.h
      wx/msw/libraries.h
      wx/msw/mimetype.h
      wx/msw/gccpriv.h
      wx/msw/libraries.h
      wx/msw/mimetype.h
@@ -166,6 +175,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'">
@@ -181,6 +191,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <!-- Used on Mac OS X wxMac base, and Mac OS X darwin base -->
  <set var="BASE_COREFOUNDATION_SRC" hints="files">
      src/osx/core/cfstring.cpp
  <!-- Used on Mac OS X wxMac base, and Mac OS X darwin base -->
  <set var="BASE_COREFOUNDATION_SRC" hints="files">
      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
      src/osx/core/stdpaths_cf.cpp
      src/osx/core/strconv_cf.cpp
      src/osx/core/utilsexc_base.cpp
@@ -190,9 +201,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/osx/core/cfref.h
      wx/osx/core/cfstring.h
      wx/osx/core/hid.h
      wx/osx/core/cfref.h
      wx/osx/core/cfstring.h
      wx/osx/core/hid.h
+    wx/osx/core/evtloop.h
+    wx/osx/core/objcid.h
      wx/osx/core/private.h
      wx/osx/core/stdpaths.h
      wx/osx/core/private.h
      wx/osx/core/stdpaths.h
-    wx/osx/core/private/strconv_cf.h
  </set>
  
  <!-- Base files used by OS X ports (not Carbon) -->
  </set>
  
  <!-- Base files used by OS X ports (not Carbon) -->
@@ -215,6 +227,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/osx/cocoa/utils.mm
  </set>
  
      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 var="BASE_OSX_NOTWXMAC_SRC" hints="files">
      $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)
  <!-- Base files used by non-wxMac OS X builds -->
  <set var="BASE_OSX_NOTWXMAC_SRC" hints="files">
      $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)
@@ -237,6 +253,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/unix/timerunx.cpp
      src/os2/dir.cpp
      src/os2/mimetype.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
@@ -256,35 +273,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                                    -->
  <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
@@ -304,6 +292,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
@@ -315,6 +304,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
@@ -340,6 +330,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
@@ -347,6 +338,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
@@ -354,6 +346,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
@@ -365,9 +358,12 @@ 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/threadinfo.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
@@ -381,6 +377,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
@@ -390,6 +388,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
@@ -401,10 +401,12 @@ 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/cmdline.h
      wx/chkconf.h
      wx/clntdata.h
      wx/cmdargs.h
      wx/cmdline.h
+    wx/compiler.h
      wx/confbase.h
      wx/config.h
      wx/convauto.h
      wx/confbase.h
      wx/config.h
      wx/convauto.h
@@ -424,6 +426,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/dynload.h
      wx/encconv.h
      wx/event.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
@@ -451,6 +455,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/ipc.h
      wx/ipcbase.h
      wx/kbdstate.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
@@ -464,7 +469,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/module.h
      wx/mousestate.h
      wx/msgout.h
      wx/module.h
      wx/mousestate.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
@@ -474,12 +481,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
@@ -494,11 +506,14 @@ 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/tls.h
      wx/tokenzr.h
      wx/tracker.h
      wx/timer.h
      wx/tls.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
@@ -507,6 +522,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/variant.h
      wx/vector.h
      wx/version.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
@@ -518,13 +534,23 @@ 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/meta/removeref.h
+    wx/fswatcher.h
+    wx/generic/fswatcher.h
  </set>
  
  
  </set>
  
  
@@ -542,12 +568,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  </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">
@@ -578,6 +602,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      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
@@ -607,17 +632,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
@@ -625,11 +656,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
@@ -640,10 +671,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
@@ -674,33 +708,51 @@ 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/modalhook.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/pickerbase.cpp
      src/common/popupcmn.cpp
+    src/common/preferencescmn.cpp
      src/common/prntbase.cpp
      src/common/quantize.cpp
      src/common/prntbase.cpp
      src/common/quantize.cpp
+    src/common/radiobtncmn.cpp
      src/common/radiocmn.cpp
      src/common/rearrangectrl.cpp
      src/common/rendcmn.cpp
      src/common/rgncmn.cpp
      src/common/radiocmn.cpp
      src/common/rearrangectrl.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/textcmn.cpp
      src/common/textentrycmn.cpp
      src/common/stattextcmn.cpp
      src/common/stockitem.cpp
      src/common/tbarbase.cpp
      src/common/textcmn.cpp
      src/common/textentrycmn.cpp
+    src/common/textmeasurecmn.cpp
      src/common/toplvcmn.cpp
      src/common/treebase.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/wrapsizer.cpp
      src/common/wincmn.cpp
      src/common/windowid.cpp
      src/common/wrapsizer.cpp
@@ -715,13 +767,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/generic/dragimgg.cpp
      src/generic/filectrlg.cpp
      src/generic/headerctrlg.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/progdlgg.cpp
+    src/generic/preferencesg.cpp
      src/generic/printps.cpp
      src/generic/renderg.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/scrlwing.cpp
      src/generic/selstore.cpp
      src/generic/spinctlg.cpp
@@ -736,12 +792,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/generic/treebkg.cpp
      src/generic/vlbox.cpp
      src/generic/vscroll.cpp
      src/generic/treebkg.cpp
      src/generic/vlbox.cpp
      src/generic/vscroll.cpp
+    src/xrc/xmlreshandler.cpp
  </set>
  <set var="GUI_CMN_HDR" hints="files">
  </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
-    wx/cairo.h
      wx/checkbox.h
      wx/checklst.h
      wx/choicdlg.h
      wx/checkbox.h
      wx/checklst.h
      wx/choicdlg.h
@@ -750,9 +809,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
@@ -774,11 +835,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/headerctrlg.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
@@ -787,6 +850,7 @@ 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/scrolwin.h
      wx/generic/spinctlg.h
      wx/generic/splitter.h
@@ -800,10 +864,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/headerctrl.h
      wx/helphtml.h
      wx/icon.h
      wx/headerctrl.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/modalhook.h
+    wx/mousemanager.h
      wx/msgdlg.h
      wx/nativewin.h
      wx/numdlg.h
      wx/msgdlg.h
      wx/nativewin.h
      wx/numdlg.h
@@ -814,8 +882,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/rearrangectrl.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
@@ -827,14 +897,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/windowptr.h
+    wx/withimages.h
      wx/wrapsizer.h
      wx/wupdlock.h
  
      wx/wrapsizer.h
      wx/wupdlock.h
  
@@ -854,6 +929,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
@@ -866,13 +942,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
@@ -906,6 +984,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
@@ -916,13 +1000,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/rawbmp.h
      wx/region.h
      wx/scopeguard.h
      wx/rawbmp.h
      wx/region.h
      wx/scopeguard.h
+    wx/simplebook.h
      wx/spinbutt.h
      wx/spinctrl.h
      wx/splitter.h
      wx/srchctrl.h
      wx/statline.h
      wx/spinbutt.h
      wx/spinctrl.h
      wx/splitter.h
      wx/srchctrl.h
      wx/statline.h
-    wx/tab.h
-    wx/tabctrl.h
      wx/tbarbase.h
      wx/tglbtn.h
      wx/tipwin.h
      wx/tbarbase.h
      wx/tglbtn.h
      wx/tipwin.h
@@ -932,6 +1015,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
@@ -939,6 +1023,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/vscroll.h
      wx/xpmdecod.h
      wx/xpmhand.h
      wx/vscroll.h
      wx/xpmdecod.h
      wx/xpmhand.h
+    wx/xrc/xmlreshandler.h
  </set>
  
  <!-- ====================================================================== -->
  </set>
  
  <!-- ====================================================================== -->
@@ -957,10 +1042,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
@@ -974,12 +1060,46 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <!--                                wxGTK                                   -->
  <!-- ====================================================================== -->
  
  <!--                                wxGTK                                   -->
  <!-- ====================================================================== -->
  
+<set var="GTK_WIN32_SRC" hints="files">
+    src/generic/caret.cpp
+    src/generic/imaglist.cpp
+    src/msw/ole/automtn.cpp
+    src/msw/ole/oleutils.cpp
+    src/msw/ole/safearray.cpp
+    src/msw/ole/uuid.cpp
+    src/msw/dialup.cpp
+    src/msw/dib.cpp
+    src/msw/display.cpp
+    src/msw/utilswin.cpp
+    src/unix/fontenum.cpp
+    src/unix/fontutil.cpp
+</set>
+<set var="GTK_WIN32_HDR" hints="files">
+    wx/generic/caret.h
+    wx/generic/imaglist.h
+    wx/msw/ole/automtn.h
+    wx/msw/ole/oleutils.h
+    wx/msw/ole/safearray.h
+    wx/msw/ole/uuid.h
+    wx/msw/dib.h
+    wx/unix/fontutil.h
+</set>
+<set var="GTK_PLATFORM_SRC" hints="files">
+    <if cond="PLATFORM_UNIX=='1'">$(XWIN_LOWLEVEL_SRC)</if>
+    <if cond="PLATFORM_MACOSX=='1'">$(XWIN_LOWLEVEL_SRC)</if>
+    <if cond="PLATFORM_WIN32=='1'">$(GTK_WIN32_SRC)</if>
+</set>
+<set var="GTK_PLATFORM_HDR" hints="files">
+    <if cond="PLATFORM_UNIX=='1'">$(XWIN_LOWLEVEL_HDR)</if>
+    <if cond="PLATFORM_MACOSX=='1'">$(XWIN_LOWLEVEL_HDR)</if>
+    <if cond="PLATFORM_WIN32=='1'">$(GTK_WIN32_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
@@ -987,21 +1107,21 @@ 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/sockgtk.cpp
      src/gtk/minifram.cpp
      src/gtk/font.cpp
      src/gtk/sockgtk.cpp
      src/gtk/minifram.cpp
+    src/gtk/nonownedwnd.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/pen.cpp
      src/gtk/popupwin.cpp
      src/gtk/private.cpp
      src/gtk/region.cpp
      src/gtk/renderer.cpp
      src/gtk/settings.cpp
+    src/gtk/textmeasure.cpp
      src/gtk/timer.cpp
      src/gtk/tooltip.cpp
      src/gtk/toplevel.cpp
      src/gtk/timer.cpp
      src/gtk/tooltip.cpp
      src/gtk/toplevel.cpp
@@ -1009,8 +1129,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
@@ -1023,16 +1149,15 @@ 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/pen.h
      wx/gtk/popupwin.h
-    wx/gtk/private/win_gtk.h
      wx/gtk/region.h
      wx/gtk/tooltip.h
      wx/gtk/toplevel.h
      wx/gtk/region.h
      wx/gtk/tooltip.h
      wx/gtk/toplevel.h
@@ -1044,15 +1169,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
@@ -1072,9 +1193,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
@@ -1082,6 +1202,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
@@ -1093,20 +1214,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
@@ -1127,15 +1254,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
@@ -1147,11 +1274,15 @@ 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/treeentry_gtk.h
+</set>
+<set var="GTK2_HDR" hints="files">
+    $(GTK_HDR)
+    wx/generic/fontdlgg.h
+    wx/gtk/gnome/gprint.h
  </set>
  
  
  </set>
  
  
@@ -1163,6 +1294,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      $(XWIN_LOWLEVEL_SRC)
      src/generic/icon.cpp
      src/generic/paletteg.cpp
      $(XWIN_LOWLEVEL_SRC)
      src/generic/icon.cpp
      src/generic/paletteg.cpp
+    src/generic/textmeasure.cpp
      src/gtk1/app.cpp
      src/gtk1/bitmap.cpp
      src/gtk1/brush.cpp
      src/gtk1/app.cpp
      src/gtk1/bitmap.cpp
      src/gtk1/brush.cpp
@@ -1234,10 +1366,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
@@ -1254,6 +1384,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
@@ -1266,7 +1397,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>
@@ -1282,7 +1413,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
@@ -1313,7 +1443,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
@@ -1326,6 +1456,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  
  <set var="MOTIF_LOWLEVEL_SRC" hints="files">
      $(XWIN_LOWLEVEL_SRC)
  
  <set var="MOTIF_LOWLEVEL_SRC" hints="files">
      $(XWIN_LOWLEVEL_SRC)
+    src/generic/textmeasure.cpp
      src/x11/bitmap.cpp
      src/x11/brush.cpp
      src/x11/palette.cpp
      src/x11/bitmap.cpp
      src/x11/brush.cpp
      src/x11/palette.cpp
@@ -1491,6 +1622,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  <set var="X11_LOWLEVEL_SRC" hints="files">
      $(XWIN_LOWLEVEL_SRC)
      src/generic/icon.cpp
  <set var="X11_LOWLEVEL_SRC" hints="files">
      $(XWIN_LOWLEVEL_SRC)
      src/generic/icon.cpp
+    src/generic/textmeasure.cpp
      src/generic/timer.cpp
      src/x11/app.cpp
      src/x11/bitmap.cpp
      src/generic/timer.cpp
      src/x11/app.cpp
      src/x11/bitmap.cpp
@@ -1560,6 +1692,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
@@ -1587,10 +1720,12 @@ 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/oleutils.cpp
      src/msw/ole/dataobj.cpp
      src/msw/ole/dropsrc.cpp
      src/msw/ole/droptgt.cpp
      src/msw/ole/oleutils.cpp
+    src/msw/ole/safearray.cpp
      src/msw/palette.cpp
      src/msw/pen.cpp
      src/msw/popupwin.cpp
      src/msw/palette.cpp
      src/msw/pen.cpp
      src/msw/popupwin.cpp
@@ -1599,13 +1734,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/msw/region.cpp
      src/msw/renderer.cpp
      src/msw/settings.cpp
      src/msw/region.cpp
      src/msw/renderer.cpp
      src/msw/settings.cpp
+    src/msw/textmeasure.cpp
      src/msw/tooltip.cpp
      src/msw/toplevel.cpp
      src/msw/tooltip.cpp
      src/msw/toplevel.cpp
+    src/msw/uiaction.cpp
      src/msw/utilsgui.cpp
      src/msw/utilsgui.cpp
+    src/msw/utilswin.cpp
      src/msw/uxtheme.cpp
      src/msw/window.cpp
  </set>
  <set var="MSW_LOWLEVEL_HDR" hints="files">
      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
@@ -1632,6 +1772,7 @@ 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/artmsw.cpp
      src/msw/bmpbuttn.cpp
      src/msw/button.cpp
@@ -1644,6 +1785,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/msw/dialog.cpp
      src/msw/dirdlg.cpp
      src/msw/dragimag.cpp
      src/msw/dialog.cpp
      src/msw/dirdlg.cpp
      src/msw/dragimag.cpp
+    src/msw/evtloop.cpp
      src/msw/filedlg.cpp
      src/msw/frame.cpp
      src/msw/gauge.cpp
      src/msw/filedlg.cpp
      src/msw/frame.cpp
      src/msw/gauge.cpp
@@ -1661,8 +1803,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
@@ -1672,7 +1817,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
@@ -1685,6 +1829,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
@@ -1701,6 +1846,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
@@ -1721,6 +1867,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      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
@@ -1739,16 +1886,20 @@ 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/ole/safearray.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
@@ -1757,7 +1908,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
@@ -1785,7 +1935,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/msw/pencil.cur
      wx/msw/pntleft.cur
      wx/msw/pntright.cur
      wx/msw/pencil.cur
      wx/msw/pntleft.cur
      wx/msw/pntright.cur
-    wx/msw/rightarr.cur
      wx/msw/roller.cur
      <!-- icons -->
      wx/msw/cdrom.ico
      wx/msw/roller.cur
      <!-- icons -->
      wx/msw/cdrom.ico
@@ -1847,69 +1996,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                                   -->
  <!-- ====================================================================== -->
@@ -1921,7 +2007,7 @@ 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/generic/textmeasure.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
@@ -1998,6 +2084,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/generic/mdig.cpp
      src/generic/prntdlgg.cpp
      src/generic/statusbr.cpp
      src/generic/mdig.cpp
      src/generic/prntdlgg.cpp
      src/generic/statusbr.cpp
+    src/generic/textmeasure.cpp
      <!-- OS/2 specific files: -->
      src/os2/accel.cpp
      src/os2/app.cpp
      <!-- OS/2 specific files: -->
      src/os2/accel.cpp
      src/os2/app.cpp
@@ -2061,7 +2148,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
@@ -2122,6 +2208,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
@@ -2132,7 +2219,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
@@ -2140,7 +2226,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
@@ -2153,46 +2238,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  
  
  <!-- ====================================================================== -->
  
  
  <!-- ====================================================================== -->
-<!--                                wxMac                                   -->
+<!--                                wxOSX Common                            -->
  <!-- ====================================================================== -->
  
  <set var="OSX_LOWLEVEL_SRC" hints="files">
      <!-- Shared wxMac and wxCocoa files -->
      <if cond="PLATFORM_MACOSX=='1'">
  <!-- ====================================================================== -->
  
  <set var="OSX_LOWLEVEL_SRC" hints="files">
      <!-- Shared wxMac and wxCocoa files -->
      <if cond="PLATFORM_MACOSX=='1'">
-    src/osx/accel.cpp
-    src/osx/bmpbuttn_osx.cpp
+    src/osx/artmac.cpp
      src/osx/brush.cpp
      src/osx/brush.cpp
-    src/osx/button_osx.cpp
-    src/osx/checkbox_osx.cpp
-    src/osx/checklst_osx.cpp
-    src/osx/choice_osx.cpp
      src/osx/dialog_osx.cpp
      src/osx/fontutil.cpp
      src/osx/dialog_osx.cpp
      src/osx/fontutil.cpp
-    src/osx/gauge_osx.cpp
      src/osx/imaglist.cpp
      src/osx/imaglist.cpp
-    src/osx/listbox_osx.cpp
-    src/osx/menu_osx.cpp
-    src/osx/menuitem_osx.cpp
      src/osx/minifram.cpp
      src/osx/nonownedwnd_osx.cpp
      src/osx/minifram.cpp
      src/osx/nonownedwnd_osx.cpp
-    src/osx/notebook_osx.cpp
      src/osx/palette.cpp
      src/osx/pen.cpp
      src/osx/palette.cpp
      src/osx/pen.cpp
-    src/osx/radiobox_osx.cpp
-    src/osx/radiobut_osx.cpp
-    src/osx/scrolbar_osx.cpp
-    src/osx/slider_osx.cpp
-    src/osx/spinbutt_osx.cpp
-    src/osx/spinctrl_osx.cpp
-    src/osx/srchctrl_osx.cpp
-    src/osx/statbox_osx.cpp
-    src/osx/statline_osx.cpp
-    src/osx/stattext_osx.cpp
-    src/osx/tabctrl_osx.cpp
-    src/osx/textctrl_osx.cpp
-    src/osx/tglbtn_osx.cpp
-    src/osx/toolbar_osx.cpp
      src/osx/toplevel_osx.cpp
      src/osx/toplevel_osx.cpp
+    src/osx/uiaction_osx.cpp
      src/osx/utils_osx.cpp
      <!-- src/osx/treectrl.cpp -->
      src/osx/window_osx.cpp
      src/osx/utils_osx.cpp
      <!-- src/osx/treectrl.cpp -->
      src/osx/window_osx.cpp
@@ -2223,12 +2285,41 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  
  <set var="OSX_CARBON_COCOA_SRC" hints="files">
  <if cond="PLATFORM_MACOSX=='1'">
  
  <set var="OSX_CARBON_COCOA_SRC" hints="files">
  <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/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 -->
      <!-- wxWebKit files -->
-    <!-- (TODO Move one level up) -->
+    src/html/htmlctrl/webkit/webkit.mm
      <!-- Native color/font dialogs -->
      src/osx/carbon/colordlgosx.mm
      src/osx/carbon/fontdlgosx.mm
      <!-- other shared files -->
      <!-- Native color/font dialogs -->
      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/clipbrd.cpp
      src/osx/carbon/cursor.cpp
      src/osx/carbon/fontdlg.cpp
@@ -2243,78 +2334,43 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/osx/carbon/dcscreen.cpp
      src/osx/core/glgrab.cpp
      src/osx/carbon/graphics.cpp
      src/osx/carbon/dcscreen.cpp
      src/osx/core/glgrab.cpp
      src/osx/carbon/graphics.cpp
-    src/osx/carbon/dnd.cpp
      src/osx/carbon/font.cpp
      src/osx/carbon/frame.cpp
      src/osx/carbon/mdi.cpp
      src/osx/carbon/metafile.cpp
      src/osx/carbon/overlay.cpp
      src/osx/carbon/popupwin.cpp
      src/osx/carbon/font.cpp
      src/osx/carbon/frame.cpp
      src/osx/carbon/mdi.cpp
      src/osx/carbon/metafile.cpp
      src/osx/carbon/overlay.cpp
      src/osx/carbon/popupwin.cpp
-    src/osx/carbon/printdlg.cpp
      src/osx/carbon/renderer.cpp
      src/osx/carbon/settings.cpp
      src/osx/carbon/statbrma.cpp
      src/osx/carbon/renderer.cpp
      src/osx/carbon/settings.cpp
      src/osx/carbon/statbrma.cpp
-    src/osx/carbon/tabctrl.cpp
+    src/osx/carbon/region.cpp
      <!-- cocoa bridge -->
      src/osx/carbon/utilscocoa.mm
      <!-- cocoa bridge -->
      src/osx/carbon/utilscocoa.mm
-</if>
-</set>
-
-<set var="OSX_CARBON_SRC" hints="files">
-    <!-- carbon files -->
-    $(OSX_CARBON_COCOA_SRC)
-    src/osx/artmac.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/evtloop.cpp
-    src/osx/carbon/filedlg.cpp
-    src/osx/carbon/gauge.cpp
-    src/osx/carbon/listbox.cpp
-    src/osx/carbon/listctrl_mac.cpp
-    src/osx/carbon/menu.cpp
-    src/osx/carbon/menuitem.cpp
-    src/osx/carbon/msgdlg.cpp
-    src/osx/carbon/nonownedwnd.cpp
-    src/osx/carbon/notebmac.cpp
-    src/osx/carbon/radiobut.cpp
-    src/osx/carbon/region.cpp
-    src/osx/carbon/scrolbar.cpp
-    src/osx/carbon/slider.cpp
-    src/osx/carbon/spinbutt.cpp
-    src/osx/carbon/srchctrl.cpp
-    src/osx/carbon/statbmp.cpp
-    src/osx/carbon/statbox.cpp
-    src/osx/carbon/statlmac.cpp
-    src/osx/carbon/stattext.cpp
-    src/osx/carbon/textctrl.cpp
-    src/osx/carbon/tglbtn.cpp
-    src/osx/carbon/toolbar.cpp
-    src/osx/carbon/tooltip.cpp
-    src/osx/carbon/window.cpp
-    
-    src/html/htmlctrl/webkit/webkit.mm
-    <!-- Generic implementations used by wxMac: -->
+    <!-- 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
+    src/generic/textmeasure.cpp
+</if>
  </set>
  
  <!-- Header files like wx/osx/foo.h which include wx/osx/carbon/foo.h -->
  <set var="OSX_SHARED_HDR" hints="files">
  </set>
  
  <!-- Header files like wx/osx/foo.h which include wx/osx/carbon/foo.h -->
  <set var="OSX_SHARED_HDR" hints="files">
+    <!-- wxWebKit headers -->
+    wx/html/webkit.h
+    <!-- other shared headers -->
      wx/osx/accel.h
      wx/osx/accel.h
+    wx/osx/anybutton.h
      wx/osx/app.h
      wx/osx/bitmap.h
      wx/osx/bmpbuttn.h
      wx/osx/app.h
      wx/osx/bitmap.h
      wx/osx/bmpbuttn.h
@@ -2342,6 +2398,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/osx/dirdlg.h
      wx/osx/dnd.h
      wx/osx/evtloop.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/filedlg.h
      wx/osx/font.h
      wx/osx/fontdlg.h
@@ -2375,16 +2432,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/osx/scrolbar.h
      wx/osx/slider.h
      wx/osx/spinbutt.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/srchctrl.h
      wx/osx/statbmp.h
      wx/osx/statbox.h
      wx/osx/statline.h
      wx/osx/stattext.h
      wx/osx/statusbr.h
-    wx/osx/tabctrl.h
      wx/osx/taskbarosx.h
      wx/osx/textctrl.h
      wx/osx/taskbarosx.h
      wx/osx/textctrl.h
+    wx/osx/textentry.h
      wx/osx/tglbtn.h
      wx/osx/toolbar.h
      wx/osx/tooltip.h
      wx/osx/tglbtn.h
      wx/osx/toolbar.h
      wx/osx/tooltip.h
@@ -2392,116 +2448,93 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      wx/osx/treectrl.h
      wx/osx/uma.h
      wx/osx/window.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/colrdlgg.h
+    wx/generic/dirdlgg.h
+    wx/generic/fdrepdlg.h
+    wx/generic/filedlgg.h
+    wx/generic/filepickerg.h
+    wx/generic/fontdlgg.h
+    wx/generic/fontpickerg.h
+    wx/generic/listctrl.h
+    wx/generic/prntdlgg.h
+    wx/generic/statusbr.h
+</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>
  </set>
+
  <!-- wxMac Carbon header files -->
  <set var="OSX_CARBON_HDR" hints="files">
      <!-- core files -->
      wx/osx/core/colour.h
      <!-- carbon files -->
  <!-- wxMac Carbon header files -->
  <set var="OSX_CARBON_HDR" hints="files">
      <!-- core files -->
      wx/osx/core/colour.h
      <!-- carbon files -->
-    wx/osx/carbon/accel.h
-    wx/osx/carbon/app.h
-    wx/osx/carbon/bitmap.h
-    wx/osx/carbon/bmpbuttn.h
-    wx/osx/carbon/button.h
-    wx/osx/carbon/checkbox.h
-    wx/osx/carbon/checklst.h
      wx/osx/carbon/chkconf.h
      wx/osx/carbon/chkconf.h
-    wx/osx/carbon/choice.h
-    wx/osx/carbon/clipbrd.h
-    wx/osx/carbon/colordlg.h
-    wx/osx/carbon/combobox.h
-    wx/osx/carbon/control.h
-    wx/osx/carbon/cursor.h
-    wx/osx/carbon/dataform.h
-    wx/osx/carbon/dataobj.h
-    wx/osx/carbon/dataobj2.h
-    wx/osx/carbon/dc.h
-    wx/osx/carbon/dcclient.h
-    wx/osx/carbon/dcmemory.h
-    wx/osx/carbon/dcprint.h
-    wx/osx/carbon/dcscreen.h
-    wx/osx/carbon/dialog.h
-    wx/osx/carbon/dirdlg.h
-    wx/osx/carbon/dnd.h
      wx/osx/carbon/evtloop.h
      wx/osx/carbon/evtloop.h
-    wx/osx/carbon/filedlg.h
-    wx/osx/carbon/font.h
-    wx/osx/carbon/fontdlg.h
-    wx/osx/carbon/frame.h
-    wx/osx/carbon/gauge.h
-    wx/osx/carbon/helpxxxx.h
-    wx/osx/carbon/icon.h
-    wx/osx/carbon/imaglist.h
-    wx/osx/carbon/listbox.h
-    wx/osx/carbon/listctrl.h
-    wx/osx/carbon/mdi.h
-    wx/osx/carbon/menu.h
-    wx/osx/carbon/menuitem.h
-    wx/osx/carbon/metafile.h
-    wx/osx/carbon/mimetype.h
-    wx/osx/carbon/minifram.h
-    wx/osx/carbon/msgdlg.h
-    wx/osx/carbon/nonownedwnd.h
-    wx/osx/carbon/notebook.h
-    wx/osx/carbon/palette.h
-    wx/osx/carbon/popupwin.h
-    wx/osx/carbon/pnghand.h
-    wx/osx/carbon/pngread.h
-    wx/osx/carbon/printdlg.h
-    wx/osx/carbon/printmac.h
      wx/osx/carbon/private.h
      wx/osx/carbon/private.h
-    wx/osx/carbon/private/mactext.h
-    wx/osx/carbon/private/overlay.h
-    wx/osx/carbon/private/print.h
-    wx/osx/carbon/radiobox.h
-    wx/osx/carbon/radiobut.h
      wx/osx/carbon/region.h
      wx/osx/carbon/region.h
-    wx/osx/carbon/scrolbar.h
-    wx/osx/carbon/slider.h
-    wx/osx/carbon/spinbutt.h
-    wx/osx/carbon/spinctrl.h
-    wx/osx/carbon/srchctrl.h
      wx/osx/carbon/statbmp.h
      wx/osx/carbon/statbmp.h
-    wx/osx/carbon/statbox.h
-    wx/osx/carbon/statline.h
-    wx/osx/carbon/stattext.h
-    wx/osx/carbon/statusbr.h
-    wx/osx/carbon/tabctrl.h
-    wx/osx/carbon/textctrl.h
-    wx/osx/carbon/tglbtn.h
-    wx/osx/carbon/toolbar.h
-    wx/osx/carbon/tooltip.h
-    wx/osx/carbon/toplevel.h
-    wx/osx/carbon/treectrl.h
      wx/osx/carbon/uma.h
      wx/osx/carbon/uma.h
-    wx/osx/carbon/window.h
-    <!-- Generic implementations used by wxMac: -->
-    wx/generic/caret.h
-    wx/generic/clrpickerg.h
-    wx/generic/collpaneg.h
-    wx/generic/fdrepdlg.h
-    wx/generic/filepickerg.h
-    wx/generic/fontdlgg.h
-    wx/generic/fontpickerg.h
-    wx/generic/listctrl.h
-    wx/generic/statusbr.h
-    wx/generic/tabg.h
-    <!-- wxWebKit headers -->
-    wx/html/webkit.h
  </set>
  
  <!-- ====================================================================== -->
  </set>
  
  <!-- ====================================================================== -->
-<!--                              wxMac/Cocoa                               -->
+<!--                              wxOSX/Cocoa                               -->
  <!-- ====================================================================== -->
  
  <set var="OSX_COCOA_SRC" hints="files">
      $(OSX_CARBON_COCOA_SRC)
  <!-- ====================================================================== -->
  
  <set var="OSX_COCOA_SRC" hints="files">
      $(OSX_CARBON_COCOA_SRC)
-    src/osx/cocoa/bmpbuttn.mm
+    src/osx/cocoa/anybutton.mm
      src/osx/cocoa/button.mm
      src/osx/cocoa/checkbox.mm
      src/osx/cocoa/choice.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/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/evtloop.mm
      src/osx/cocoa/filedlg.mm
      src/osx/cocoa/gauge.mm
@@ -2512,6 +2545,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/osx/cocoa/nonownedwnd.mm
      src/osx/cocoa/notebook.mm
      src/osx/cocoa/radiobut.mm
      src/osx/cocoa/nonownedwnd.mm
      src/osx/cocoa/notebook.mm
      src/osx/cocoa/radiobut.mm
+    src/osx/cocoa/preferences.mm
+    src/osx/cocoa/printdlg.mm
      src/osx/cocoa/scrolbar.mm
      src/osx/cocoa/slider.mm
      src/osx/cocoa/spinbutt.mm
      src/osx/cocoa/scrolbar.mm
      src/osx/cocoa/slider.mm
      src/osx/cocoa/spinbutt.mm
@@ -2524,34 +2559,47 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
      src/osx/cocoa/toolbar.mm
      src/osx/cocoa/tooltip.mm
      src/osx/cocoa/window.mm
      src/osx/cocoa/toolbar.mm
      src/osx/cocoa/tooltip.mm
      src/osx/cocoa/window.mm
-    src/generic/caret.cpp
-    src/generic/clrpickerg.cpp
-    src/generic/collpaneg.cpp
-    src/generic/fdrepdlg.cpp
-    src/generic/filepickerg.cpp
-    src/generic/fontdlgg.cpp
-    src/generic/fontpickerg.cpp
-    src/generic/listctrl.cpp
-    src/generic/prntdlgg.cpp
-    src/generic/regiong.cpp
-    src/generic/statusbr.cpp
-    src/generic/tabg.cpp
  </set>
  <set var="OSX_COCOA_HDR" hints="files">
      wx/osx/cocoa/chkconf.h
  </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>
  
  <!-- ====================================================================== -->
      wx/osx/cocoa/private.h
      $(OSX_CARBON_HDR) <!-- FIXME: these headers need moved somewhere shared... -->
      wx/generic/region.h
  </set>
  
  <!-- ====================================================================== -->
-<!--                              wxMac/iPhone                              -->
+<!--                              wxOSX/iPhone                              -->
  <!-- ====================================================================== -->
  
  <set var="OSX_IPHONE_SRC" hints="files">
  <!-- ====================================================================== -->
  
  <set var="OSX_IPHONE_SRC" hints="files">
-src/osx/iphone/nonownedwnd.mm
-src/osx/iphone/utils.mm
-src/osx/iphone/window.mm
+    $(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>
  
  <!-- ====================================================================== -->
  </set>
  
  <!-- ====================================================================== -->
@@ -2653,11 +2701,10 @@ src/osx/iphone/window.mm
      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
+    src/generic/textmeasure.cpp
  </set>
  <set var="COCOA_HDR" hints="files">
      wx/cocoa/NSApplication.h
  </set>
  <set var="COCOA_HDR" hints="files">
      wx/cocoa/NSApplication.h
@@ -2700,6 +2747,7 @@ src/osx/iphone/window.mm
      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
@@ -2745,7 +2793,6 @@ src/osx/iphone/window.mm
      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>
  
  
@@ -2762,7 +2809,19 @@ src/osx/iphone/window.mm
      src/univ/themes/win32.cpp
  </set>
  
      src/univ/themes/win32.cpp
  </set>
  
+<set var="UNIV_PLATFORM_SRC" hints="files">
+    <if cond="TOOLKIT=='MSW'">
+        src/msw/evtloop.cpp
+    </if>
+</set>
+<set var="UNIV_PLATFORM_HDR" hints="files">
+    <if cond="TOOLKIT=='MSW'">
+        wx/msw/evtloop.h
+    </if>
+</set>
+
  <set var="UNIV_SRC" hints="files">
  <set var="UNIV_SRC" hints="files">
+    $(UNIV_PLATFORM_SRC)
      src/generic/accel.cpp
      src/generic/clrpickerg.cpp
      src/generic/collpaneg.cpp
      src/generic/accel.cpp
      src/generic/clrpickerg.cpp
      src/generic/collpaneg.cpp
@@ -2775,9 +2834,7 @@ src/osx/iphone/window.mm
      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/bmpbuttn.cpp
      src/univ/button.cpp
      src/univ/checkbox.cpp
@@ -2816,6 +2873,7 @@ src/osx/iphone/window.mm
      src/univ/winuniv.cpp
  </set>
  <set var="UNIV_HDR" hints="files">
      src/univ/winuniv.cpp
  </set>
  <set var="UNIV_HDR" hints="files">
+    $(UNIV_PLATFORM_HDR)
      wx/generic/accel.h
      wx/generic/animate.h
      wx/generic/clrpickerg.h
      wx/generic/accel.h
      wx/generic/animate.h
      wx/generic/clrpickerg.h
@@ -2830,7 +2888,7 @@ src/osx/iphone/window.mm
      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
@@ -2841,6 +2899,7 @@ src/osx/iphone/window.mm
      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
@@ -2850,6 +2909,7 @@ src/osx/iphone/window.mm
      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
@@ -2882,15 +2942,21 @@ src/osx/iphone/window.mm
      src/common/bmpcboxcmn.cpp
      src/common/calctrlcmn.cpp
      src/common/datavcmn.cpp
      src/common/bmpcboxcmn.cpp
      src/common/calctrlcmn.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/calctrlg.cpp
      src/generic/bmpcboxg.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
@@ -2898,29 +2964,39 @@ src/osx/iphone/window.mm
      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/generic/calctrlg.h
      wx/generic/datectrl.h
      wx/generic/dataview.h
      wx/editlbox.h
      wx/generic/aboutdlgg.h
      wx/generic/bmpcbox.h
      wx/generic/calctrlg.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
@@ -2929,6 +3005,7 @@ src/osx/iphone/window.mm
      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
@@ -2937,24 +3014,26 @@ src/osx/iphone/window.mm
      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
@@ -2962,16 +3041,25 @@ src/osx/iphone/window.mm
  
  <!-- 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/bmpcbox.cpp
      src/msw/calctrl.cpp
+    src/msw/commandlinkbutton.cpp
      src/msw/datecontrols.cpp
      src/msw/datectrl.cpp
      src/msw/datecontrols.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/bmpcbox.h
+    wx/msw/commandlinkbutton.h
      wx/msw/calctrl.h
      wx/msw/calctrl.h
-    wx/msw/datecontrols.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: -->
@@ -2987,8 +3075,9 @@ src/osx/iphone/window.mm
      src/generic/animateg.cpp
      src/osx/carbon/aboutdlg.cpp
      src/osx/carbon/drawer.cpp
      src/generic/animateg.cpp
      src/osx/carbon/aboutdlg.cpp
      src/osx/carbon/drawer.cpp
+    src/osx/dataview_osx.cpp
      src/osx/carbon/dataview.cpp
      src/osx/carbon/dataview.cpp
-    src/osx/carbon/databrow.cpp
+    src/osx/sound_osx.cpp
      src/osx/carbon/sound.cpp
      src/osx/carbon/taskbar.cpp
      src/osx/core/hidjoystick.cpp
      src/osx/carbon/sound.cpp
      src/osx/carbon/taskbar.cpp
      src/osx/core/hidjoystick.cpp
@@ -2997,20 +3086,29 @@ src/osx/iphone/window.mm
  <set var="ADVANCED_OSX_CARBON_HDR" hints="files">
      wx/generic/animate.h
      wx/osx/dataview.h
  <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/joystick.h
      wx/osx/sound.h
+    wx/osx/taskbarosx.h
      wx/osx/carbon/drawer.h
      wx/osx/carbon/dataview.h
      wx/osx/carbon/drawer.h
      wx/osx/carbon/dataview.h
-    wx/osx/carbon/databrow.h
-    wx/osx/carbon/sound.h
-    wx/osx/carbon/taskbarosx.h
      wx/osx/core/joystick.h
  </set>
  
  <set var="ADVANCED_OSX_COCOA_SRC" hints="files">
      src/common/taskbarcmn.cpp
      src/generic/animateg.cpp
      wx/osx/core/joystick.h
  </set>
  
  <set var="ADVANCED_OSX_COCOA_SRC" hints="files">
      src/common/taskbarcmn.cpp
      src/generic/animateg.cpp
+    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/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>
      src/osx/cocoa/taskbar.mm
      src/osx/core/hidjoystick.cpp
  </set>
@@ -3018,14 +3116,27 @@ src/osx/iphone/window.mm
  <set var="ADVANCED_OSX_COCOA_HDR" hints="files">
      wx/generic/animate.h
      wx/osx/dataview.h
  <set var="ADVANCED_OSX_COCOA_HDR" hints="files">
      wx/generic/animate.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/joystick.h
      wx/osx/sound.h
-    <!--wx/osx/carbon/drawer.h -->
-    <!--wx/osx/carbon/dataview.h -->
-    <!--wx/osx/carbon/databrow.h -->
-    wx/osx/carbon/sound.h
-    wx/osx/carbon/taskbarosx.h
+    wx/osx/taskbarosx.h
+    wx/osx/timectrl.h
      wx/osx/core/joystick.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">
  </set>
  
  <set var="ADVANCED_COCOA_SRC" hints="files">
@@ -3072,12 +3183,43 @@ src/osx/iphone/window.mm
      wx/generic/animate.h
  </set>
  
      wx/generic/animate.h
  </set>
  
+<set var="ADVANCED_GTK_WIN32_SRC" hints="files">
+    src/common/taskbarcmn.cpp
+    src/msw/joystick.cpp
+    src/msw/sound.cpp
+</set>
+<set var="ADVANCED_GTK_WIN32_HDR" hints="files">
+    wx/msw/joystick.h
+    wx/msw/sound.h
+    wx/msw/taskbar.h
+</set>
+<set var="ADVANCED_GTK_PLATFORM_SRC" hints="files">
+    <if cond="PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_SRC)</if>
+    <if cond="PLATFORM_MACOSX=='1'">$(ADVANCED_UNIX_SRC)</if>
+    <if cond="PLATFORM_WIN32=='1'">$(ADVANCED_GTK_WIN32_SRC)</if>
+</set>
+<set var="ADVANCED_GTK_PLATFORM_HDR" hints="files">
+    <if cond="PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_HDR)</if>
+    <if cond="PLATFORM_MACOSX=='1'">$(ADVANCED_UNIX_HDR)</if>
+    <if cond="PLATFORM_WIN32=='1'">$(ADVANCED_GTK_WIN32_HDR)</if>
+</set>
  <set var="ADVANCED_GTK_SRC" hints="files">
  <set var="ADVANCED_GTK_SRC" hints="files">
+    $(ADVANCED_GTK_PLATFORM_SRC)
+    src/gtk/notifmsg.cpp
      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/notifmsg.h
+    wx/gtk/taskbar.h
+</set>
+<set var="ADVANCED_GTK2_HDR" hints="files">
+    $(ADVANCED_GTK_HDR)
      wx/gtk/hildon/notifmsg.h
  </set>
  
      wx/gtk/hildon/notifmsg.h
  </set>
  
@@ -3094,6 +3236,8 @@ src/osx/iphone/window.mm
      wx/gtk/bmpcbox.h
      wx/gtk/calctrl.h
      wx/gtk/dataview.h
      wx/gtk/bmpcbox.h
      wx/gtk/calctrl.h
      wx/gtk/dataview.h
+    wx/gtk/dvrenderer.h
+    wx/gtk/dvrenderers.h
      wx/gtk/hyperlink.h
  </set>
  
      wx/gtk/hyperlink.h
  </set>
  
@@ -3107,7 +3251,22 @@ src/osx/iphone/window.mm
  </set>
  
  <set var="ADVANCED_UNIV_SRC" hints="files">
  </set>
  
  <set var="ADVANCED_UNIV_SRC" hints="files">
-    src/generic/animateg.cpp
+<!--
+    Including src/generic/animateg.cpp hre unconditionally results in bakefile
+    errors when not fixing the value of TOOLKIT to MSW in msvc format, see #15327.
+-->
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
+        src/generic/animateg.cpp
+    </if>
+    <if cond="TOOLKIT=='MSW'">
+        src/generic/animateg.cpp
+    </if>
+    <if cond="TOOLKIT=='WINCE'">
+        src/generic/animateg.cpp
+    </if>
+    <if cond="TOOLKIT=='X11'">
+        src/generic/animateg.cpp
+    </if>
  </set>
  <set var="ADVANCED_UNIV_HDR" hints="files">
      wx/generic/animate.h
  </set>
  <set var="ADVANCED_UNIV_HDR" hints="files">
      wx/generic/animate.h
@@ -3129,10 +3288,8 @@ src/osx/iphone/window.mm
      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">
@@ -3147,11 +3304,17 @@ src/osx/iphone/window.mm
  </set>
  
  <set var="MEDIA_OSX_COCOA_SRC" hints="files">
  </set>
  
  <set var="MEDIA_OSX_COCOA_SRC" hints="files">
-    <!-- src/osx/cocoa/mediactrl.mm -->
+    src/osx/cocoa/mediactrl.mm
  </set>
  <set var="MEDIA_OSX_COCOA_HDR" hints="files">
  </set>
  
  </set>
  <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">
      src/cocoa/mediactrl.mm
  </set>
  <set var="MEDIA_COCOA_SRC" hints="files">
      src/cocoa/mediactrl.mm
  </set>
@@ -3211,8 +3374,10 @@ src/osx/iphone/window.mm
      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
@@ -3235,6 +3400,7 @@ src/osx/iphone/window.mm
      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: -->
@@ -3242,7 +3408,43 @@ src/osx/iphone/window.mm
      $(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
+    src/common/webviewfshandler.cpp
+</set>
  
  
+<set var="WEBVIEW_HDR_PLATFORM" hints="files">
+    <if cond="TOOLKIT=='MSW'">
+        wx/msw/webviewhistoryitem_ie.h
+        wx/msw/webview_ie.h
+        wx/msw/webview_missing.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
+    wx/webviewfshandler.h
+</set>
  
  <!-- ====================================================================== -->
  <!--                                wxXRC                                   -->
  
  <!-- ====================================================================== -->
  <!--                                wxXRC                                   -->
@@ -3250,6 +3452,7 @@ src/osx/iphone/window.mm
  
  <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
@@ -3260,15 +3463,18 @@ src/osx/iphone/window.mm
      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
@@ -3277,6 +3483,7 @@ src/osx/iphone/window.mm
      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
@@ -3284,8 +3491,6 @@ src/osx/iphone/window.mm
      src/xrc/xh_propdlg.cpp
      src/xrc/xh_radbt.cpp
      src/xrc/xh_radbx.cpp
      src/xrc/xh_propdlg.cpp
      src/xrc/xh_radbt.cpp
      src/xrc/xh_radbx.cpp
-    <!-- disabled until linking problems are fixed -->
-    <!-- src/xrc/xh_richtext.cpp -->
      src/xrc/xh_scrol.cpp
      src/xrc/xh_scwin.cpp
      src/xrc/xh_htmllbox.cpp
      src/xrc/xh_scrol.cpp
      src/xrc/xh_scwin.cpp
      src/xrc/xh_htmllbox.cpp
@@ -3301,7 +3506,9 @@ src/osx/iphone/window.mm
      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_tree.cpp
      src/xrc/xh_treebk.cpp
      src/xrc/xh_unkwn.cpp
@@ -3313,6 +3520,7 @@ src/osx/iphone/window.mm
  <set var="XRC_HDR" hints="files">
      wx/xrc/xh_all.h
      wx/xrc/xh_animatctrl.h
  <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
@@ -3323,11 +3531,15 @@ src/osx/iphone/window.mm
      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
@@ -3347,7 +3559,6 @@ src/osx/iphone/window.mm
      wx/xrc/xh_propdlg.h
      wx/xrc/xh_radbt.h
      wx/xrc/xh_radbx.h
      wx/xrc/xh_propdlg.h
      wx/xrc/xh_radbt.h
      wx/xrc/xh_radbx.h
-    <!-- wx/xrc/xh_richtext.h -->
      wx/xrc/xh_scrol.h
      wx/xrc/xh_scwin.h
      wx/xrc/xh_htmllbox.h
      wx/xrc/xh_scrol.h
      wx/xrc/xh_scwin.h
      wx/xrc/xh_htmllbox.h
@@ -3363,7 +3574,9 @@ src/osx/iphone/window.mm
      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
@@ -3395,7 +3608,12 @@ src/osx/iphone/window.mm
  <set var="OPENGL_SRC_PLATFORM" hints="files">
      <if cond="TOOLKIT=='OSX_CARBON'">src/osx/carbon/glcanvas.cpp src/osx/glcanvas_osx.cpp</if>
      <if cond="TOOLKIT=='OSX_COCOA'">src/osx/cocoa/glcanvas.mm src/osx/glcanvas_osx.cpp</if>
  <set var="OPENGL_SRC_PLATFORM" hints="files">
      <if cond="TOOLKIT=='OSX_CARBON'">src/osx/carbon/glcanvas.cpp src/osx/glcanvas_osx.cpp</if>
      <if cond="TOOLKIT=='OSX_COCOA'">src/osx/cocoa/glcanvas.mm src/osx/glcanvas_osx.cpp</if>
+    <if cond="TOOLKIT=='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' and PLATFORM_WIN32=='0'">
+        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
@@ -3417,8 +3635,13 @@ src/osx/iphone/window.mm
  </set>
  
  <set var="OPENGL_HDR_PLATFORM" hints="files">
  </set>
  
  <set var="OPENGL_HDR_PLATFORM" hints="files">
-    <if cond="TOOLKIT=='OSX_CARBON'">wx/osx/glcanvas.h wx/osx/carbon/glcanvas.h</if>
+    <if cond="TOOLKIT=='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
@@ -3451,6 +3674,16 @@ src/osx/iphone/window.mm
  <!--                                  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
  <set var="AUI_SRC" hints="files">
      src/aui/framemanager.cpp
      src/aui/dockart.cpp
@@ -3458,6 +3691,9 @@ src/osx/iphone/window.mm
      src/aui/auibook.cpp
      src/aui/auibar.cpp
      src/aui/tabmdi.cpp
      src/aui/auibook.cpp
      src/aui/auibar.cpp
      src/aui/tabmdi.cpp
+    src/aui/tabart.cpp
+    src/xrc/xh_auinotbk.cpp
+    $(AUI_GTK_SRC)
  </set>
  <set var="AUI_HDR" hints="files">
      wx/aui/framemanager.h
  </set>
  <set var="AUI_HDR" hints="files">
      wx/aui/framemanager.h
@@ -3467,6 +3703,39 @@ src/osx/iphone/window.mm
      wx/aui/auibar.h
      wx/aui/tabmdi.h
      wx/aui/aui.h
      wx/aui/auibar.h
      wx/aui/tabmdi.h
      wx/aui/aui.h
+    wx/aui/tabart.h
+    wx/xrc/xh_auinotbk.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
+    src/xrc/xh_ribbon.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
+    wx/xrc/xh_ribbon.h
  </set>
  
  <!-- ====================================================================== -->
  </set>
  
  <!-- ====================================================================== -->
@@ -3500,26 +3769,42 @@ src/osx/iphone/window.mm
  <!-- ====================================================================== -->
  
  <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
+    src/xrc/xh_richtext.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/richtexttabspage.h
+    wx/richtext/richtextuicustomization.h
+    wx/richtext/richtextxml.h
+    wx/xrc/xh_richtext.h
  </set>
  
  
  </set>
  
  
@@ -3548,6 +3833,7 @@ src/osx/iphone/window.mm
      <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>
      <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=='COCOA'">$(BASE_OSX_NOTWXMAC_SRC)</if>
          <if cond="TOOLKIT=='GTK'">$(BASE_OSX_NOTWXMAC_SRC)</if>
          <if cond="TOOLKIT=='X11'">$(BASE_OSX_NOTWXMAC_SRC)</if>
@@ -3563,7 +3849,6 @@ src/osx/iphone/window.mm
          <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC) $(BASE_WINCE_SRC)</if>
          <if cond="PLATFORM_MACOSX=='1'">$(BASE_OSX_SHARED_SRC)</if>
          <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_SRC)</if>
          <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC) $(BASE_WINCE_SRC)</if>
          <if cond="PLATFORM_MACOSX=='1'">$(BASE_OSX_SHARED_SRC)</if>
          <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_SRC)</if>
-        <if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_SRC)</if>
          <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_SRC)</if>
      </set>
      <set var="BASE_AND_GUI_TOOLKIT_SRC" hints="files">
          <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_SRC)</if>
      </set>
      <set var="BASE_AND_GUI_TOOLKIT_SRC" hints="files">
@@ -3572,7 +3857,6 @@ src/osx/iphone/window.mm
      </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 -->
@@ -3597,7 +3881,6 @@ src/osx/iphone/window.mm
          <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_OSX_HDR)</if>
          <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_OSX_HDR)</if>
-        <if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_HDR)</if>
          <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_HDR)</if>
          <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_HDR)</if>
      </set>
          <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_HDR)</if>
          <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_HDR)</if>
      </set>
@@ -3630,20 +3913,22 @@ src/osx/iphone/window.mm
      <!-- 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=='2'">$(GTK2_LOWLEVEL_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_DESKTOP_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='OSX_CARBON'">$(OSX_LOWLEVEL_SRC)</if>
          <if cond="TOOLKIT=='OSX_COCOA'">$(OSX_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=='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=='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>
@@ -3651,10 +3936,10 @@ src/osx/iphone/window.mm
          <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='OSX_CARBON'">$(OSX_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='OSX_COCOA'">$(OSX_LOWLEVEL_HDR)</if>
          <if cond="TOOLKIT=='WINCE'">$(MSW_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>
  
@@ -3664,24 +3949,28 @@ src/osx/iphone/window.mm
      </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=='2'">$(GTK2_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_SRC)</if>
          <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_SRC)</if>
          <if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
          <if cond="TOOLKIT=='MSW'">$(MSW_SRC) $(MSW_DESKTOP_SRC)</if>
          <if cond="TOOLKIT=='WINCE'">$(MSW_SRC) $(WINCE_SRC)</if>
          <if cond="TOOLKIT=='OSX_CARBON'">$(OSX_CARBON_SRC)</if>
          <if cond="TOOLKIT=='OSX_COCOA'">$(OSX_COCOA_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=='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=='2'">$(GTK2_HDR)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_HDR)</if>
          <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_HDR)</if>
          <if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
          <if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_DESKTOP_HDR)</if>
          <if cond="TOOLKIT=='WINCE'">$(MSW_HDR) $(WINCE_HDR)</if>
          <if cond="TOOLKIT=='OSX_CARBON'">$(OSX_SHARED_HDR) $(OSX_CARBON_HDR)</if>
          <if cond="TOOLKIT=='OSX_COCOA'">$(OSX_SHARED_HDR) $(OSX_COCOA_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=='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>
@@ -3701,12 +3990,13 @@ src/osx/iphone/window.mm
          <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_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=='WINCE'">$(ADVANCED_MSW_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=='2'">$(ADVANCED_GTK2_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_SRC)</if>
          <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK1_SRC)</if>
          <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
          <if cond="TOOLKIT=='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=='PM'">$(ADVANCED_OS2_SRC)</if>
      </set>
      <set var="ADVANCED_PLATFORM_HDR" hints="files">
@@ -3714,23 +4004,26 @@ src/osx/iphone/window.mm
          <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_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=='WINCE'">$(ADVANCED_MSW_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=='2'">$(ADVANCED_GTK2_HDR)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_HDR)</if>
          <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK1_HDR)</if>
          <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
          <if cond="TOOLKIT=='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=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK_NATIVE_SRC)</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=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK_NATIVE_SRC)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_NATIVE_SRC)</if>
          <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_SRC)</if>
          <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_NATIVE_SRC)</if>
      </set>
      <set var="ADVANCED_PLATFORM_NATIVE_HDR" hints="files">
          <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK_NATIVE_HDR)</if>
          <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_SRC)</if>
          <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_NATIVE_SRC)</if>
      </set>
      <set var="ADVANCED_PLATFORM_NATIVE_HDR" hints="files">
          <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK_NATIVE_HDR)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(ADVANCED_GTK_NATIVE_HDR)</if>
          <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_HDR)</if>
          <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_NATIVE_HDR)</if>
      </set>
          <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_NATIVE_HDR)</if>
          <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_NATIVE_HDR)</if>
      </set>
@@ -3750,6 +4043,7 @@ src/osx/iphone/window.mm
          <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_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=='WINCE'">$(MEDIA_MSW_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>
@@ -3760,6 +4054,8 @@ src/osx/iphone/window.mm
          <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_HDR) $(MEDIA_MSW_DESKTOP_HDR)</if>
          <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_HDR)</if>
          <if cond="TOOLKIT=='OSX_CARBON'">$(MEDIA_OSX_CARBON_HDR)</if>
          <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_HDR) $(MEDIA_MSW_DESKTOP_HDR)</if>
          <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_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>
@@ -3782,7 +4078,7 @@ src/osx/iphone/window.mm
              $(GUI_CORE_HEADERS)
              $(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
              $(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(PROPGRID_HDR)
              $(GUI_CORE_HEADERS)
              $(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
              $(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(PROPGRID_HDR)
-            $(RICHTEXT_HDR) $(STC_HDR)
+            $(RIBBON_HDR) $(RICHTEXT_HDR) $(STC_HDR) $(WEBVIEW_HDR)
          </if>
      </set>
  
          </if>
      </set>
  
@@ -3803,7 +4099,6 @@ src/osx/iphone/window.mm
          $(BASE_UNIX_HDR)
          $(BASE_WIN32_HDR) $(BASE_WINCE_HDR)
          $(BASE_OSX_HDR)
          $(BASE_UNIX_HDR)
          $(BASE_WIN32_HDR) $(BASE_WINCE_HDR)
          $(BASE_OSX_HDR)
-        $(BASE_PALMOS_HDR)
          $(BASE_MSDOS_HDR)
          $(NET_CMN_HDR)
          $(XML_HDR)
          $(BASE_MSDOS_HDR)
          $(NET_CMN_HDR)
          $(XML_HDR)
@@ -3816,7 +4111,6 @@ src/osx/iphone/window.mm
          $(BASE_OSX_SRC)
          $(BASE_OS2_SRC)
          $(BASE_MSDOS_SRC)
          $(BASE_OSX_SRC)
          $(BASE_OS2_SRC)
          $(BASE_MSDOS_SRC)
-        $(BASE_PALMOS_SRC)
          $(BASE_AND_GUI_CMN_SRC)
          $(BASE_AND_GUI_OSX_CARBON_SRC)
          $(BASE_AND_GUI_OSX_COCOA_SRC)
          $(BASE_AND_GUI_CMN_SRC)
          $(BASE_AND_GUI_OSX_CARBON_SRC)
          $(BASE_AND_GUI_OSX_COCOA_SRC)