don't define specifyLevel variable in release builds (fixes gcc and probably others...

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

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index a63aa2341ad88a8b807bef797f86dbbbc59ffae6..683dc6716f86bce9945da5513c6c946b665e1f33 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -88,6 +88,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/dir.cpp
     src/msw/dlmsw.cpp
     src/msw/mimetype.cpp
+    src/msw/power.cpp
     src/msw/regconf.cpp
     src/msw/registry.cpp
     src/msw/snglinst.cpp
@@ -119,6 +120,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/private.h
     wx/msw/regconf.h
     wx/msw/registry.h
+    wx/msw/seh.h
     wx/msw/stackwalk.h
     wx/msw/stdpaths.h
     wx/msw/winundef.h
@@ -237,6 +239,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/private.h
     wx/os2/stdpaths.h
     wx/os2/chkconf.h
+    wx/os2/wxrsc.h
 </set>
 
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
@@ -286,10 +289,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 <set var="BASE_CMN_SRC" hints="files">
     src/common/appbase.cpp
+    src/common/arcall.cpp
+    src/common/arcfind.cpp
     src/common/archive.cpp
     src/common/clntdata.cpp
     src/common/cmdline.cpp
     src/common/config.cpp
+    src/common/convauto.cpp
     src/common/datetime.cpp
     src/common/datstrm.cpp
     src/common/dircmn.cpp
@@ -300,12 +306,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/extended.c
     src/common/ffile.cpp
     src/common/file.cpp
+    src/common/fileback.cpp
     src/common/fileconf.cpp
     src/common/filefn.cpp
     src/common/filename.cpp
     src/common/filesys.cpp
+    src/common/filtall.cpp
+    src/common/filtfind.cpp
     src/common/fmapbase.cpp
-    src/common/fs_zip.cpp
+    src/common/fs_arc.cpp
+    src/common/fs_filter.cpp
     src/common/hash.cpp
     src/common/hashmap.cpp
     src/common/init.cpp
@@ -319,6 +329,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/module.cpp
     src/common/mstream.cpp
     src/common/object.cpp
+    src/common/platinfo.cpp
+    src/common/powercmn.cpp
     src/common/process.cpp
     src/common/regex.cpp
     src/common/stdpbase.cpp
@@ -328,6 +340,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/stream.cpp
     src/common/string.cpp
     src/common/sysopt.cpp
+    src/common/tarstrm.cpp
     src/common/textbuf.cpp
     src/common/textfile.cpp
     src/common/tokenzr.cpp
@@ -362,7 +375,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cmdline.h
     wx/confbase.h
     wx/config.h
+    wx/convauto.h
     wx/containr.h
+    wx/cpp.h
     wx/datetime.h
     wx/datstrm.h
     wx/dde.h
@@ -385,6 +400,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/filesys.h
     wx/fontenc.h
     wx/fontmap.h
+    wx/fs_arc.h
+    wx/fs_filter.h
     wx/fs_mem.h
     wx/fs_zip.h
     wx/hash.h
@@ -415,6 +432,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mstream.h
     wx/object.h
     wx/platform.h
+    wx/platinfo.h
+    wx/power.h
     wx/process.h
     wx/ptr_scpd.h
     wx/recguard.h
@@ -431,6 +450,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/stream.h
     wx/string.h
     wx/sysopt.h
+    wx/tarstrm.h
     wx/textbuf.h
     wx/textfile.h
     wx/thread.h
@@ -541,6 +561,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="GUI_CMN_SRC" hints="files">
     src/common/accesscmn.cpp
+    src/common/anidecod.cpp
     src/common/appcmn.cpp
     src/common/artprov.cpp
     src/common/artstd.cpp
@@ -548,6 +569,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/bookctrl.cpp
     src/common/choiccmn.cpp
     src/common/clipcmn.cpp
+    src/common/clrpickercmn.cpp
+    src/common/colourcmn.cpp
+    src/common/combocmn.cpp
     src/common/cmdproc.cpp
     src/common/cmndata.cpp
     src/common/containr.cpp
@@ -556,6 +580,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/ctrlsub.cpp
     src/common/datacmn.cpp
     src/common/dcbase.cpp
+    src/common/dcbufcmn.cpp
+    src/common/dcgraph.cpp
     src/common/dlgcmn.cpp
     src/common/dndcmn.cpp
     src/common/dobjcmn.cpp
@@ -566,8 +592,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/effects.cpp
     src/common/evtloopcmn.cpp
     src/common/fddlgcmn.cpp
+    src/common/filepickercmn.cpp
+    src/common/fontpickercmn.cpp
     src/common/fldlgcmn.cpp
     src/common/fontcmn.cpp
+    src/common/fontenumcmn.cpp
     src/common/fontmap.cpp
     src/common/framecmn.cpp
     src/common/gaugecmn.cpp
@@ -575,6 +604,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/gdicmn.cpp
     src/common/geometry.cpp
     src/common/gifdecod.cpp
+    src/common/graphcmn.cpp
     src/common/helpbase.cpp
     src/common/iconbndl.cpp
     src/common/imagall.cpp
@@ -587,14 +617,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/imagpcx.cpp
     src/common/imagpng.cpp
     src/common/imagpnm.cpp
+    src/common/imagtga.cpp
     src/common/imagtiff.cpp
     src/common/imagxpm.cpp
     src/common/layout.cpp
     src/common/lboxcmn.cpp
