Use correct Unicode define for wxScintilla compilation.

[wxWidgets.git] / build / bakefiles / files.bkl

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index c4946e00d0dea3bedb6e351325671050cbe6f606..56fb7c0aa8267db0112197778ccd1bf47a7060a7 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -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)
@@ -350,6 +354,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
@@ -379,6 +384,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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 +446,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/dynload.h
     wx/encconv.h
     wx/event.h
+    wx/evtloop.h
     wx/except.h
     wx/features.h
     wx/flags.h
@@ -467,6 +474,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
@@ -480,6 +488,7 @@ 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/object.h
     wx/platform.h
@@ -518,7 +527,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/tls.h
     wx/tokenzr.h
     wx/tracker.h
+    wx/translation.h
     wx/txtstrm.h
+    wx/typeinfo.h
     wx/types.h
     wx/unichar.h
     wx/uri.h
@@ -545,6 +556,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/meta/if.h
     wx/meta/int2type.h
     wx/meta/movable.h
+    wx/meta/pod.h
     wx/fswatcher.h
     wx/generic/fswatcher.h
 </set>
@@ -662,10 +674,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/generic/graphicc.cpp
     src/common/fontenumcmn.cpp
     src/common/fontmap.cpp
     src/common/fontutilcmn.cpp
@@ -701,6 +715,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/mousemanager.cpp
     src/common/nbkbase.cpp
     src/common/overlaycmn.cpp
+    src/common/ownerdrwcmn.cpp
     src/common/paper.cpp
     src/common/persist.cpp
     src/common/pickerbase.cpp
@@ -723,6 +738,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/textentrycmn.cpp
     src/common/toplvcmn.cpp
     src/common/treebase.cpp
+    src/common/uiactioncmn.cpp
     src/common/valgen.cpp
     src/common/validate.cpp
     src/common/valtext.cpp
@@ -740,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/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
@@ -804,6 +823,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -812,6 +832,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
@@ -825,6 +846,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/headerctrl.h
     wx/helphtml.h
     wx/icon.h
+    wx/infobar.h
     wx/layout.h
     wx/listbox.h
     wx/mdi.h
@@ -842,6 +864,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/radiobut.h
     wx/rearrangectrl.h
     wx/renderer.h
+    wx/richmsgdlg.h
     wx/scrolbar.h
     wx/scrolbar.h
     wx/scrolwin.h
@@ -893,10 +916,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/docmdi.h
     wx/docview.h
     wx/effects.h
-    wx/evtloop.h
     wx/evtloopsrc.h
     wx/fdrepdlg.h
     wx/filectrl.h
+    wx/filehistory.h
     wx/filepicker.h
     wx/fontpicker.h
     wx/fmappriv.h
@@ -963,6 +986,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/treebase.h
     wx/treebook.h
     wx/treectrl.h
+    wx/uiaction.h
     wx/valgen.h
     wx/vidmode.h
     wx/vlbox.h
@@ -988,10 +1012,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/unix/displayx11.cpp
     src/unix/fontenum.cpp
     src/unix/fontutil.cpp
+    src/unix/uiactionx11.cpp
     src/unix/utilsx11.cpp
-    src/unix/displayx11.cpp
 </set>
 <set var="XWIN_LOWLEVEL_HDR" hints="files">
     wx/generic/caret.h
@@ -1024,6 +1049,7 @@ 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
@@ -1062,6 +1088,7 @@ 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/pen.h
     wx/gtk/popupwin.h
@@ -1077,13 +1104,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/graphicc.cpp
     src/generic/listctrl.cpp
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
     <!-- Generic implementations used by wxGPE: -->
     src/generic/fontdlgg.cpp
-    src/generic/msgdlgg.cpp
     <!-- GTK+ specific files: -->
     src/gtk/artgtk.cpp
     src/gtk/bmpbuttn.cpp
@@ -1106,7 +1131,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
@@ -1114,6 +1139,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
@@ -1125,7 +1151,7 @@ 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/tbargtk.cpp
+    src/gtk/toolbar.cpp
     src/gtk/textctrl.cpp
     src/gtk/textentry.cpp
     src/gtk/tglbtn.cpp
@@ -1160,13 +1186,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
@@ -1178,7 +1205,7 @@ 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/tbargtk.h
+    wx/gtk/toolbar.h
     wx/gtk/textctrl.h
     wx/gtk/textentry.h
     wx/gtk/tglbtn.h
@@ -1265,7 +1292,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: -->
@@ -1296,7 +1322,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/tbargtk.cpp
+    src/gtk1/toolbar.cpp
     src/gtk1/textctrl.cpp
     src/gtk1/tglbtn.cpp
 </set>
@@ -1342,7 +1368,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/tbargtk.h
+    wx/gtk1/toolbar.h
     wx/gtk1/textctrl.h
     wx/gtk1/tglbtn.h
     wx/gtk1/treectrl.h
