X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a02a5cfcf33bb2c0edae246c1b19e286bf86d422..adb783cc0af30cc88042f26b4efb060b04de05f4:/build/bakefiles/files.bkl

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 2605b2baf5..1e08f1cd5e 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -197,9 +197,9 @@ 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/objcid.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) -->
@@ -222,6 +222,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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)
@@ -264,35 +268,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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                                    -->
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
@@ -350,6 +325,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/init.cpp
     src/common/intl.cpp
     src/common/ipcbase.cpp
+    src/common/languageinfo.cpp
     src/common/list.cpp
     src/common/log.cpp
     src/common/longlong.cpp
@@ -357,6 +333,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/mimecmn.cpp
     src/common/module.cpp
     src/common/mstream.cpp
+    src/common/numformatter.cpp
     src/common/object.cpp
     src/common/platinfo.cpp
     src/common/powercmn.cpp
@@ -376,9 +353,11 @@ 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/time.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
@@ -440,6 +419,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/dynload.h
     wx/encconv.h
     wx/event.h
+    wx/eventfilter.h
     wx/evtloop.h
     wx/except.h
     wx/features.h
@@ -468,6 +448,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/ipc.h
     wx/ipcbase.h
     wx/kbdstate.h
+    wx/language.h
     wx/link.h
     wx/list.h
     wx/listimpl.cpp
@@ -481,7 +462,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/module.h
     wx/mousestate.h
     wx/msgout.h
+    wx/msgqueue.h
     wx/mstream.h
+    wx/numformatter.h
     wx/object.h
     wx/platform.h
     wx/platinfo.h
@@ -491,6 +474,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/ptr_shrd.h
     wx/recguard.h
     wx/regex.h
+    wx/rtti.h
     wx/scopedarray.h
     wx/scopedptr.h
     wx/scopeguard.h
@@ -515,10 +499,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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/translation.h
     wx/txtstrm.h
     wx/typeinfo.h
     wx/types.h
@@ -529,6 +515,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/variant.h
     wx/vector.h
     wx/version.h
+    wx/versioninfo.h
     wx/volume.h
     wx/weakref.h
     wx/wfstream.h
@@ -540,13 +527,20 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/wxprec.h
     wx/xlocale.h
     wx/xti.h
+    wx/xti2.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/meta/implicitconversion.h
     wx/meta/int2type.h
     wx/meta/movable.h
+    wx/meta/pod.h
     wx/fswatcher.h
     wx/generic/fswatcher.h
 </set>
@@ -570,7 +564,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/urlmsw.cpp
 </set>
 <set var="NET_WIN32_HDR" hints="files">
-    wx/msw/private/sockmsw.h
 </set>
 
 <set var="NET_WINCE_SRC" hints="files">
@@ -631,17 +624,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/accelcmn.cpp
     src/common/accesscmn.cpp
     src/common/anidecod.cpp
+    src/common/affinematrix2d.cpp
     src/common/appcmn.cpp
     src/common/artprov.cpp
     src/common/artstd.cpp
+    src/common/arttango.cpp
     src/common/bmpbase.cpp
+    src/common/bmpbtncmn.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/colourdata.cpp
     src/common/combocmn.cpp
     src/common/cmdproc.cpp
     src/common/cmndata.cpp
@@ -649,11 +648,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/cshelp.cpp
     src/common/ctrlcmn.cpp
     src/common/ctrlsub.cpp
-    src/common/datacmn.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
@@ -664,10 +663,12 @@ 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/filehistorycmn.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
@@ -699,6 +700,7 @@ 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/markupparser.cpp
     src/common/matrix.cpp
     src/common/menucmn.cpp
     src/common/mousemanager.cpp
@@ -706,20 +708,28 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/overlaycmn.cpp
     src/common/ownerdrwcmn.cpp
     src/common/paper.cpp
+    src/common/panelcmn.cpp
     src/common/persist.cpp
     src/common/pickerbase.cpp
     src/common/popupcmn.cpp
     src/common/prntbase.cpp
     src/common/quantize.cpp