+    src/common/listctrlcmn.cpp
     src/common/matrix.cpp
     src/common/menucmn.cpp
     src/common/nbkbase.cpp
+    src/common/overlaycmn.cpp
     src/common/paper.cpp
+    src/common/pickerbase.cpp
     src/common/popupcmn.cpp
     src/common/prntbase.cpp
     src/common/quantize.cpp
@@ -616,11 +650,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/wincmn.cpp
     src/common/xpmdecod.cpp
     src/generic/busyinfo.cpp
+    src/generic/buttonbar.cpp
     src/generic/choicdgg.cpp
     src/generic/choicbkg.cpp
+    src/generic/clrpickerg.cpp
+    src/generic/combog.cpp
     src/generic/dcpsg.cpp
     src/generic/dirctrlg.cpp
     src/generic/dragimgg.cpp
+    src/generic/filepickerg.cpp
+    src/generic/fontpickerg.cpp
     src/generic/listbkg.cpp
     src/generic/logg.cpp
     src/generic/numdlgg.cpp
@@ -649,12 +688,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/choicdlg.h
     wx/choice.h
     wx/cmndata.h
+    wx/combo.h
     wx/combobox.h
     wx/control.h
     wx/ctrlsub.h
     wx/cursor.h
     wx/dc.h
     wx/dcclient.h
+    wx/dcgraph.h
     wx/dcmemory.h
     wx/dcprint.h
     wx/dcscreen.h
@@ -668,14 +709,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gbsizer.h
     wx/gdicmn.h
     wx/generic/accel.h
+    wx/generic/buttonbar.h
     wx/generic/choicdgg.h
+    wx/generic/clrpickerg.h
+    wx/generic/collpaneg.h
     wx/generic/colrdlgg.h
+    wx/generic/combo.h
     wx/generic/dcpsg.h
     wx/generic/dirctrlg.h
     wx/generic/dragimgg.h
     wx/generic/filedlgg.h
+    wx/generic/filepickerg.h
     wx/generic/fontdlgg.h
-    wx/generic/imaglist.h
+    wx/generic/fontpickerg.h
     wx/generic/logg.h
     wx/generic/msgdlgg.h
     wx/generic/numdlgg.h
@@ -690,6 +736,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/textdlgg.h
     wx/generic/timer.h
     wx/generic/treectlg.h
+    wx/graphics.h
     wx/helphtml.h
     wx/icon.h
     wx/layout.h
@@ -698,6 +745,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/menu.h
     wx/msgdlg.h
     wx/numdlg.h
+    wx/overlay.h
     wx/palette.h
     wx/panel.h
     wx/pen.h
@@ -721,9 +769,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/validate.h
     wx/valtext.h
     wx/window.h
+    wx/wupdlock.h
 
     wx/accel.h
     wx/access.h
+    wx/anidecod.h
     wx/artprov.h
     wx/bitmap.h
     wx/bookctrl.h
@@ -732,6 +782,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/caret.h
     wx/choicebk.h
     wx/clipbrd.h
+    wx/clrpicker.h
     wx/cmdproc.h
     wx/colordlg.h
     wx/colour.h
@@ -742,12 +793,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/dialup.h
     wx/dirctrl.h
     wx/display.h
+    wx/display_impl.h
     wx/dnd.h
     wx/docmdi.h
     wx/docview.h
     wx/effects.h
     wx/evtloop.h
     wx/fdrepdlg.h
+    wx/filepicker.h
+    wx/fontpicker.h
     wx/fmappriv.h
     wx/font.h
     wx/fontdlg.h
@@ -770,6 +824,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/imagpcx.h
     wx/imagpng.h
     wx/imagpnm.h
+    wx/imagtga.h
     wx/imagtiff.h
     wx/imagxpm.h
     wx/listbase.h
@@ -782,6 +837,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/notebook.h
     wx/ownerdrw.h
     wx/paper.h
+    wx/pickerbase.h
     wx/popupwin.h
     wx/print.h
     wx/printdlg.h
@@ -823,6 +879,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="XWIN_LOWLEVEL_SRC" hints="files">
     src/generic/caret.cpp
+    src/generic/imaglist.cpp
     src/unix/dialup.cpp
     src/unix/fontenum.cpp
     src/unix/fontutil.cpp
@@ -831,9 +888,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="XWIN_LOWLEVEL_HDR" hints="files">
     wx/generic/caret.h
+    wx/generic/imaglist.h
     wx/unix/fontutil.h
     wx/unix/utilsx11.h
-    wx/unix/displayx11.h
 </set>
 
 
@@ -843,6 +900,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="GTK_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)
+    src/generic/icon.cpp
     src/generic/paletteg.cpp
     src/gtk/app.cpp
     src/gtk/bitmap.cpp
@@ -859,9 +917,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/dnd.cpp
     src/gtk/evtloop.cpp
     src/gtk/font.cpp
-    src/gtk/gdiobj.cpp
     src/gtk/gsockgtk.cpp
-    src/gtk/icon.cpp
     src/gtk/main.cpp
     src/gtk/minifram.cpp
     src/gtk/pen.cpp
@@ -878,6 +934,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="GTK_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
+    wx/generic/icon.h
     wx/generic/paletteg.h
     wx/gtk/app.h
     wx/gtk/bitmap.h
