X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c27126c7bca4ff702f6a185bb2cfba303ae20a62..5ca59eb82e38957650bb4423030aa446c354cfe3:/build/bakefiles/files.bkl?ds=sidebyside

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 1d6c020d17..a297dfcf8c 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
-<!-- $Id$ -->
 <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                                   -->
@@ -70,6 +72,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/unix/timerunx.cpp
     src/unix/threadpsx.cpp
     src/unix/utilsunx.cpp
+    src/unix/wakeuppipe.cpp
     src/unix/fswatcher_kqueue.cpp
 </set>
 
@@ -128,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/evtloopconsole.cpp
     src/msw/mimetype.cpp
     src/msw/power.cpp
     src/msw/regconf.cpp
@@ -142,7 +146,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/fswatcher.cpp
 </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
@@ -157,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/evtloopconsole.h
     wx/msw/gccpriv.h
     wx/msw/libraries.h
     wx/msw/mimetype.h
@@ -197,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/evtloop.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) -->
@@ -268,35 +273,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                                    -->
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
@@ -382,6 +358,8 @@ 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/threadinfo.cpp
+    src/common/time.cpp
     src/common/timercmn.cpp
     src/common/timerimpl.cpp
     src/common/tokenzr.cpp
@@ -428,6 +406,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/clntdata.h
     wx/cmdargs.h
     wx/cmdline.h
+    wx/compiler.h
     wx/confbase.h
     wx/config.h
     wx/convauto.h
@@ -447,6 +426,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
@@ -526,6 +506,7 @@ 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
@@ -567,6 +548,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/meta/int2type.h
     wx/meta/movable.h
     wx/meta/pod.h
+    wx/meta/removeref.h
     wx/fswatcher.h
     wx/generic/fswatcher.h
 </set>
@@ -590,7 +572,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">
@@ -651,6 +632,7 @@ 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
@@ -729,6 +711,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/markupparser.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
@@ -738,6 +721,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/persist.cpp
     src/common/pickerbase.cpp
     src/common/popupcmn.cpp
+    src/common/preferencescmn.cpp
     src/common/prntbase.cpp
     src/common/quantize.cpp
     src/common/radiobtncmn.cpp
@@ -761,6 +745,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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/uiactioncmn.cpp
@@ -788,8 +773,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/markuptext.cpp
     src/generic/msgdlgg.cpp
     src/generic/numdlgg.cpp
-    src/generic/panelg.cpp
     src/generic/progdlgg.cpp
+    src/generic/preferencesg.cpp
     src/generic/printps.cpp
     src/generic/renderg.cpp
     src/generic/richmsgdlgg.cpp
@@ -807,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/xrc/xmlreshandler.cpp
 </set>
 <set var="GUI_CMN_HDR" hints="files">
+    wx/affinematrix2dbase.h
+    wx/affinematrix2d.h
+    wx/anybutton.h
     wx/bmpbuttn.h
     wx/brush.h
     wx/button.h
-    wx/cairo.h
     wx/checkbox.h
     wx/checklst.h
     wx/choicdlg.h
@@ -825,6 +813,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/control.h
     wx/ctrlsub.h
     wx/cursor.h
+    wx/custombgwin.h
     wx/dc.h
     wx/dcclient.h
     wx/dcgraph.h
@@ -846,6 +835,7 @@ 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
@@ -875,10 +865,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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/modalhook.h
     wx/mousemanager.h
     wx/msgdlg.h
     wx/nativewin.h
@@ -905,6 +897,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
@@ -915,6 +908,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/valnum.h
     wx/window.h
     wx/windowid.h
+    wx/windowptr.h
+    wx/withimages.h
     wx/wrapsizer.h
     wx/wupdlock.h
 
@@ -991,6 +986,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
@@ -1004,6 +1000,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/rawbmp.h
     wx/region.h
     wx/scopeguard.h