+    src/common/radiobtncmn.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/slidercmn.cpp
+    src/common/spinbtncmn.cpp
     src/common/spinctrlcmn.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
@@ -731,6 +741,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -745,13 +756,16 @@ 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/infobar.cpp
     src/generic/listbkg.cpp
     src/generic/logg.cpp
+    src/generic/markuptext.cpp
+    src/generic/msgdlgg.cpp
     src/generic/numdlgg.cpp
-    src/generic/panelg.cpp
     src/generic/progdlgg.cpp
     src/generic/printps.cpp
     src/generic/renderg.cpp
+    src/generic/richmsgdlgg.cpp
     src/generic/scrlwing.cpp
     src/generic/selstore.cpp
     src/generic/spinctlg.cpp
@@ -768,6 +782,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/vscroll.cpp
 </set>
 <set var="GUI_CMN_HDR" hints="files">
+    wx/affinematrix2dbase.h
+    wx/affinematrix2d.h
+    wx/anybutton.h
     wx/bmpbuttn.h
     wx/brush.h
     wx/button.h
@@ -780,9 +797,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/collpane.h
     wx/combo.h
     wx/combobox.h
+    wx/compositewin.h
     wx/control.h
     wx/ctrlsub.h
     wx/cursor.h
+    wx/custombgwin.h
     wx/dc.h
     wx/dcclient.h
     wx/dcgraph.h
@@ -804,11 +823,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/choicdgg.h
     wx/generic/colrdlgg.h
     wx/generic/combo.h
+    wx/generic/custombgwin.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
@@ -817,6 +838,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/richmsgdlgg.h
     wx/generic/scrolwin.h
     wx/generic/spinctlg.h
     wx/generic/splitter.h
@@ -830,6 +852,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/headerctrl.h
     wx/helphtml.h
     wx/icon.h
+    wx/infobar.h
+    wx/itemid.h
     wx/layout.h
     wx/listbox.h
     wx/mdi.h
@@ -845,8 +869,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/position.h
     wx/radiobox.h
     wx/radiobut.h
+    wx/range.h
     wx/rearrangectrl.h
     wx/renderer.h
+    wx/richmsgdlg.h
     wx/scrolbar.h
     wx/scrolbar.h
     wx/scrolwin.h
@@ -858,6 +884,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/statbox.h
     wx/stattext.h
     wx/statusbr.h
+    wx/textcompleter.h
     wx/textctrl.h
     wx/textdlg.h
     wx/textentry.h
@@ -865,8 +892,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/toolbar.h
     wx/validate.h
     wx/valtext.h
+    wx/valnum.h
     wx/window.h
     wx/windowid.h
+    wx/withimages.h
     wx/wrapsizer.h
     wx/wupdlock.h
 
@@ -886,6 +915,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cmdproc.h
     wx/colordlg.h
     wx/colour.h
+    wx/colourdata.h
     wx/cshelp.h
     wx/dataobj.h
     wx/dcmirror.h
@@ -901,10 +931,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/evtloopsrc.h
     wx/fdrepdlg.h
     wx/filectrl.h
+    wx/filehistory.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
@@ -940,6 +972,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -1016,7 +1049,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -1030,9 +1063,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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/nonownedwnd.cpp
     src/gtk/pen.cpp
     src/gtk/popupwin.cpp
     src/gtk/private.cpp
@@ -1068,10 +1103,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/evtloop.h
     wx/gtk/evtloopsrc.h
     wx/gtk/font.h
+    wx/gtk/filehistory.h
     wx/gtk/minifram.h
+    wx/gtk/nonownedwnd.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
@@ -1088,8 +1124,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/statusbr.cpp
     <!-- Generic implementations used by wxGPE: -->
     src/generic/fontdlgg.cpp
-    src/generic/msgdlgg.cpp
     <!-- GTK+ specific files: -->
+    src/gtk/anybutton.cpp
     src/gtk/artgtk.cpp
     src/gtk/bmpbuttn.cpp
     src/gtk/button.cpp