@@ -894,8 +951,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/dcscreen.h
     wx/gtk/dnd.h
     wx/gtk/font.h
-    wx/gtk/gdiobj.h
-    wx/gtk/icon.h
     wx/gtk/minifram.h
     wx/gtk/pen.h
     wx/gtk/popupwin.h
@@ -913,7 +968,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp
     src/generic/filedlgg.cpp
-    src/generic/imaglist.cpp
+    src/generic/graphicc.cpp
     src/generic/listctrl.cpp
     src/generic/msgdlgg.cpp
     src/generic/prntdlgg.cpp
@@ -931,12 +986,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/colordlg.cpp
     src/gtk/combobox.cpp
     src/gtk/control.cpp
+    src/gtk/clrpicker.cpp
     src/gtk/dialog.cpp
+    src/gtk/fontpicker.cpp
+    src/gtk/filepicker.cpp
+    src/gtk/dirdlg.cpp
     src/gtk/filedlg.cpp
     src/gtk/fontdlg.cpp
     src/gtk/frame.cpp
     src/gtk/gauge.cpp
     src/gtk/gnome/gprint.cpp
+    src/gtk/gnome/gvfs.cpp
     src/gtk/listbox.cpp
     src/gtk/mdi.cpp
     src/gtk/menu.cpp
@@ -956,6 +1016,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/tbargtk.cpp
     src/gtk/textctrl.cpp
     src/gtk/tglbtn.cpp
+    src/gtk/treeentry_gtk.c
     src/gtk/utilsres.cpp
 </set>
 <set var="GTK_HDR" hints="files">
@@ -974,12 +1035,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/choice.h
     wx/gtk/combobox.h
     wx/gtk/control.h
+    wx/gtk/clrpicker.h
     wx/gtk/dialog.h
+    wx/gtk/dirdlg.h
     wx/gtk/filedlg.h
+    wx/gtk/fontpicker.h
+    wx/gtk/filepicker.h
     wx/gtk/fontdlg.h
     wx/gtk/frame.h
     wx/gtk/gauge.h
     wx/gtk/gnome/gprint.h
+    wx/gtk/gnome/gvfs.h
     wx/gtk/listbox.h
     wx/gtk/mdi.h
     wx/gtk/menu.h
@@ -1001,6 +1067,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/textctrl.h
     wx/gtk/tglbtn.h
     wx/gtk/treectrl.h
+    wx/gtk/treeentry_gtk.h
 </set>
 
 
@@ -1010,6 +1077,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="GTK1_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)
+    src/generic/icon.cpp
     src/generic/paletteg.cpp
     src/gtk1/app.cpp
     src/gtk1/bitmap.cpp
@@ -1026,9 +1094,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk1/dnd.cpp
     src/gtk1/evtloop.cpp
     src/gtk1/font.cpp
-    src/gtk1/gdiobj.cpp
     src/gtk1/gsockgtk.cpp
-    src/gtk1/icon.cpp
     src/gtk1/main.cpp
     src/gtk1/minifram.cpp
     src/gtk1/pen.cpp
@@ -1045,6 +1111,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="GTK1_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
+    wx/generic/icon.h
     wx/generic/paletteg.h
     wx/gtk1/app.h
     wx/gtk1/bitmap.h
@@ -1061,8 +1128,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk1/dcscreen.h
     wx/gtk1/dnd.h
     wx/gtk1/font.h
-    wx/gtk1/gdiobj.h
-    wx/gtk1/icon.h
     wx/gtk1/minifram.h
     wx/gtk1/pen.h
     wx/gtk1/popupwin.h
@@ -1080,7 +1145,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp
     src/generic/filedlgg.cpp
-    src/generic/imaglist.cpp
     src/generic/listctrl.cpp
     src/generic/msgdlgg.cpp
     src/generic/prntdlgg.cpp
@@ -1211,7 +1275,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/motif/font.cpp
     src/motif/frame.cpp
     src/motif/gauge.cpp
-    src/motif/gdiobj.cpp
     src/motif/gsockmot.cpp
     src/motif/icon.cpp
     src/motif/listbox.cpp
@@ -1244,7 +1307,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp
     src/generic/fontdlgg.cpp
-    src/generic/imaglist.cpp
     src/generic/listctrl.cpp
     src/generic/notebook.cpp
     src/generic/prntdlgg.cpp
@@ -1257,7 +1319,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/dirdlgg.h
     wx/generic/fdrepdlg.h
     wx/generic/fontdlgg.h
-    wx/generic/imaglist.h
     wx/generic/listctrl.h
     wx/generic/notebook.h
     wx/generic/prntdlgg.h
@@ -1292,7 +1353,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/motif/font.h
     wx/motif/frame.h
     wx/motif/gauge.h
-    wx/motif/gdiobj.h
     wx/motif/icon.h
     wx/motif/listbox.h
     wx/motif/mdi.h
@@ -1328,6 +1388,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/timer.cpp
     src/x11/app.cpp
     src/x11/bitmap.cpp
@@ -1343,10 +1404,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/x11/dcscreen.cpp
     src/x11/evtloop.cpp
     src/x11/font.cpp
-    src/x11/gdiobj.cpp
     src/x11/gsockx11.cpp
-    src/x11/icon.cpp
-    src/x11/main.cpp
     src/x11/minifram.cpp
     src/x11/nanox.c
     src/x11/palette.cpp