+    wx/simplebook.h
     wx/spinbutt.h
     wx/spinctrl.h
     wx/splitter.h
@@ -1026,6 +1023,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/vscroll.h
     wx/xpmdecod.h
     wx/xpmhand.h
+    wx/xrc/xmlreshandler.h
 </set>
 
 <!-- ====================================================================== -->
@@ -1062,12 +1060,46 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!--                                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">
-    $(XWIN_LOWLEVEL_SRC)
+    $(GTK_PLATFORM_SRC)
     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
@@ -1075,9 +1107,6 @@ 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/dcclient.cpp
-    src/gtk/dcmemory.cpp
-    src/gtk/dcscreen.cpp
     src/gtk/dnd.cpp
     src/gtk/evtloop.cpp
     src/gtk/filectrl.cpp
@@ -1085,12 +1114,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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/textmeasure.cpp
     src/gtk/timer.cpp
     src/gtk/tooltip.cpp
     src/gtk/toplevel.cpp
@@ -1098,8 +1129,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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">
-    $(XWIN_LOWLEVEL_HDR)
+    $(GTK_PLATFORM_HDR)
     wx/generic/icon.h
     wx/generic/paletteg.h
     wx/gtk/app.h
@@ -1112,19 +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/dc.h
-    wx/gtk/dcclient.h
-    wx/gtk/dcmemory.h
-    wx/gtk/dcscreen.h
     wx/gtk/dnd.h
     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
@@ -1139,9 +1172,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/listctrl.cpp
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
-    <!-- Generic implementations used by wxGPE: -->
-    src/generic/fontdlgg.cpp
     <!-- GTK+ specific files: -->
+    src/gtk/anybutton.cpp
     src/gtk/artgtk.cpp
     src/gtk/bmpbuttn.cpp
     src/gtk/button.cpp
@@ -1161,7 +1193,6 @@ 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/gnome/gprint.cpp
     src/gtk/gnome/gvfs.cpp
     src/gtk/infobar.cpp
     src/gtk/listbox.cpp
@@ -1189,13 +1220,20 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
-    wx/generic/fontdlgg.h
     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
@@ -1216,7 +1254,6 @@ 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/gnome/gprint.h
     wx/gtk/gnome/gvfs.h
     wx/gtk/infobar.h
     wx/gtk/listbox.h
@@ -1241,7 +1278,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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>
 
 
@@ -1253,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
+    src/generic/textmeasure.cpp
     src/gtk1/app.cpp
     src/gtk1/bitmap.cpp
     src/gtk1/brush.cpp
@@ -1414,6 +1456,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <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
@@ -1579,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
+    src/generic/textmeasure.cpp
     src/generic/timer.cpp
     src/x11/app.cpp
     src/x11/bitmap.cpp
@@ -1676,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/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/safearray.cpp
     src/msw/palette.cpp
     src/msw/pen.cpp
     src/msw/popupwin.cpp
@@ -1688,14 +1734,17 @@ 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/textmeasure.cpp
     src/msw/tooltip.cpp
     src/msw/toplevel.cpp
     src/msw/uiaction.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">
+    wx/msw/nonownedwnd.h
     wx/msw/ole/activex.h
     wx/msw/popupwin.h
     wx/msw/uxtheme.h
@@ -1723,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/msw/anybutton.cpp
     src/msw/artmsw.cpp
     src/msw/bmpbuttn.cpp
     src/msw/button.cpp
@@ -1735,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/evtloop.cpp
     src/msw/filedlg.cpp
     src/msw/frame.cpp
     src/msw/gauge.cpp
@@ -1752,6 +1803,7 @@ 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
@@ -1777,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/msw/anybutton.h
     wx/msw/app.h
     wx/msw/bitmap.h
     wx/msw/bmpbuttn.h
@@ -1793,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/custombgwin.h
     wx/msw/dc.h
     wx/msw/dcclient.h
     wx/msw/dcmemory.h