@@ -1111,7 +1147,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/gauge.cpp
     src/gtk/gnome/gprint.cpp
     src/gtk/gnome/gvfs.cpp
-    src/gtk/print.cpp
+    src/gtk/infobar.cpp
     src/gtk/listbox.cpp
     src/gtk/mdi.cpp
     src/gtk/menu.cpp
@@ -1119,6 +1155,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/print.cpp
     src/gtk/radiobox.cpp
     src/gtk/radiobut.cpp
     src/gtk/scrolbar.cpp
@@ -1143,6 +1180,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/listctrl.h
     wx/generic/statusbr.h
     wx/gtk/accel.h
+    wx/gtk/anybutton.h
     wx/gtk/bmpbuttn.h
     wx/gtk/button.h
     wx/gtk/checkbox.h
@@ -1165,13 +1203,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/gauge.h
     wx/gtk/gnome/gprint.h
     wx/gtk/gnome/gvfs.h
-    wx/gtk/print.h
+    wx/gtk/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/print.h
     wx/gtk/radiobox.h
     wx/gtk/radiobut.h
     wx/gtk/scrolbar.h
@@ -1270,7 +1309,6 @@ 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/msgdlgg.cpp
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
     <!-- GTK1 specific files: -->
@@ -1289,6 +1327,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/mnemonics.cpp
     src/gtk1/notebook.cpp
     src/gtk1/radiobox.cpp
     src/gtk1/radiobut.cpp
@@ -1301,7 +1340,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/tooltip.cpp
+    src/gtk1/toolbar.cpp
     src/gtk1/textctrl.cpp
     src/gtk1/tglbtn.cpp
 </set>
@@ -1347,7 +1386,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/tooltip.h
+    wx/gtk1/toolbar.h
     wx/gtk1/textctrl.h
     wx/gtk1/tglbtn.h
     wx/gtk1/treectrl.h
@@ -1622,6 +1661,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/icon.cpp
     src/msw/imaglist.cpp
     src/msw/minifram.cpp
+    src/msw/nonownedwnd.cpp
     src/msw/ole/dataobj.cpp
     src/msw/ole/dropsrc.cpp
     src/msw/ole/droptgt.cpp
@@ -1636,11 +1676,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/settings.cpp
     src/msw/tooltip.cpp
     src/msw/toplevel.cpp
+    src/msw/uiaction.cpp
     src/msw/utilsgui.cpp
     src/msw/uxtheme.cpp
     src/msw/window.cpp
 </set>
 <set var="MSW_LOWLEVEL_HDR" hints="files">
+    wx/msw/nonownedwnd.h
     wx/msw/ole/activex.h
     wx/msw/popupwin.h
     wx/msw/uxtheme.h
@@ -1668,6 +1710,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/msw/anybutton.cpp
     src/msw/artmsw.cpp
     src/msw/bmpbuttn.cpp
     src/msw/button.cpp
@@ -1697,8 +1740,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/panel.cpp
+    src/msw/progdlg.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
@@ -1713,7 +1759,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/textentry.cpp
     src/msw/tglbtn.cpp
     src/msw/treectrl.cpp
-    src/msw/uiaction.cpp
 </set>
 <set var="MSW_HDR" hints="files">
     wx/generic/clrpickerg.h
@@ -1721,6 +1766,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/msw/anybutton.h
     wx/msw/app.h
     wx/msw/bitmap.h
     wx/msw/bmpbuttn.h
@@ -1737,6 +1783,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/custombgwin.h
     wx/msw/dc.h
     wx/msw/dcclient.h
     wx/msw/dcmemory.h
@@ -1777,15 +1824,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/ole/oleutils.h
     wx/msw/ownerdrw.h
     wx/msw/palette.h
+    wx/msw/panel.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/richmsgdlg.h
     wx/msw/scrolbar.h
-    wx/msw/setup0.h
     wx/msw/slider.h
     wx/msw/spinbutt.h
     wx/msw/spinctrl.h
@@ -1883,69 +1932,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </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                                   -->
 <!-- ====================================================================== -->