@@ -1362,9 +1420,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="X11_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
+    wx/generic/icon.h
     wx/x11/app.h
     wx/x11/bitmap.h
     wx/x11/brush.h
+    wx/x11/chkconf.h
     wx/x11/clipbrd.h
     wx/x11/colour.h
     wx/x11/cursor.h
@@ -1378,8 +1438,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/x11/dcscreen.h
     wx/x11/dnd.h
     wx/x11/font.h
-    wx/x11/gdiobj.h
-    wx/x11/icon.h
     wx/x11/minifram.h
     wx/x11/palette.h
     wx/x11/pen.h
@@ -1424,8 +1482,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/fontutil.cpp
     src/msw/gdiimage.cpp
     src/msw/gdiobj.cpp
+    src/msw/graphics.cpp
     src/msw/gsockmsw.cpp
     src/msw/icon.cpp
+    src/msw/imaglist.cpp
     src/msw/minifram.cpp
     src/msw/ole/dataobj.cpp
     src/msw/ole/dropsrc.cpp
@@ -1474,6 +1534,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/checkbox.cpp
     src/msw/choice.cpp
     src/msw/colordlg.cpp
+    src/msw/combo.cpp
     src/msw/combobox.cpp
     src/msw/control.cpp
     src/msw/dialog.cpp
@@ -1482,7 +1543,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/filedlg.cpp
     src/msw/frame.cpp
     src/msw/gauge95.cpp
-    src/msw/imaglist.cpp
     src/msw/iniconf.cpp
     src/msw/listbox.cpp
     src/msw/listctrl.cpp
@@ -1513,6 +1573,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/treectrl.cpp
 </set>
 <set var="MSW_HDR" hints="files">
+    wx/generic/clrpickerg.h
+    wx/generic/fontpickerg.h
+    wx/generic/filepickerg.h
     wx/msw/accel.h
     wx/msw/app.h
     wx/msw/bitmap.h
@@ -1525,6 +1588,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/clipbrd.h
     wx/msw/colordlg.h
     wx/msw/colour.h
+    wx/msw/combo.h
     wx/msw/combobox.h
     wx/msw/control.h
     wx/msw/cursor.h
@@ -1544,7 +1608,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/frame.h
     wx/msw/gauge95.h
     wx/msw/gdiimage.h
-    wx/msw/gdiobj.h
     wx/msw/icon.h
     wx/msw/imaglist.h
     wx/msw/iniconf.h
@@ -1586,7 +1649,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/stattext.h
     wx/msw/tabctrl.h
     wx/msw/tbar95.h
-    wx/msw/tbarmsw.h
     wx/msw/textctrl.h
     wx/msw/tglbtn.h
     wx/msw/timer.h
@@ -1640,7 +1702,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/checklst.h
     wx/msw/fdrepdlg.h
     wx/msw/fontdlg.h
-    wx/msw/helpbest.h
     wx/msw/ole/automtn.h
     wx/msw/ole/uuid.h
 </set>
@@ -1649,6 +1710,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="WINCE_SRC" hints="files">
     src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp
+    src/generic/filedlgg.cpp
     src/generic/fontdlgg.cpp
     src/msw/wince/checklst.cpp
     src/msw/wince/choicece.cpp
@@ -1662,6 +1724,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="WINCE_HDR" hints="files">
     wx/generic/fdrepdlg.h
+    wx/generic/filedlgg.h
     wx/generic/fontdlgg.h
     wx/msw/wince/checklst.h
     wx/msw/wince/choicece.h
@@ -1680,12 +1743,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="MGL_LOWLEVEL_SRC" hints="files">
     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/colour.cpp
     src/mgl/cursor.cpp
     src/mgl/data.cpp
     src/mgl/dc.cpp
@@ -1697,8 +1763,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mgl/font.cpp
     src/mgl/fontenum.cpp
     src/mgl/fontutil.cpp
-    src/mgl/gdiobj.cpp
-    src/mgl/icon.cpp
     src/mgl/palette.cpp
     src/mgl/pen.cpp
     src/mgl/region.cpp
@@ -1709,13 +1773,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </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/generic/timer.h
     wx/mgl/app.h
     wx/mgl/bitmap.h
     wx/mgl/brush.h
     wx/mgl/chkconf.h
     wx/mgl/clipbrd.h
-    wx/mgl/colour.h
     wx/mgl/cursor.h
     wx/mgl/dc.h
     wx/mgl/dcclient.h
@@ -1723,8 +1790,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mgl/dcscreen.h
     wx/mgl/font.h
     wx/mgl/fontutil.h
-    wx/mgl/gdiobj.h
-    wx/mgl/icon.h
     wx/mgl/palette.h
     wx/mgl/pen.h
     wx/mgl/popupwin.h