@@ -1692,8 +1718,10 @@ 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/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
@@ -1708,6 +1736,7 @@ 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
@@ -1769,14 +1798,17 @@ 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/ownerdrw.h
     wx/msw/palette.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
@@ -2149,6 +2181,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/ownerdrw.h
     wx/os2/palette.h
     wx/os2/pen.h
     wx/os2/pnghand.h
@@ -2179,7 +2212,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 
 <!-- ====================================================================== -->
-<!--                                wxMac                                   -->
+<!--                                wxOSX Common                            -->
 <!-- ====================================================================== -->
 
 <set var="OSX_LOWLEVEL_SRC" hints="files">
@@ -2231,6 +2264,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -2247,9 +2282,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
+    src/osx/uiaction_osx.cpp
     <!-- wxWebKit files -->
     src/html/htmlctrl/webkit/webkit.mm
     <!-- Native color/font dialogs -->
@@ -2271,7 +2308,6 @@ 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/dnd.cpp
     src/osx/carbon/font.cpp
     src/osx/carbon/frame.cpp
     src/osx/carbon/mdi.cpp
@@ -2301,43 +2337,6 @@ 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/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 -->
@@ -2414,6 +2413,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/osx/statusbr.h
     wx/osx/taskbarosx.h
     wx/osx/textctrl.h
+    wx/osx/textentry.h
     wx/osx/tglbtn.h
     wx/osx/toolbar.h
     wx/osx/tooltip.h
@@ -2436,6 +2436,49 @@ 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/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 -->
@@ -2453,18 +2496,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <!-- ====================================================================== -->
-<!--                              wxMac/Cocoa                               -->
+<!--                              wxOSX/Cocoa                               -->
 <!-- ====================================================================== -->
 
 <set var="OSX_COCOA_SRC" hints="files">
     $(OSX_CARBON_COCOA_SRC)
-    src/osx/cocoa/bmpbuttn.mm
     src/osx/cocoa/button.mm
     src/osx/cocoa/checkbox.mm
     src/osx/cocoa/choice.mm
     src/osx/cocoa/colour.mm
+    src/osx/cocoa/combobox.mm
     src/osx/cocoa/dialog.mm
     src/osx/cocoa/dirdlg.mm
+    src/osx/cocoa/dnd.mm
     src/osx/cocoa/evtloop.mm
     src/osx/cocoa/filedlg.mm
     src/osx/cocoa/gauge.mm
@@ -2498,13 +2542,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/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/glcanvas.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>
 
 <!-- ====================================================================== -->
@@ -2606,7 +2674,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
@@ -2727,7 +2794,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
@@ -2836,6 +2902,7 @@ src/osx/iphone/window.mm
     src/generic/aboutdlgg.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
@@ -2845,7 +2912,6 @@ 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
@@ -2861,6 +2927,7 @@ src/osx/iphone/window.mm
     wx/animate.h
     wx/bmpcbox.h
     wx/calctrl.h
+    wx/commandlinkbutton.h
     wx/dataview.h
     wx/datectrl.h
     wx/dateevt.h
@@ -2880,7 +2947,6 @@ 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
@@ -2889,7 +2955,6 @@ src/osx/iphone/window.mm
     wx/generic/wizard.h
     wx/grid.h
     wx/hyperlink.h
-    wx/infobar.h
     wx/joystick.h
     wx/laywin.h
     wx/notifmsg.h
@@ -2906,11 +2971,15 @@ src/osx/iphone/window.mm
 <set var="ADVANCED_MSW_SRC" hints="files">
     src/common/taskbarcmn.cpp
     src/msw/aboutdlg.cpp
+    src/msw/commandlinkbutton.cpp
+    src/msw/hyperlink.cpp
     src/msw/notifmsg.cpp
     src/msw/sound.cpp
     src/msw/taskbar.cpp
 </set>
 <set var="ADVANCED_MSW_HDR" hints="files">
+    wx/msw/commandlinkbutton.h
+    wx/msw/hyperlink.h
     wx/msw/notifmsg.h
     wx/msw/sound.h
     wx/msw/taskbar.h
@@ -2990,6 +3059,17 @@ src/osx/iphone/window.mm
     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
@@ -3051,7 +3131,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
@@ -3061,7 +3140,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">
@@ -3117,6 +3195,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>
@@ -3176,8 +3260,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
@@ -3200,6 +3286,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: -->
@@ -3548,6 +3635,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>
@@ -3637,6 +3725,7 @@ 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>
@@ -3651,6 +3740,7 @@ 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>
@@ -3671,6 +3761,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>
@@ -3682,6 +3773,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>
@@ -3701,6 +3793,7 @@ 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>
@@ -3714,6 +3807,7 @@ 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>
@@ -3750,6 +3844,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>
@@ -3760,6 +3855,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>
@@ -3782,7 +3879,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)
         </if>
     </set>