@@ -2167,7 +2153,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/setup0.h
     wx/os2/slider.h
     wx/os2/spinbutt.h
     wx/os2/spinctrl.h
@@ -2187,7 +2172,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 
 <!-- ====================================================================== -->
-<!--                                wxMac                                   -->
+<!--                                wxOSX Common                            -->
 <!-- ====================================================================== -->
 
 <set var="OSX_LOWLEVEL_SRC" hints="files">
@@ -2203,6 +2188,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/osx/palette.cpp
     src/osx/pen.cpp
     src/osx/toplevel_osx.cpp
+    src/osx/uiaction_osx.cpp
     src/osx/utils_osx.cpp
     <!-- src/osx/treectrl.cpp -->
     src/osx/window_osx.cpp
@@ -2234,6 +2220,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <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
@@ -2261,7 +2248,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/osx/textctrl_osx.cpp
     src/osx/tglbtn_osx.cpp
     src/osx/toolbar_osx.cpp
-    src/osx/uiaction_osx.cpp
     <!-- wxWebKit files -->
     src/html/htmlctrl/webkit/webkit.mm
     <!-- Native color/font dialogs -->
@@ -2312,50 +2298,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </if>
 </set>
 
-<set var="OSX_CARBON_SRC" hints="files">
-    <!-- carbon files -->
-    $(OSX_CARBON_COCOA_SRC)
-    src/osx/carbon/bmpbuttn.cpp
-    src/osx/carbon/button.cpp
-    src/osx/carbon/checkbox.cpp
-    src/osx/carbon/choice.cpp
-    src/osx/carbon/colordlg.cpp
-    src/osx/carbon/dialog.cpp
-    src/osx/carbon/dirdlg.cpp
-    src/osx/carbon/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>
-
 <!-- Header files like wx/osx/foo.h which include wx/osx/carbon/foo.h -->
 <set var="OSX_SHARED_HDR" hints="files">
     <!-- wxWebKit headers -->
     wx/html/webkit.h
     <!-- other shared headers -->
     wx/osx/accel.h
+    wx/osx/anybutton.h
     wx/osx/app.h
     wx/osx/bitmap.h
     wx/osx/bmpbuttn.h
@@ -2449,6 +2398,50 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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>
+
 <!-- wxMac Carbon header files -->
 <set var="OSX_CARBON_HDR" hints="files">
     <!-- core files -->
@@ -2457,21 +2450,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/osx/carbon/chkconf.h
     wx/osx/carbon/evtloop.h
     wx/osx/carbon/private.h
-    wx/osx/carbon/private/mactext.h
-    wx/osx/carbon/private/overlay.h
-    wx/osx/carbon/private/print.h
     wx/osx/carbon/region.h
     wx/osx/carbon/statbmp.h
     wx/osx/carbon/uma.h
 </set>
 
 <!-- ====================================================================== -->
-<!--                              wxMac/Cocoa                               -->
+<!--                              wxOSX/Cocoa                               -->
 <!-- ====================================================================== -->
 
 <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
@@ -2513,13 +2503,37 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <!-- ====================================================================== -->
-<!--                              wxMac/iPhone                              -->
+<!--                              wxOSX/iPhone                              -->
 <!-- ====================================================================== -->
 
 <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>
 
 <!-- ====================================================================== -->
@@ -2621,7 +2635,6 @@ src/osx/iphone/window.mm
     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
@@ -2742,7 +2755,6 @@ src/osx/iphone/window.mm
     src/generic/fontpickerg.cpp
     src/generic/listctrl.cpp
     src/generic/mdig.cpp
-    src/generic/msgdlgg.cpp
     src/generic/prntdlgg.cpp
     src/univ/bmpbuttn.cpp
     src/univ/button.cpp
@@ -2796,6 +2808,7 @@ src/osx/iphone/window.mm
     wx/generic/listctrl.h
     wx/generic/mdig.h
     wx/generic/statusbr.h
+    wx/univ/anybutton.h
     wx/univ/app.h
     wx/univ/bmpbuttn.h
     wx/univ/button.h