@@ -1735,11 +1800,72 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 
+<!-- ====================================================================== -->
+<!--                                wxDFB                                   -->
+<!-- ====================================================================== -->
+
+<set var="DFB_LOWLEVEL_SRC" hints="files">
+    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/dfb/app.cpp
+    src/dfb/bitmap.cpp
+    src/dfb/brush.cpp
+    src/dfb/cursor.cpp
+    <!--    src/dfb/data.cpp -->
+    src/dfb/dc.cpp
+    src/dfb/dcclient.cpp
+    src/dfb/dcmemory.cpp
+    src/dfb/dcscreen.cpp
+    src/dfb/evtloop.cpp
+    src/dfb/font.cpp
+    src/dfb/fontenum.cpp
+    src/dfb/overlay.cpp
+    src/dfb/pen.cpp
+    src/dfb/region.cpp
+    src/dfb/settings.cpp
+    src/dfb/toplevel.cpp
+    src/dfb/utils.cpp
+    src/dfb/window.cpp
+    src/dfb/wrapdfb.cpp
+</set>
+<set var="DFB_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/generic/timer.h
+    wx/dfb/app.h
+    wx/dfb/bitmap.h
+    wx/dfb/brush.h
+    wx/dfb/chkconf.h
+    wx/dfb/cursor.h
+    wx/dfb/dc.h
+    wx/dfb/dcclient.h
+    wx/dfb/dcmemory.h
+    wx/dfb/dcscreen.h
+    wx/dfb/dfbptr.h
+    wx/dfb/evtloop.h
+    wx/dfb/font.h
+    wx/dfb/pen.h
+    wx/dfb/private.h
+    wx/dfb/region.h
+    wx/dfb/toplevel.h
+    wx/dfb/window.h
+    wx/dfb/wrapdfb.h
+</set>
+
+
 <!-- ====================================================================== -->
 <!--                               wxOS/2                                   -->
 <!-- ====================================================================== -->
 
 <set var="OS2_LOWLEVEL_SRC" hints="files">
+    <!-- wxUniv builds not supported under OS/2 -->
 </set>
 <set var="OS2_LOWLEVEL_HDR" hints="files">
 </set>
@@ -1752,7 +1878,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/imaglist.cpp
     src/generic/listctrl.cpp
     src/generic/mdig.cpp
-    src/generic/msgdlgg.cpp
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
     <!-- OS/2 specific files: -->
@@ -1778,7 +1903,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/os2/dcprint.cpp
     src/os2/dcscreen.cpp
     src/os2/dialog.cpp
-    src/os2/display.cpp
     src/os2/dnd.cpp
     src/os2/evtloop.cpp
     src/os2/filedlg.cpp
@@ -1789,7 +1913,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/os2/frame.cpp
     src/os2/gauge.cpp
     src/os2/gdiimage.cpp
-    src/os2/gdiobj.cpp
     src/os2/gsockpm.cpp
     src/os2/helpwin.cpp
     src/os2/icon.cpp
@@ -1860,7 +1983,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/dcprint.h
     wx/os2/dcscreen.h
     wx/os2/dialog.h
-    wx/os2/display.h
     wx/os2/dnd.h
     wx/os2/filedlg.h
     wx/os2/font.h
@@ -1868,7 +1990,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/frame.h
     wx/os2/gauge.h
     wx/os2/gdiimage.h
-    wx/os2/gdiobj.h
     wx/os2/helpwin.h
     wx/os2/icon.h
     wx/os2/iniconf.h
@@ -1980,9 +2101,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/carbon/frame.cpp
     src/mac/carbon/gauge.cpp
     src/mac/carbon/gdiobj.cpp
+    src/mac/carbon/graphics.cpp
     src/mac/carbon/icon.cpp
     src/mac/carbon/imaglist.cpp
     src/mac/carbon/listbox.cpp
+    src/mac/carbon/listctrl_mac.cpp
     src/mac/carbon/mdi.cpp
     src/mac/carbon/menu.cpp
     src/mac/carbon/menuitem.cpp
@@ -1990,9 +2113,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/carbon/minifram.cpp
     src/mac/carbon/msgdlg.cpp
     src/mac/carbon/notebmac.cpp
+    src/mac/carbon/overlay.cpp
     src/mac/carbon/palette.cpp
     src/mac/carbon/pen.cpp
-    src/mac/carbon/pnghand.cpp
     src/mac/carbon/printdlg.cpp
     src/mac/carbon/printmac.cpp
     src/mac/carbon/radiobox.cpp
@@ -2056,7 +2179,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/dcscreen.h
     wx/mac/dialog.h
     wx/mac/dirdlg.h
-    wx/mac/display.h
     wx/mac/dnd.h
     wx/mac/evtloop.h
     wx/mac/filedlg.h
@@ -2064,7 +2186,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/fontdlg.h
     wx/mac/frame.h
     wx/mac/gauge.h
-    wx/mac/gdiobj.h
     wx/mac/glcanvas.h
     wx/mac/gsockmac.h
     wx/mac/helpxxxx.h
@@ -2144,7 +2265,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/carbon/dcscreen.h
     wx/mac/carbon/dialog.h
     wx/mac/carbon/dirdlg.h
-    wx/mac/carbon/display.h
     wx/mac/carbon/dnd.h
     wx/mac/carbon/evtloop.h
     wx/mac/carbon/filedlg.h
@@ -2152,7 +2272,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/carbon/fontdlg.h
     wx/mac/carbon/frame.h
     wx/mac/carbon/gauge.h
-    wx/mac/carbon/gdiobj.h
     wx/mac/carbon/gsockmac.h
     wx/mac/carbon/helpxxxx.h
     wx/mac/carbon/icon.h
@@ -2256,6 +2375,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/dcmemory.mm
     src/cocoa/dcscreen.cpp
     src/cocoa/dialog.mm
+    src/cocoa/dirdlg.mm
     src/cocoa/display.mm
     src/cocoa/drawer.mm
     src/cocoa/evtloop.mm