@@ -1813,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/init.h
     wx/msw/listbox.h
     wx/msw/listctrl.h
     wx/msw/mdi.h
@@ -1831,8 +1886,10 @@ 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/safearray.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
@@ -1843,7 +1900,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -1879,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/rightarr.cur
     wx/msw/roller.cur
     <!-- icons -->
     wx/msw/cdrom.ico
@@ -1941,69 +1996,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                                   -->
 <!-- ====================================================================== -->
@@ -2015,6 +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/textmeasure.cpp
     src/dfb/app.cpp
     src/dfb/bitmap.cpp
     src/dfb/brush.cpp
@@ -2091,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/textmeasure.cpp
     <!-- OS/2 specific files: -->
     src/os2/accel.cpp
     src/os2/app.cpp
@@ -2225,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/setup0.h
     wx/os2/slider.h
     wx/os2/spinbutt.h
     wx/os2/spinctrl.h
@@ -2293,6 +2286,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
@@ -2311,7 +2305,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -2367,6 +2360,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/listctrl.cpp
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
+    src/generic/textmeasure.cpp
 </if>
 </set>
 
@@ -2376,6 +2370,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -2437,7 +2432,6 @@ 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/spinctrl.h
     wx/osx/srchctrl.h
     wx/osx/statbmp.h
     wx/osx/statbox.h
@@ -2477,6 +2471,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <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
@@ -2520,9 +2515,6 @@ 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
@@ -2534,6 +2526,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="OSX_COCOA_SRC" hints="files">
     $(OSX_CARBON_COCOA_SRC)
+    src/osx/cocoa/anybutton.mm
     src/osx/cocoa/button.mm
     src/osx/cocoa/checkbox.mm
     src/osx/cocoa/choice.mm
@@ -2552,6 +2545,7 @@ 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/preferences.mm
     src/osx/cocoa/printdlg.mm
     src/osx/cocoa/scrolbar.mm
     src/osx/cocoa/slider.mm
@@ -2583,6 +2577,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -2709,6 +2704,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/paletteg.cpp
     src/generic/regiong.cpp
     src/generic/statusbr.cpp
+    src/generic/textmeasure.cpp
 </set>
 <set var="COCOA_HDR" hints="files">
     wx/cocoa/NSApplication.h
@@ -2813,7 +2809,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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">
+    $(UNIV_PLATFORM_SRC)
     src/generic/accel.cpp
     src/generic/clrpickerg.cpp
     src/generic/collpaneg.cpp
@@ -2865,6 +2873,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -2879,6 +2888,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/listctrl.h
     wx/generic/mdig.h
     wx/generic/statusbr.h
+    wx/univ/anybutton.h
     wx/univ/app.h
     wx/univ/bmpbuttn.h
     wx/univ/button.h
@@ -2889,6 +2899,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/univ/colschem.h
     wx/univ/combobox.h
     wx/univ/control.h
+    wx/univ/custombgwin.h
     wx/univ/dialog.h
     wx/univ/frame.h
     wx/univ/gauge.h
@@ -2898,6 +2909,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/univ/menu.h
     wx/univ/menuitem.h
     wx/univ/notebook.h
+    wx/univ/panel.h
     wx/univ/radiobox.h
     wx/univ/radiobut.h
     wx/univ/renderer.h
@@ -2933,7 +2945,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -2950,21 +2964,26 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/notifmsgg.cpp
     src/generic/odcombo.cpp
     src/generic/propdlg.cpp
+    src/generic/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
@@ -2986,6 +3005,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/propdlg.h
     wx/generic/sashwin.h
     wx/generic/splash.h
+    wx/generic/timectrl.h
     wx/generic/wizard.h
     wx/grid.h
     wx/hyperlink.h
@@ -2994,24 +3014,26 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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>
 
 <set var="ADVANCED_MSW_SRC" hints="files">
     src/common/taskbarcmn.cpp
     src/msw/aboutdlg.cpp