@@ -2806,6 +2819,7 @@ src/osx/iphone/window.mm
     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
@@ -2815,6 +2829,7 @@ src/osx/iphone/window.mm
     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
@@ -2847,10 +2862,15 @@ src/osx/iphone/window.mm
     src/common/bmpcboxcmn.cpp
     src/common/calctrlcmn.cpp
     src/common/datavcmn.cpp
+    src/common/gridcmn.cpp
     src/common/hyperlnkcmn.cpp
+    src/common/odcombocmn.cpp
+    src/common/richtooltipcmn.cpp
     src/generic/aboutdlgg.cpp
+    src/generic/bannerwindow.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
@@ -2860,25 +2880,30 @@ src/osx/iphone/window.mm
     src/generic/gridsel.cpp
     src/generic/helpext.cpp
     src/generic/hyperlinkg.cpp
-    src/generic/infobar.cpp
     src/generic/laywin.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/timectrlg.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
+    wx/bannerwindow.h
     wx/bmpcbox.h
     wx/calctrl.h
+    wx/commandlinkbutton.h
     wx/dataview.h
     wx/datectrl.h
     wx/dateevt.h
+    wx/datetimectrl.h
     wx/dcbuffer.h
     wx/dvrenderers.h
     wx/editlbox.h
@@ -2895,26 +2920,28 @@ src/osx/iphone/window.mm
     wx/generic/gridsel.h
     wx/generic/helpext.h
     wx/generic/hyperlink.h
-    wx/generic/infobar.h
     wx/generic/laywin.h
     wx/generic/notifmsg.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/infobar.h
     wx/joystick.h
     wx/laywin.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/timectrl.h
     wx/tipdlg.h
+    wx/treelist.h
     wx/wizard.h
 </set>
 
@@ -2922,6 +2949,7 @@ src/osx/iphone/window.mm
     src/common/taskbarcmn.cpp
     src/msw/aboutdlg.cpp
     src/msw/notifmsg.cpp
+    src/msw/richtooltip.cpp
     src/msw/sound.cpp
     src/msw/taskbar.cpp
 </set>
@@ -2936,14 +2964,22 @@ src/osx/iphone/window.mm
     src/generic/animateg.cpp
     src/msw/bmpcbox.cpp
     src/msw/calctrl.cpp
+    src/msw/commandlinkbutton.cpp
     src/msw/datecontrols.cpp
     src/msw/datectrl.cpp
+    src/msw/datetimectrl.cpp
+    src/msw/hyperlink.cpp
+    src/msw/timectrl.cpp
 </set>
 <set var="ADVANCED_MSW_NATIVE_HDR" hints="files">
     wx/generic/animate.h
     wx/msw/bmpcbox.h
+    wx/msw/commandlinkbutton.h
     wx/msw/calctrl.h
     wx/msw/datectrl.h
+    wx/msw/datetimectrl.h
+    wx/msw/hyperlink.h
+    wx/msw/timectrl.h
 </set>
 
 <!-- not built on WindowsCE: -->
@@ -2983,12 +3019,16 @@ src/osx/iphone/window.mm
 <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/dataview_osx.cpp
     src/osx/cocoa/dataview.mm
+    src/osx/cocoa/datetimectrl.mm
     src/osx/cocoa/taskbar.mm
     src/osx/core/hidjoystick.cpp
 </set>
@@ -2996,15 +3036,29 @@ src/osx/iphone/window.mm
 <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/taskbarosx.h
+    wx/osx/timectrl.h
     wx/osx/core/joystick.h
     wx/osx/cocoa/dataview.h
 </set>
 
+<set var="ADVANCED_OSX_IPHONE_SRC" hints="files">
+    src/generic/animateg.cpp
+    src/osx/sound_osx.cpp
+    src/osx/core/sound.cpp
+</set>
+
+<set var="ADVANCED_OSX_IPHONE_HDR" hints="files">
+    wx/generic/animate.h
+    wx/osx/sound.h
+</set>
+
 <set var="ADVANCED_COCOA_SRC" hints="files">
     src/cocoa/taskbar.mm
     src/common/taskbarcmn.cpp