@@ -2266,7 +2386,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/fontutil.cpp
     src/cocoa/frame.mm
     src/cocoa/gauge.mm
-    src/cocoa/gdiobj.cpp
     src/cocoa/icon.mm
     src/cocoa/listbox.mm
     src/cocoa/main.cpp
@@ -2301,7 +2420,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/accel.cpp
     src/generic/caret.cpp
     src/generic/colrdlgg.cpp
-    src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp
     src/generic/fontdlgg.cpp
     src/generic/imaglist.cpp
@@ -2350,14 +2468,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cocoa/dcmemory.h
     wx/cocoa/dcscreen.h
     wx/cocoa/dialog.h
-    wx/cocoa/display.h
+    wx/cocoa/dirdlg.h
     wx/cocoa/drawer.h
     wx/cocoa/filedlg.h
     wx/cocoa/font.h
     wx/cocoa/fontdlg.h
     wx/cocoa/frame.h
     wx/cocoa/gauge.h
-    wx/cocoa/gdiobj.h
     wx/cocoa/icon.h
     wx/cocoa/listbox.h
     wx/cocoa/log.h
@@ -2386,7 +2503,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cocoa/window.h
     <!-- Generic implementations used by wxCocoa: -->
     wx/generic/caret.h
-    wx/generic/dirdlgg.h
     wx/generic/fdrepdlg.h
     wx/generic/fontdlgg.h
     wx/generic/imaglist.h
@@ -2407,6 +2523,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="UNIV_THEMES_SRC" hints="files">
     src/univ/themes/gtk.cpp
     src/univ/themes/metal.cpp
+    src/univ/themes/mono.cpp
     src/univ/themes/win32.cpp
 </set>
 
@@ -2417,7 +2534,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/fdrepdlg.cpp
     src/generic/filedlgg.cpp
     src/generic/fontdlgg.cpp
-    src/generic/imaglist.cpp
     src/generic/listctrl.cpp
     src/generic/mdig.cpp
     src/generic/msgdlgg.cpp
@@ -2452,7 +2568,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/univ/statline.cpp
     src/univ/stattext.cpp
     src/univ/statusbr.cpp
+    src/univ/stdrend.cpp
     src/univ/textctrl.cpp
+    src/univ/tglbtn.cpp
     src/univ/theme.cpp
     src/univ/toolbar.cpp
     src/univ/topluniv.cpp
@@ -2472,6 +2590,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/univ/button.h
     wx/univ/checkbox.h
     wx/univ/checklst.h
+    wx/univ/chkconf.h
     wx/univ/choice.h
     wx/univ/colschem.h
     wx/univ/combobox.h
@@ -2499,6 +2618,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/univ/statline.h
     wx/univ/stattext.h
     wx/univ/statusbr.h
+    wx/univ/stdrend.h
     wx/univ/textctrl.h
     wx/univ/theme.h
     wx/univ/toolbar.h
@@ -2512,31 +2632,44 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <set var="ADVANCED_CMN_SRC" hints="files">
+    src/common/animatecmn.cpp
+    src/common/datavcmn.cpp
+    src/generic/aboutdlgg.cpp
+    src/generic/bmpcboxg.cpp
     src/generic/calctrl.cpp
+    src/generic/collpaneg.cpp
+    src/generic/datavgen.cpp
     src/generic/datectlg.cpp
     src/generic/grid.cpp
     src/generic/gridctrl.cpp
     src/generic/gridsel.cpp
     src/generic/helpext.cpp
+    src/generic/hyperlink.cpp
     src/generic/laywin.cpp
+    src/generic/odcombo.cpp
     src/generic/propdlg.cpp
     src/generic/sashwin.cpp
     src/generic/splash.cpp
     src/generic/tipdlg.cpp
     src/generic/wizard.cpp
-    src/richtext/richtextctrl.cpp
-    src/richtext/richtextbuffer.cpp
-    src/richtext/richtextstyles.cpp
-    src/richtext/richtextxml.cpp
-    src/richtext/richtexthtml.cpp
 </set>
 
 <set var="ADVANCED_CMN_HDR" hints="files">
+    wx/animate.h
+    wx/animdecod.h
+    wx/bmpcbox.h
     wx/calctrl.h
+    wx/collpane.h
+    wx/dataview.h
     wx/dateevt.h
     wx/dcbuffer.h
+    wx/aboutdlg.h
+    wx/generic/aboutdlgg.h
+    wx/generic/bmpcbox.h
     wx/generic/calctrl.h
+    wx/generic/collpaneg.h
     wx/generic/datectrl.h
+    wx/generic/dataview.h
     wx/generic/grid.h
     wx/generic/gridctrl.h
     wx/generic/gridsel.h
@@ -2547,8 +2680,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/splash.h
     wx/generic/wizard.h
     wx/grid.h
+    wx/hyperlink.h
     wx/joystick.h
     wx/laywin.h
+    wx/odcombo.h
     wx/propdlg.h
     wx/sashwin.h
     wx/sound.h
@@ -2557,22 +2692,22 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/tipdlg.h
     wx/wave.h
     wx/wizard.h
-    wx/richtext/richtextctrl.h
-    wx/richtext/richtextbuffer.h
-    wx/richtext/richtextstyles.h
-    wx/richtext/richtextxml.h
 </set>
 
 <set var="ADVANCED_CMN_NATIVE_HDR" hints="files">
     wx/datectrl.h
