Fix for #15520: wxRichTextCtrl: Drawing the selection doesn't respect its container...

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

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index bc29c0b76fef49c40a11052fb86349fff9799e77..a297dfcf8c334d60f6b80ea857689f80ec6ee9a1 100644 (file)
--- 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,6 +201,7 @@ 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
@@ -353,6 +358,7 @@ 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
@@ -400,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
@@ -541,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>
@@ -703,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
@@ -712,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
@@ -735,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
@@ -763,6 +774,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/msgdlgg.cpp
     src/generic/numdlgg.cpp
     src/generic/progdlgg.cpp
+    src/generic/preferencesg.cpp
     src/generic/printps.cpp
     src/generic/renderg.cpp
     src/generic/richmsgdlgg.cpp
@@ -780,6 +792,7 @@ 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
@@ -788,7 +801,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/bmpbuttn.h
     wx/brush.h
     wx/button.h
-    wx/cairo.h
     wx/checkbox.h
     wx/checklst.h
     wx/choicdlg.h
@@ -858,6 +870,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/listbox.h
     wx/mdi.h
     wx/menu.h
+    wx/modalhook.h
     wx/mousemanager.h
     wx/msgdlg.h
     wx/nativewin.h
@@ -895,6 +908,7 @@ 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
@@ -986,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
@@ -1008,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>
 
 <!-- ====================================================================== -->
@@ -1044,11 +1060,39 @@ 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">
     $(GTK_PLATFORM_SRC)
@@ -1063,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
@@ -1080,6 +1121,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -1087,6 +1129,12 @@ 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">
     $(GTK_PLATFORM_HDR)
     wx/generic/icon.h
@@ -1101,10 +1149,6 @@ 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
@@ -1128,8 +1172,6 @@ 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
@@ -1151,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
@@ -1179,10 +1220,16 @@ 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
@@ -1207,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
@@ -1232,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>
 
 
@@ -1244,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
@@ -1405,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
@@ -1570,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
@@ -1672,6 +1725,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -1680,10 +1734,12 @@ 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>
@@ -1729,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
@@ -1810,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
@@ -1828,6 +1886,7 @@ 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
@@ -1876,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
@@ -1949,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
@@ -2025,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
@@ -2245,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
@@ -2301,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>
 
@@ -2372,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
@@ -2486,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
@@ -2644,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
@@ -2748,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
@@ -2800,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
@@ -3109,23 +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">
     $(ADVANCED_GTK_PLATFORM_HDR)
-    wx/gtk/hildon/notifmsg.h
+    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
@@ -3155,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
@@ -3193,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>
@@ -3310,12 +3421,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     $(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
@@ -3330,6 +3443,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     $(WEBVIEW_HDR_PLATFORM)
     wx/webview.h
     wx/webviewarchivehandler.h
+    wx/webviewfshandler.h
 </set>
 
 <!-- ====================================================================== -->
@@ -3377,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
@@ -3447,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
@@ -3499,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
@@ -3523,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
@@ -3573,6 +3692,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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">
@@ -3584,6 +3704,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/aui/tabmdi.h
     wx/aui/aui.h
     wx/aui/tabart.h
+    wx/xrc/xh_auinotbk.h
     $(AUI_GTK_HDR)
 </set>
 
@@ -3602,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
@@ -3613,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>
 
 <!-- ====================================================================== -->
@@ -3656,6 +3779,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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/richtextbackgroundpage.h
@@ -3677,8 +3801,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/richtext/richtextstylepage.h
     wx/richtext/richtextstyles.h
     wx/richtext/richtextsymboldlg.h
+    wx/richtext/richtexttabspage.h
     wx/richtext/richtextuicustomization.h
     wx/richtext/richtextxml.h
+    wx/xrc/xh_richtext.h
 </set>
 
 
@@ -3787,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>
@@ -3801,6 +3928,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <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>
@@ -3821,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>
@@ -3833,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>
@@ -3863,7 +3993,8 @@ 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_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=='PM'">$(ADVANCED_OS2_SRC)</if>
@@ -3876,7 +4007,8 @@ 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_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=='PM'">$(ADVANCED_OS2_HDR)</if>
@@ -3885,11 +4017,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <!-- 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>