@@ -3066,7 +3120,6 @@ src/osx/iphone/window.mm
     src/gtk/calctrl.cpp
     src/gtk/dataview.cpp
     src/gtk/hyperlink.cpp
-    src/gtk/infobar.cpp
 </set>
 <set var="ADVANCED_GTK_NATIVE_HDR" hints="files">
     wx/gtk/animate.h
@@ -3076,7 +3129,6 @@ src/osx/iphone/window.mm
     wx/gtk/dvrenderer.h
     wx/gtk/dvrenderers.h
     wx/gtk/hyperlink.h
-    wx/gtk/infobar.h
 </set>
 
 <set var="ADVANCED_GTK1_SRC" hints="files">
@@ -3132,6 +3184,12 @@ src/osx/iphone/window.mm
 <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>
@@ -3191,8 +3249,10 @@ src/osx/iphone/window.mm
     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/styleparams.cpp
     src/html/winpars.cpp
     <!-- wxHTML users: -->
     src/generic/htmllbox.cpp
@@ -3215,6 +3275,7 @@ src/osx/iphone/window.mm
     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: -->
@@ -3222,7 +3283,40 @@ src/osx/iphone/window.mm
     $(MSW_HTML_HDR)
 </set>
 
+<!-- ====================================================================== -->
+<!--                                wxWEBVIEW                               -->
+<!-- ====================================================================== -->
+
+<set var="WEBVIEW_SRC_PLATFORM">
+    <if cond="TOOLKIT=='MSW'">src/msw/webview_ie.cpp</if>
+    <if cond="TOOLKIT=='GTK'">src/gtk/webview_webkit.cpp</if>
+    <if cond="PLATFORM_MACOSX=='1'">src/osx/webview_webkit.mm</if>
+</set>
+<set var="WEBVIEW_SRC" hints="files">
+    $(WEBVIEW_SRC_PLATFORM)
+    src/common/webview.cpp
+    src/common/webviewarchivehandler.cpp
+</set>
 
+<set var="WEBVIEW_HDR_PLATFORM" hints="files">
+    <if cond="TOOLKIT=='MSW'">
+        wx/msw/webviewhistoryitem_ie.h
+        wx/msw/webview_ie.h
+    </if>
+    <if cond="TOOLKIT=='GTK'">
+        wx/gtk/webviewhistoryitem_webkit.h
+        wx/gtk/webview_webkit.h
+    </if>
+    <if cond="PLATFORM_MACOSX=='1'">
+        wx/osx/webviewhistoryitem_webkit.h
+        wx/osx/webview_webkit.h
+    </if>
+</set>
+<set var="WEBVIEW_HDR" hints="files">
+    $(WEBVIEW_HDR_PLATFORM)
+    wx/webview.h
+    wx/webviewarchivehandler.h
+</set>
 
 <!-- ====================================================================== -->
 <!--                                wxXRC                                   -->
@@ -3230,6 +3324,7 @@ src/osx/iphone/window.mm
 
 <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
@@ -3240,6 +3335,7 @@ src/osx/iphone/window.mm
     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_comboctrl.cpp
@@ -3284,7 +3380,9 @@ src/osx/iphone/window.mm
     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_toolbk.cpp
     src/xrc/xh_tree.cpp
     src/xrc/xh_treebk.cpp
     src/xrc/xh_unkwn.cpp
@@ -3296,6 +3394,7 @@ src/osx/iphone/window.mm
 <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
@@ -3306,6 +3405,7 @@ src/osx/iphone/window.mm
     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_comboctrl.h
@@ -3349,7 +3449,9 @@ src/osx/iphone/window.mm
     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_toolbk.h
     wx/xrc/xh_tree.h
     wx/xrc/xh_treebk.h
     wx/xrc/xh_unkwn.h
@@ -3381,6 +3483,7 @@ 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>
+    <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=='GTK' and TOOLKIT_VERSION=='2'">
         src/gtk/glcanvas.cpp
@@ -3438,6 +3541,16 @@ src/osx/iphone/window.mm
 <!--                                  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