+    wx/dataview.h
 </set>
 
 <set var="ADVANCED_MSW_SRC" hints="files">
+    src/generic/animateg.cpp
     src/common/taskbarcmn.cpp
+    src/msw/aboutdlg.cpp
     src/msw/sound.cpp
     src/msw/taskbar.cpp
 </set>
 <set var="ADVANCED_MSW_HDR" hints="files">
+    wx/generic/animate.h
     wx/msw/sound.h
     wx/msw/taskbar.h
 </set>
@@ -2594,13 +2729,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="ADVANCED_MAC_SRC" hints="files">
+    src/generic/animateg.cpp
     src/common/taskbarcmn.cpp
+    src/mac/carbon/aboutdlg.cpp
     src/mac/carbon/drawer.cpp
     src/mac/carbon/sound.cpp
     src/mac/carbon/taskbar.cpp
     src/mac/corefoundation/hidjoystick.cpp
 </set>
 <set var="ADVANCED_MAC_HDR" hints="files">
+    wx/generic/animate.h
     wx/mac/carbon/drawer.h
     wx/mac/carbon/sound.h
     wx/mac/carbon/taskbarosx.h
@@ -2608,20 +2746,24 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="ADVANCED_COCOA_SRC" hints="files">
+    src/generic/animateg.cpp
     src/cocoa/taskbar.mm
     src/common/taskbarcmn.cpp
     src/mac/corefoundation/hidjoystick.cpp
 </set>
 <set var="ADVANCED_COCOA_HDR" hints="files">
+    wx/generic/animate.h
     wx/cocoa/taskbar.h
     wx/mac/corefoundation/joystick.h
 </set>
 
 <set var="ADVANCED_OS2_SRC" hints="files">
+    src/generic/animateg.cpp
     src/os2/joystick.cpp
     src/os2/sound.cpp
 </set>
 <set var="ADVANCED_OS2_HDR" hints="files">
+    wx/generic/animate.h
     wx/os2/joystick.h
     wx/os2/sound.h
 </set>
@@ -2639,10 +2781,41 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="ADVANCED_GTK_SRC" hints="files">
+    src/generic/animateg.cpp
+    src/gtk/aboutdlg.cpp
+    src/gtk/animate.cpp
+    src/gtk/collpane.cpp
+    src/gtk/dataview.cpp
     src/gtk/taskbar.cpp
     src/gtk/eggtrayicon.c
 </set>
+<set var="ADVANCED_GTK_HDR" hints="files">
+    wx/generic/animate.h
+    wx/gtk/animate.h
+    wx/gtk/collpane.h
+</set>
+
 <set var="ADVANCED_GTK1_SRC" hints="files">
+    src/generic/animateg.cpp
+    src/gtk1/eggtrayicon.c
+    src/gtk1/taskbar.cpp
+</set>
+<set var="ADVANCED_GTK1_HDR" hints="files">
+    wx/generic/animate.h
+</set>
+
+<set var="ADVANCED_MOTIF_SRC" hints="files">
+    src/generic/animateg.cpp
+</set>
+<set var="ADVANCED_MOTIF_HDR" hints="files">
+    wx/generic/animate.h
+</set>
+
+<set var="ADVANCED_X11_SRC" hints="files">
+    src/generic/animateg.cpp
+</set>
+<set var="ADVANCED_X11_HDR" hints="files">
+    wx/generic/animate.h
 </set>
 
 <!-- ====================================================================== -->
@@ -2658,7 +2831,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="MEDIA_MSW_SRC" hints="files">
-    src/msw/mediactrl.cpp
+    src/msw/mediactrl_am.cpp
+    src/msw/mediactrl_wmp10.cpp
     src/msw/ole/activex.cpp
 </set>
 <set var="MEDIA_MSW_HDR" hints="files">
@@ -2760,6 +2934,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/wxhtml.h
     <!-- wxHTML users: -->
     wx/htmllbox.h
+    wx/msw/helpbest.h
 </set>
 
 
@@ -2769,33 +2944,43 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <set var="XRC_SRC" hints="files">
-    src/xrc/xh_bmpbt.cpp
+    src/xrc/xh_animatctrl.cpp
     src/xrc/xh_bmp.cpp
+    src/xrc/xh_bmpcbox.cpp
+    src/xrc/xh_bmpbt.cpp
     src/xrc/xh_bttn.cpp
     src/xrc/xh_cald.cpp
     src/xrc/xh_chckb.cpp
     src/xrc/xh_chckl.cpp
     src/xrc/xh_choic.cpp
     src/xrc/xh_choicbk.cpp
+    src/xrc/xh_clrpicker.cpp
+    src/xrc/xh_collpane.cpp
     src/xrc/xh_combo.cpp
     src/xrc/xh_datectrl.cpp
+    src/xrc/xh_dirpicker.cpp
     src/xrc/xh_dlg.cpp
     src/xrc/xh_frame.cpp
     src/xrc/xh_mdi.cpp
+    src/xrc/xh_filepicker.cpp
+    src/xrc/xh_fontpicker.cpp
     src/xrc/xh_gauge.cpp
     src/xrc/xh_gdctl.cpp
     src/xrc/xh_grid.cpp
     src/xrc/xh_html.cpp