-    src/msw/hyperlink.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">
-    wx/msw/hyperlink.h
     wx/msw/notifmsg.h
     wx/msw/sound.h
     wx/msw/taskbar.h
@@ -3025,6 +3047,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -3032,6 +3057,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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: -->
@@ -3071,12 +3099,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <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>
@@ -3084,11 +3116,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <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>
@@ -3148,15 +3183,45 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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">
+    $(ADVANCED_GTK_PLATFORM_SRC)
+    src/gtk/notifmsg.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">
-    wx/gtk/hildon/notifmsg.h
+    $(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>
 
 <set var="ADVANCED_GTK_NATIVE_SRC" hints="files">
     src/gtk/aboutdlg.cpp
@@ -3186,7 +3251,22 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </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
@@ -3224,7 +3304,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </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>
@@ -3328,7 +3408,43 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     $(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                                   -->
@@ -3336,6 +3452,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <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
@@ -3374,8 +3491,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -3391,6 +3506,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/xrc/xh_sttxt.cpp
     src/xrc/xh_text.cpp
     src/xrc/xh_tglbtn.cpp
+    src/xrc/xh_timectrl.cpp
     src/xrc/xh_toolb.cpp
     src/xrc/xh_toolbk.cpp
     src/xrc/xh_tree.cpp
@@ -3404,6 +3520,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <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
@@ -3442,7 +3559,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -3458,6 +3574,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/xrc/xh_sttxt.h
     wx/xrc/xh_text.h
     wx/xrc/xh_tglbtn.h
+    wx/xrc/xh_timectrl.h
     wx/xrc/xh_toolb.h
     wx/xrc/xh_toolbk.h
     wx/xrc/xh_tree.h
@@ -3493,6 +3610,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <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=='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
@@ -3517,6 +3638,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <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=='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
@@ -3549,6 +3674,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!--                                  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
@@ -3556,6 +3691,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -3565,6 +3703,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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>
 
 <!-- ====================================================================== -->
@@ -3582,6 +3723,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -3593,6 +3735,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/ribbon/page.h
     wx/ribbon/panel.h
     wx/ribbon/toolbar.h
+    wx/xrc/xh_ribbon.h
 </set>
 
 <!-- ====================================================================== -->
@@ -3626,28 +3769,42 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <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/richtextprint.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
+    src/xrc/xh_richtext.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/richtextimagedlg.h
+    wx/richtext/richtexttabspage.h
+    wx/richtext/richtextuicustomization.h
+    wx/richtext/richtextxml.h
+    wx/xrc/xh_richtext.h
 </set>
 
 
@@ -3692,7 +3849,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <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">
@@ -3701,7 +3857,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     </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 -->
@@ -3726,7 +3881,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <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>
@@ -3759,7 +3913,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <!-- 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>
@@ -3770,10 +3925,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <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=='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>
@@ -3785,7 +3940,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <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>
 
@@ -3795,7 +3949,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     </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>
@@ -3807,7 +3962,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <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>
@@ -3837,10 +3993,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <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=='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=='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">
@@ -3851,21 +4007,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <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=='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=='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=='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=='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>
@@ -3920,7 +4078,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
             $(GUI_CORE_HEADERS)
             $(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
             $(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(PROPGRID_HDR)
-            $(RIBBON_HDR) $(RICHTEXT_HDR) $(STC_HDR)
+            $(RIBBON_HDR) $(RICHTEXT_HDR) $(STC_HDR) $(WEBVIEW_HDR)
         </if>
     </set>
 
@@ -3941,7 +4099,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(BASE_UNIX_HDR)
         $(BASE_WIN32_HDR) $(BASE_WINCE_HDR)
         $(BASE_OSX_HDR)
-        $(BASE_PALMOS_HDR)
         $(BASE_MSDOS_HDR)
         $(NET_CMN_HDR)
         $(XML_HDR)
@@ -3954,7 +4111,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(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)