@@ -3445,6 +3558,8 @@ src/osx/iphone/window.mm
     src/aui/auibook.cpp
     src/aui/auibar.cpp
     src/aui/tabmdi.cpp
+    src/aui/tabart.cpp
+    $(AUI_GTK_SRC)
 </set>
 <set var="AUI_HDR" hints="files">
     wx/aui/framemanager.h
@@ -3454,6 +3569,8 @@ src/osx/iphone/window.mm
     wx/aui/auibar.h
     wx/aui/tabmdi.h
     wx/aui/aui.h
+    wx/aui/tabart.h
+    $(AUI_GTK_HDR)
 </set>
 
 <!-- ====================================================================== -->
@@ -3515,26 +3632,39 @@ src/osx/iphone/window.mm
 <!-- ====================================================================== -->
 
 <set var="RICHTEXT_SRC" hints="files">
-    src/richtext/richtextctrl.cpp
     src/richtext/richtextbuffer.cpp
-    src/richtext/richtextstyles.cpp
-    src/richtext/richtextxml.cpp
-    src/richtext/richtexthtml.cpp
+    src/richtext/richtextctrl.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/richtextstyledlg.cpp
+    src/richtext/richtextstyles.cpp
+    src/richtext/richtextsymboldlg.cpp
+    src/richtext/richtextxml.cpp
 </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/richtextbulletspage.h
+    wx/richtext/richtextctrl.h
+    wx/richtext/richtextdialogpage.h
+    wx/richtext/richtextfontpage.h
+    wx/richtext/richtextformatdlg.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/richtextxml.h
-    wx/richtext/richtextformatdlg.h
     wx/richtext/richtextsymboldlg.h
-    wx/richtext/richtextstyledlg.h
-    wx/richtext/richtextprint.h
+    wx/richtext/richtextuicustomization.h
+    wx/richtext/richtextxml.h
 </set>
 
 
@@ -3563,6 +3693,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>
+        <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>
@@ -3578,7 +3709,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_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">
@@ -3587,7 +3717,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>
-        <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 -->
@@ -3612,7 +3741,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_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>
@@ -3652,10 +3780,10 @@ src/osx/iphone/window.mm
         <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=='MGL'">$(MGL_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_SRC)</if>
     </set>
     <set var="LOWLEVEL_HDR" hints="files">
@@ -3666,10 +3794,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=='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=='MGL'">$(MGL_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_HDR)</if>
     </set>
 
@@ -3686,6 +3814,7 @@ src/osx/iphone/window.mm
         <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>
@@ -3697,6 +3826,7 @@ src/osx/iphone/window.mm
         <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>
@@ -3716,12 +3846,12 @@ 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=='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=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK1_SRC)</if>
         <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
-        <if cond="TOOLKIT=='MGL' and PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_SRC)</if>
         <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
     </set>
     <set var="ADVANCED_PLATFORM_HDR" hints="files">
@@ -3729,12 +3859,12 @@ 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=='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=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK_HDR)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK1_HDR)</if>
         <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
-        <if cond="TOOLKIT=='MGL' and PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_HDR)</if>
         <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_HDR)</if>
     </set>
 
@@ -3765,6 +3895,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=='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>
@@ -3775,6 +3906,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=='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>
@@ -3797,7 +3930,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)
-            $(RICHTEXT_HDR) $(STC_HDR)
+            $(RIBBON_HDR) $(RICHTEXT_HDR) $(STC_HDR) $(WEBVIEW_HDR)
         </if>
     </set>
 
@@ -3818,7 +3951,6 @@ src/osx/iphone/window.mm
         $(BASE_UNIX_HDR)
         $(BASE_WIN32_HDR) $(BASE_WINCE_HDR)
         $(BASE_OSX_HDR)
-        $(BASE_PALMOS_HDR)
         $(BASE_MSDOS_HDR)
         $(NET_CMN_HDR)
         $(XML_HDR)
@@ -3831,7 +3963,6 @@ src/osx/iphone/window.mm
         $(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)