+    src/xrc/xh_hyperlink.cpp
     src/xrc/xh_listb.cpp
     src/xrc/xh_listbk.cpp
     src/xrc/xh_listc.cpp
     src/xrc/xh_menu.cpp
     src/xrc/xh_notbk.cpp
+    src/xrc/xh_odcombo.cpp
     src/xrc/xh_panel.cpp
     src/xrc/xh_radbt.cpp
     src/xrc/xh_radbx.cpp
     src/xrc/xh_scrol.cpp
     src/xrc/xh_scwin.cpp
+    src/xrc/xh_htmllbox.cpp
     src/xrc/xh_sizer.cpp
     src/xrc/xh_slidr.cpp
     src/xrc/xh_spin.cpp
@@ -2817,33 +3002,43 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="XRC_HDR" hints="files">
     wx/xrc/xh_all.h
+    wx/xrc/xh_animatctrl.h
     wx/xrc/xh_bmpbt.h
     wx/xrc/xh_bmp.h
+    wx/xrc/xh_bmpcbox.h
     wx/xrc/xh_bttn.h
     wx/xrc/xh_cald.h
     wx/xrc/xh_chckb.h
     wx/xrc/xh_chckl.h
     wx/xrc/xh_choic.h
     wx/xrc/xh_choicbk.h
+    wx/xrc/xh_clrpicker.h
+    wx/xrc/xh_collpane.h
     wx/xrc/xh_combo.h
     wx/xrc/xh_datectrl.h
+    wx/xrc/xh_dirpicker.h
     wx/xrc/xh_dlg.h
+    wx/xrc/xh_filepicker.h
+    wx/xrc/xh_fontpicker.h
     wx/xrc/xh_frame.h
     wx/xrc/xh_mdi.h
     wx/xrc/xh_gauge.h
     wx/xrc/xh_gdctl.h
     wx/xrc/xh_grid.h
     wx/xrc/xh_html.h
+    wx/xrc/xh_hyperlink.h
     wx/xrc/xh_listb.h
     wx/xrc/xh_listbk.h
     wx/xrc/xh_listc.h
     wx/xrc/xh_menu.h
     wx/xrc/xh_notbk.h
+    wx/xrc/xh_odcombo.h
     wx/xrc/xh_panel.h
     wx/xrc/xh_radbt.h
     wx/xrc/xh_radbx.h
     wx/xrc/xh_scrol.h
     wx/xrc/xh_scwin.h
+    wx/xrc/xh_htmllbox.h
     wx/xrc/xh_sizer.h
     wx/xrc/xh_slidr.h
     wx/xrc/xh_spin.h
@@ -2940,6 +3135,52 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/unix/sound_sdl.cpp
 </set>
 
+<!-- ====================================================================== -->
+<!--                                  wxAUI                                 -->
+<!-- ====================================================================== -->
+
+<set var="AUI_SRC" hints="files">
+    src/aui/framemanager.cpp
+    src/aui/dockart.cpp
+    src/aui/floatpane.cpp
+    src/aui/auibook.cpp
+    src/aui/tabmdi.cpp
+</set>
+<set var="AUI_HDR" hints="files">
+    wx/aui/framemanager.h
+    wx/aui/dockart.h
+    wx/aui/floatpane.h
+    wx/aui/auibook.h
+    wx/aui/tabmdi.h
+    wx/aui/aui.h
+</set>
+
+<!-- ====================================================================== -->
+<!--                                  wxRichTextCtrl                        -->
+<!-- ====================================================================== -->
+
+<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/richtextformatdlg.cpp
+    src/richtext/richtextsymboldlg.cpp
+    src/richtext/richtextstyledlg.cpp
+    src/richtext/richtextprint.cpp
+</set>
+<set var="RICHTEXT_HDR" hints="files">
+    wx/richtext/richtextctrl.h
+    wx/richtext/richtextbuffer.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
+</set>
+
 <!-- ====================================================================== -->
 <!--                    Define sources for specific libraries:              -->
 <!-- ====================================================================== -->
@@ -3002,6 +3243,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_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>
 
     <set var="BASE_SRC" hints="files">
@@ -3047,6 +3289,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <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=='2'">$(GTK_LOWLEVEL_HDR)</if>
@@ -3059,6 +3302,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <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>
 
     <set var="GUI_SRC" hints="files">
@@ -3097,10 +3341,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_SRC)</if>
-        <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC)</if>
+        <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC) $(ADVANCED_MOTIF_SRC)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK1_SRC)</if>
-        <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
+        <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC) $(ADVANCED_X11_SRC)</if>
         <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
     </set>
     <set var="ADVANCED_PLATFORM_HDR" hints="files">
@@ -3108,9 +3352,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_HDR)</if>
         <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_HDR)</if>
-        <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR)</if>
-        <if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_HDR)</if>
-        <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
+        <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR) $(ADVANCED_MOTIF_HDR)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK_HDR)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK1_HDR)</if>
+        <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR) $(ADVANCED_X11_HDR)</if>
         <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_HDR)</if>
     </set>
 
@@ -3169,7 +3414,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
             $(LOWLEVEL_HDR)
             $(GUI_CORE_HEADERS)
             $(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
-            $(OPENGL_HDR) $(QA_HDR) $(DBGRID_HDR) $(XRC_HDR)
+            $(OPENGL_HDR) $(QA_HDR) $(DBGRID_HDR) $(XRC_HDR) $(AUI_HDR) $(RICHTEXT_HDR)
         </if>
     </set>