added wxDataViewIndexListModel and sample

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

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 5fae0df03694803b80fdca67c26c9a9af8b495f1..c2d4f7884a7c802681fd88508edbededbdeb77e5 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -54,22 +54,31 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!--                               UNIX                                     -->
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 <set var="BASE_UNIX_SRC" hints="files">
 <!--                               UNIX                                     -->
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 <set var="BASE_UNIX_SRC" hints="files">

+    src/common/fdiodispatcher.cpp
+    src/common/selectdispatcher.cpp
+    src/unix/appunix.cpp

     src/unix/baseunix.cpp
     src/unix/dir.cpp
     src/unix/dlunix.cpp
     src/unix/baseunix.cpp
     src/unix/dir.cpp
     src/unix/dlunix.cpp

+    src/unix/epolldispatcher.cpp
+    src/unix/evtloopunix.cpp

     src/unix/mimetype.cpp
     src/unix/snglinst.cpp
     src/unix/stackwalk.cpp
     src/unix/stdpaths.cpp
     src/unix/threadpsx.cpp
     src/unix/mimetype.cpp
     src/unix/snglinst.cpp
     src/unix/stackwalk.cpp
     src/unix/stdpaths.cpp
     src/unix/threadpsx.cpp

+    src/unix/timerunx.cpp

 </set>
 <set var="BASE_AND_GUI_UNIX_SRC" hints="files">
     src/unix/utilsunx.cpp
 </set>
 <set var="BASE_UNIX_HDR" hints="files">
 </set>
 <set var="BASE_AND_GUI_UNIX_SRC" hints="files">
     src/unix/utilsunx.cpp
 </set>
 <set var="BASE_UNIX_HDR" hints="files">

+    wx/unix/app.h

     wx/unix/apptbase.h
     wx/unix/apptrait.h
     wx/unix/apptbase.h
     wx/unix/apptrait.h

+    wx/unix/chkconf.h

     wx/unix/execute.h
     wx/unix/execute.h

+    wx/unix/evtloop.h

     wx/unix/mimetype.h
     wx/unix/pipe.h
     wx/unix/private.h
     wx/unix/mimetype.h
     wx/unix/pipe.h
     wx/unix/private.h


@@ -88,16 +97,19 @@ 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/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
     src/msw/stackwalk.cpp
     src/msw/stdpaths.cpp
     src/msw/thread.cpp
     src/msw/regconf.cpp
     src/msw/registry.cpp
     src/msw/snglinst.cpp
     src/msw/stackwalk.cpp
     src/msw/stdpaths.cpp
     src/msw/thread.cpp

+    src/msw/timer.cpp

     src/msw/utils.cpp
     src/msw/utilsexc.cpp
 </set>
 <set var="BASE_AND_GUI_WIN32_SRC" hints="files">
     src/msw/utils.cpp
     src/msw/utilsexc.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
     src/msw/main.cpp
     src/msw/mslu.cpp
     src/msw/volume.cpp


@@ -119,6 +131,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/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
     wx/msw/stackwalk.h
     wx/msw/stdpaths.h
     wx/msw/winundef.h


@@ -141,12 +154,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="BASE_COREFOUNDATION_SRC" hints="files">
     src/mac/corefoundation/cfstring.cpp
     src/mac/corefoundation/stdpaths_cf.cpp
 <set var="BASE_COREFOUNDATION_SRC" hints="files">
     src/mac/corefoundation/cfstring.cpp
     src/mac/corefoundation/stdpaths_cf.cpp

+    src/mac/corefoundation/strconv_cf.cpp

     src/mac/corefoundation/utilsexc_base.cpp
 </set>
 <set var="BASE_COREFOUNDATION_HDR" hints="files">
     wx/mac/corefoundation/cfstring.h
     wx/mac/corefoundation/hid.h
     wx/mac/corefoundation/stdpaths.h
     src/mac/corefoundation/utilsexc_base.cpp
 </set>
 <set var="BASE_COREFOUNDATION_HDR" hints="files">
     wx/mac/corefoundation/cfstring.h
     wx/mac/corefoundation/hid.h
     wx/mac/corefoundation/stdpaths.h

+    wx/mac/corefoundation/private/strconv_cf.h

 </set>
 
 <!-- Base files used by Carbon on OS X and CarbonLib (not true Classic) -->
 </set>
 
 <!-- Base files used by Carbon on OS X and CarbonLib (not true Classic) -->


@@ -195,14 +210,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- Base files used only by OS X builds (not CarbonLib or Classic)  -->
 <set var="BASE_MACOSX_WXMAC_SRC" hints="files">
     $(BASE_MAC_SRC)
 <!-- Base files used only by OS X builds (not CarbonLib or Classic)  -->
 <set var="BASE_MACOSX_WXMAC_SRC" hints="files">
     $(BASE_MAC_SRC)

+    src/common/fdiodispatcher.cpp
+    src/common/selectdispatcher.cpp
+    src/unix/appunix.cpp

     src/unix/baseunix.cpp
     src/unix/baseunix.cpp

+    src/unix/evtloopunix.cpp

     src/unix/dlunix.cpp
     src/unix/dlunix.cpp

+    src/unix/snglinst.cpp

     src/unix/stdpaths.cpp
     src/unix/stdpaths.cpp

+    src/unix/timerunx.cpp

 </set>
 <set var="BASE_MACOSX_WXMAC_HDR" hints="files">
     $(BASE_MAC_HDR)
 </set>
 <set var="BASE_MACOSX_WXMAC_HDR" hints="files">
     $(BASE_MAC_HDR)

+    wx/unix/app.h

     wx/unix/apptbase.h
     wx/unix/apptrait.h
     wx/unix/apptbase.h
     wx/unix/apptrait.h

+    wx/unix/chkconf.h
+    wx/unix/evtloop.h

     wx/unix/stdpaths.h
 </set>
 
     wx/unix/stdpaths.h
 </set>
 


@@ -237,6 +261,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/private.h
     wx/os2/stdpaths.h
     wx/os2/chkconf.h

+    wx/os2/wxrsc.h

 </set>
 
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 </set>
 
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->


@@ -286,10 +311,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 <set var="BASE_CMN_SRC" hints="files">
     src/common/appbase.cpp
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 <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/archive.cpp

+    src/common/arrstr.cpp
+    src/common/base64.cpp

     src/common/clntdata.cpp
     src/common/cmdline.cpp
     src/common/config.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
     src/common/datetime.cpp
     src/common/datstrm.cpp
     src/common/dircmn.cpp


@@ -297,15 +327,20 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/dynlib.cpp
     src/common/dynload.cpp
     src/common/encconv.cpp
     src/common/dynlib.cpp
     src/common/dynload.cpp
     src/common/encconv.cpp

+    src/common/evtloopcmn.cpp

     src/common/extended.c
     src/common/ffile.cpp
     src/common/file.cpp
     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/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/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
     src/common/hash.cpp
     src/common/hashmap.cpp
     src/common/init.cpp


@@ -319,6 +354,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/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
     src/common/process.cpp
     src/common/regex.cpp
     src/common/stdpbase.cpp


@@ -327,15 +364,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/strconv.cpp
     src/common/stream.cpp
     src/common/string.cpp
     src/common/strconv.cpp
     src/common/stream.cpp
     src/common/string.cpp

+    src/common/stringimpl.cpp
+    src/common/stringops.cpp
+    src/common/strvararg.cpp

     src/common/sysopt.cpp
     src/common/sysopt.cpp

+    src/common/tarstrm.cpp

     src/common/textbuf.cpp
     src/common/textfile.cpp
     src/common/textbuf.cpp
     src/common/textfile.cpp

+    src/common/timercmn.cpp
+    src/common/timerimpl.cpp

     src/common/tokenzr.cpp
     src/common/txtstrm.cpp
     src/common/tokenzr.cpp
     src/common/txtstrm.cpp

+    src/common/unichar.cpp

     src/common/uri.cpp
     src/common/variant.cpp
     src/common/wfstream.cpp
     src/common/uri.cpp
     src/common/variant.cpp
     src/common/wfstream.cpp

-    src/common/wxchar.cpp
+    src/common/wxcrt.cpp
+    src/common/wxprintf.cpp

     src/common/xti.cpp
     src/common/xtistrm.cpp
     src/common/zipstrm.cpp
     src/common/xti.cpp
     src/common/xtistrm.cpp
     src/common/zipstrm.cpp


@@ -354,15 +399,21 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/archive.h
     wx/arrimpl.cpp
     wx/arrstr.h
     wx/archive.h
     wx/arrimpl.cpp
     wx/arrstr.h

+    wx/atomic.h
+    wx/base64.h

     wx/beforestd.h
     wx/buffer.h
     wx/build.h
     wx/beforestd.h
     wx/buffer.h
     wx/build.h

+    wx/chartype.h

     wx/chkconf.h
     wx/clntdata.h
     wx/cmdline.h
     wx/confbase.h
     wx/config.h
     wx/chkconf.h
     wx/clntdata.h
     wx/cmdline.h
     wx/confbase.h
     wx/config.h

+    wx/convauto.h

     wx/containr.h
     wx/containr.h

+    wx/cpp.h
+    wx/crt.h

     wx/datetime.h
     wx/datstrm.h
     wx/dde.h
     wx/datetime.h
     wx/datstrm.h
     wx/dde.h


@@ -377,6 +428,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/event.h
     wx/except.h
     wx/features.h
     wx/event.h
     wx/except.h
     wx/features.h

+    wx/flags.h

     wx/ffile.h
     wx/file.h
     wx/fileconf.h
     wx/ffile.h
     wx/file.h
     wx/fileconf.h


@@ -385,6 +437,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/filesys.h
     wx/fontenc.h
     wx/fontmap.h
     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
     wx/fs_mem.h
     wx/fs_zip.h
     wx/hash.h


@@ -415,6 +469,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mstream.h
     wx/object.h
     wx/platform.h
     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
     wx/process.h
     wx/ptr_scpd.h
     wx/recguard.h


@@ -430,7 +486,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/strconv.h
     wx/stream.h
     wx/string.h
     wx/strconv.h
     wx/stream.h
     wx/string.h

+    wx/stringimpl.h
+    wx/stringops.h
+    wx/strvararg.h

     wx/sysopt.h
     wx/sysopt.h

+    wx/tarstrm.h

     wx/textbuf.h
     wx/textfile.h
     wx/thread.h
     wx/textbuf.h
     wx/textfile.h
     wx/thread.h


@@ -439,6 +499,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/tokenzr.h
     wx/txtstrm.h
     wx/types.h
     wx/tokenzr.h
     wx/txtstrm.h
     wx/types.h

+    wx/unichar.h

     wx/uri.h
     wx/utils.h
     wx/variant.h
     wx/uri.h
     wx/utils.h
     wx/variant.h


@@ -448,6 +509,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/wfstream.h
     wx/wx.h
     wx/wxchar.h
     wx/wfstream.h
     wx/wx.h
     wx/wxchar.h

+    wx/wxcrt.h
+    wx/wxcrtbase.h
+    wx/wxcrtvararg.h

     wx/wxprec.h
     wx/xti.h
     wx/xtistrm.h
     wx/wxprec.h
     wx/xti.h
     wx/xtistrm.h


@@ -540,14 +604,20 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <set var="GUI_CMN_SRC" hints="files">
 <!-- ====================================================================== -->
 
 <set var="GUI_CMN_SRC" hints="files">

+    src/common/accelcmn.cpp

     src/common/accesscmn.cpp
     src/common/accesscmn.cpp

+    src/common/anidecod.cpp

     src/common/appcmn.cpp
     src/common/artprov.cpp
     src/common/artstd.cpp
     src/common/bmpbase.cpp
     src/common/bookctrl.cpp
     src/common/appcmn.cpp
     src/common/artprov.cpp
     src/common/artstd.cpp
     src/common/bmpbase.cpp
     src/common/bookctrl.cpp

+    src/common/btncmn.cpp

     src/common/choiccmn.cpp
     src/common/clipcmn.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
     src/common/cmdproc.cpp
     src/common/cmndata.cpp
     src/common/containr.cpp


@@ -556,6 +626,9 @@ 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/ctrlsub.cpp
     src/common/datacmn.cpp
     src/common/dcbase.cpp

+    src/common/dcbufcmn.cpp
+    src/common/dcgraph.cpp
+    src/common/dcsvg.cpp

     src/common/dlgcmn.cpp
     src/common/dndcmn.cpp
     src/common/dobjcmn.cpp
     src/common/dlgcmn.cpp
     src/common/dndcmn.cpp
     src/common/dobjcmn.cpp


@@ -564,17 +637,21 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/dpycmn.cpp
     src/common/dseldlg.cpp
     src/common/effects.cpp
     src/common/dpycmn.cpp
     src/common/dseldlg.cpp
     src/common/effects.cpp

-    src/common/evtloopcmn.cpp

     src/common/fddlgcmn.cpp
     src/common/fddlgcmn.cpp

+    src/common/filepickercmn.cpp
+    src/common/fontpickercmn.cpp

     src/common/fldlgcmn.cpp
     src/common/fontcmn.cpp
     src/common/fldlgcmn.cpp
     src/common/fontcmn.cpp

+    src/common/fontenumcmn.cpp

     src/common/fontmap.cpp
     src/common/fontmap.cpp

+    src/common/fontutilcmn.cpp

     src/common/framecmn.cpp
     src/common/gaugecmn.cpp
     src/common/gbsizer.cpp
     src/common/gdicmn.cpp
     src/common/geometry.cpp
     src/common/gifdecod.cpp
     src/common/framecmn.cpp
     src/common/gaugecmn.cpp
     src/common/gbsizer.cpp
     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
     src/common/helpbase.cpp
     src/common/iconbndl.cpp
     src/common/imagall.cpp


@@ -587,14 +664,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/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/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/matrix.cpp
     src/common/menucmn.cpp
     src/common/nbkbase.cpp

+    src/common/overlaycmn.cpp

     src/common/paper.cpp
     src/common/paper.cpp

+    src/common/pickerbase.cpp

     src/common/popupcmn.cpp
     src/common/prntbase.cpp
     src/common/quantize.cpp
     src/common/popupcmn.cpp
     src/common/prntbase.cpp
     src/common/quantize.cpp


@@ -603,11 +684,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/rgncmn.cpp
     src/common/settcmn.cpp
     src/common/sizer.cpp
     src/common/rgncmn.cpp
     src/common/settcmn.cpp
     src/common/sizer.cpp

+    src/common/srchcmn.cpp

     src/common/statbar.cpp
     src/common/statbar.cpp

+    src/common/stattextcmn.cpp

     src/common/stockitem.cpp
     src/common/tbarbase.cpp
     src/common/textcmn.cpp
     src/common/stockitem.cpp
     src/common/tbarbase.cpp
     src/common/textcmn.cpp

-    src/common/timercmn.cpp

     src/common/toplvcmn.cpp
     src/common/treebase.cpp
     src/common/valgen.cpp
     src/common/toplvcmn.cpp
     src/common/treebase.cpp
     src/common/valgen.cpp


@@ -616,11 +698,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/wincmn.cpp
     src/common/xpmdecod.cpp
     src/generic/busyinfo.cpp
     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/choicdgg.cpp
     src/generic/choicbkg.cpp

+    src/generic/clrpickerg.cpp
+    src/generic/collpaneg.cpp
+    src/generic/combog.cpp

     src/generic/dcpsg.cpp
     src/generic/dirctrlg.cpp
     src/generic/dragimgg.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
     src/generic/listbkg.cpp
     src/generic/logg.cpp
     src/generic/numdlgg.cpp


@@ -632,6 +720,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/selstore.cpp
     src/generic/spinctlg.cpp
     src/generic/splitter.cpp
     src/generic/selstore.cpp
     src/generic/spinctlg.cpp
     src/generic/splitter.cpp

+    src/generic/srchctlg.cpp

     src/generic/textdlgg.cpp
     src/generic/tipwin.cpp
     src/generic/toolbkg.cpp
     src/generic/textdlgg.cpp
     src/generic/tipwin.cpp
     src/generic/toolbkg.cpp


@@ -649,15 +738,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/choicdlg.h
     wx/choice.h
     wx/cmndata.h
     wx/choicdlg.h
     wx/choice.h
     wx/cmndata.h

+    wx/collpane.h
+    wx/combo.h

     wx/combobox.h
     wx/control.h
     wx/ctrlsub.h
     wx/cursor.h
     wx/dc.h
     wx/dcclient.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
     wx/dcmemory.h
     wx/dcprint.h
     wx/dcscreen.h

+    wx/dcsvg.h

     wx/dialog.h
     wx/dirdlg.h
     wx/dragimag.h
     wx/dialog.h
     wx/dirdlg.h
     wx/dragimag.h


@@ -668,14 +761,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gbsizer.h
     wx/gdicmn.h
     wx/generic/accel.h
     wx/gbsizer.h
     wx/gdicmn.h
     wx/generic/accel.h

+    wx/generic/buttonbar.h

     wx/generic/choicdgg.h
     wx/generic/choicdgg.h

+    wx/generic/clrpickerg.h
+    wx/generic/collpaneg.h

     wx/generic/colrdlgg.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/dcpsg.h
     wx/generic/dirctrlg.h
     wx/generic/dragimgg.h
     wx/generic/filedlgg.h

+    wx/generic/filepickerg.h

     wx/generic/fontdlgg.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
     wx/generic/logg.h
     wx/generic/msgdlgg.h
     wx/generic/numdlgg.h


@@ -687,9 +785,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/scrolwin.h
     wx/generic/spinctlg.h
     wx/generic/splitter.h
     wx/generic/scrolwin.h
     wx/generic/spinctlg.h
     wx/generic/splitter.h

+    wx/generic/srchctlg.h

     wx/generic/textdlgg.h
     wx/generic/textdlgg.h

-    wx/generic/timer.h

     wx/generic/treectlg.h
     wx/generic/treectlg.h

+    wx/graphics.h

     wx/helphtml.h
     wx/icon.h
     wx/layout.h
     wx/helphtml.h
     wx/icon.h
     wx/layout.h


@@ -698,9 +797,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/menu.h
     wx/msgdlg.h
     wx/numdlg.h
     wx/menu.h
     wx/msgdlg.h
     wx/numdlg.h

+    wx/overlay.h

     wx/palette.h
     wx/panel.h
     wx/pen.h
     wx/palette.h
     wx/panel.h
     wx/pen.h

+    wx/position.h

     wx/radiobox.h
     wx/radiobut.h
     wx/renderer.h
     wx/radiobox.h
     wx/radiobut.h
     wx/renderer.h


@@ -721,9 +822,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/validate.h
     wx/valtext.h
     wx/window.h
     wx/validate.h
     wx/valtext.h
     wx/window.h

+    wx/wupdlock.h

 
     wx/accel.h
     wx/access.h
 
     wx/accel.h
     wx/access.h

+    wx/anidecod.h

     wx/artprov.h
     wx/bitmap.h
     wx/bookctrl.h
     wx/artprov.h
     wx/bitmap.h
     wx/bookctrl.h


@@ -732,6 +835,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/caret.h
     wx/choicebk.h
     wx/clipbrd.h
     wx/caret.h
     wx/choicebk.h
     wx/clipbrd.h

+    wx/clrpicker.h

     wx/cmdproc.h
     wx/colordlg.h
     wx/colour.h
     wx/cmdproc.h
     wx/colordlg.h
     wx/colour.h


@@ -742,12 +846,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/dialup.h
     wx/dirctrl.h
     wx/display.h
     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/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
     wx/fmappriv.h
     wx/font.h
     wx/fontdlg.h


@@ -756,7 +863,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gdiobj.h
     wx/geometry.h
     wx/gifdecod.h
     wx/gdiobj.h
     wx/geometry.h
     wx/gifdecod.h

-    wx/glcanvas.h

     wx/help.h
     wx/helpbase.h
     wx/helpwin.h
     wx/help.h
     wx/helpbase.h
     wx/helpwin.h


@@ -770,6 +876,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/imagpcx.h
     wx/imagpng.h
     wx/imagpnm.h
     wx/imagpcx.h
     wx/imagpng.h
     wx/imagpnm.h

+    wx/imagtga.h

     wx/imagtiff.h
     wx/imagxpm.h
     wx/listbase.h
     wx/imagtiff.h
     wx/imagxpm.h
     wx/listbase.h


@@ -779,9 +886,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/menuitem.h
     wx/metafile.h
     wx/minifram.h
     wx/menuitem.h
     wx/metafile.h
     wx/minifram.h

+    wx/nonownedwnd.h

     wx/notebook.h
     wx/ownerdrw.h
     wx/paper.h
     wx/notebook.h
     wx/ownerdrw.h
     wx/paper.h

+    wx/pickerbase.h

     wx/popupwin.h
     wx/print.h
     wx/printdlg.h
     wx/popupwin.h
     wx/print.h
     wx/printdlg.h


@@ -795,6 +904,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/spinbutt.h
     wx/spinctrl.h
     wx/splitter.h
     wx/spinbutt.h
     wx/spinctrl.h
     wx/splitter.h

+    wx/srchctrl.h

     wx/statline.h
     wx/tab.h
     wx/tabctrl.h
     wx/statline.h
     wx/tab.h
     wx/tabctrl.h


@@ -823,6 +933,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="XWIN_LOWLEVEL_SRC" hints="files">
     src/generic/caret.cpp
 
 <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
     src/unix/dialup.cpp
     src/unix/fontenum.cpp
     src/unix/fontutil.cpp


@@ -831,9 +942,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="XWIN_LOWLEVEL_HDR" hints="files">
     wx/generic/caret.h
 </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/fontutil.h
     wx/unix/utilsx11.h

-    wx/unix/displayx11.h

 </set>
 
 
 </set>
 
 


@@ -843,14 +954,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="GTK_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)
 
 <set var="GTK_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)

+    src/generic/icon.cpp

     src/generic/paletteg.cpp
     src/gtk/app.cpp
     src/generic/paletteg.cpp
     src/gtk/app.cpp

+    src/gtk/assertdlg_gtk.c

     src/gtk/bitmap.cpp
     src/gtk/brush.cpp
     src/gtk/clipbrd.cpp
     src/gtk/colour.cpp
     src/gtk/cursor.cpp
     src/gtk/bitmap.cpp
     src/gtk/brush.cpp
     src/gtk/clipbrd.cpp
     src/gtk/colour.cpp
     src/gtk/cursor.cpp

-    src/gtk/data.cpp

     src/gtk/dataobj.cpp
     src/gtk/dc.cpp
     src/gtk/dcclient.cpp
     src/gtk/dataobj.cpp
     src/gtk/dc.cpp
     src/gtk/dcclient.cpp


@@ -859,10 +971,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/dnd.cpp
     src/gtk/evtloop.cpp
     src/gtk/font.cpp

-    src/gtk/gdiobj.cpp

     src/gtk/gsockgtk.cpp
     src/gtk/gsockgtk.cpp

-    src/gtk/icon.cpp
-    src/gtk/main.cpp

     src/gtk/minifram.cpp
     src/gtk/pen.cpp
     src/gtk/popupwin.cpp
     src/gtk/minifram.cpp
     src/gtk/pen.cpp
     src/gtk/popupwin.cpp


@@ -878,8 +987,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="GTK_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
 </set>
 <set var="GTK_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)

+    wx/generic/icon.h

     wx/generic/paletteg.h
     wx/gtk/app.h
     wx/generic/paletteg.h
     wx/gtk/app.h

+    wx/gtk/assertdlg_gtk.h

     wx/gtk/bitmap.h
     wx/gtk/brush.h
     wx/gtk/clipbrd.h
     wx/gtk/bitmap.h
     wx/gtk/brush.h
     wx/gtk/clipbrd.h


@@ -894,13 +1005,10 @@ 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/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
     wx/gtk/region.h
     wx/gtk/minifram.h
     wx/gtk/pen.h
     wx/gtk/popupwin.h
     wx/gtk/region.h

-    wx/gtk/timer.h

     wx/gtk/tooltip.h
     wx/gtk/toplevel.h
     wx/gtk/win_gtk.h
     wx/gtk/tooltip.h
     wx/gtk/toplevel.h
     wx/gtk/win_gtk.h


@@ -913,7 +1021,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/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
     src/generic/listctrl.cpp
     src/generic/msgdlgg.cpp
     src/generic/prntdlgg.cpp


@@ -928,15 +1036,21 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/checkbox.cpp
     src/gtk/checklst.cpp
     src/gtk/choice.cpp
     src/gtk/checkbox.cpp
     src/gtk/checklst.cpp
     src/gtk/choice.cpp

+    src/gtk/collpane.cpp

     src/gtk/colordlg.cpp
     src/gtk/combobox.cpp
     src/gtk/control.cpp
     src/gtk/colordlg.cpp
     src/gtk/combobox.cpp
     src/gtk/control.cpp

+    src/gtk/clrpicker.cpp

     src/gtk/dialog.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/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
     src/gtk/listbox.cpp
     src/gtk/mdi.cpp
     src/gtk/menu.cpp


@@ -957,7 +1071,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/textctrl.cpp
     src/gtk/tglbtn.cpp
     src/gtk/treeentry_gtk.c
     src/gtk/textctrl.cpp
     src/gtk/tglbtn.cpp
     src/gtk/treeentry_gtk.c

-    src/gtk/utilsres.cpp

 </set>
 <set var="GTK_HDR" hints="files">
     wx/generic/colrdlgg.h
 </set>
 <set var="GTK_HDR" hints="files">
     wx/generic/colrdlgg.h


@@ -971,16 +1084,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/button.h
     wx/gtk/checkbox.h
     wx/gtk/checklst.h
     wx/gtk/button.h
     wx/gtk/checkbox.h
     wx/gtk/checklst.h

+    wx/gtk/chkconf.h
+    wx/gtk/collpane.h

     wx/gtk/colordlg.h
     wx/gtk/choice.h
     wx/gtk/combobox.h
     wx/gtk/control.h
     wx/gtk/colordlg.h
     wx/gtk/choice.h
     wx/gtk/combobox.h
     wx/gtk/control.h

+    wx/gtk/clrpicker.h

     wx/gtk/dialog.h
     wx/gtk/dialog.h

+    wx/gtk/dirdlg.h

     wx/gtk/filedlg.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/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
     wx/gtk/listbox.h
     wx/gtk/mdi.h
     wx/gtk/menu.h


@@ -1012,6 +1132,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="GTK1_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)
 
 <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
     src/generic/paletteg.cpp
     src/gtk1/app.cpp
     src/gtk1/bitmap.cpp


@@ -1028,9 +1149,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/dnd.cpp
     src/gtk1/evtloop.cpp
     src/gtk1/font.cpp

-    src/gtk1/gdiobj.cpp

     src/gtk1/gsockgtk.cpp
     src/gtk1/gsockgtk.cpp

-    src/gtk1/icon.cpp

     src/gtk1/main.cpp
     src/gtk1/minifram.cpp
     src/gtk1/pen.cpp
     src/gtk1/main.cpp
     src/gtk1/minifram.cpp
     src/gtk1/pen.cpp


@@ -1047,6 +1166,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="GTK1_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
 </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
     wx/generic/paletteg.h
     wx/gtk1/app.h
     wx/gtk1/bitmap.h


@@ -1063,13 +1183,10 @@ 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/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
     wx/gtk1/region.h
     wx/gtk1/minifram.h
     wx/gtk1/pen.h
     wx/gtk1/popupwin.h
     wx/gtk1/region.h

-    wx/gtk1/timer.h

     wx/gtk1/tooltip.h
     wx/gtk1/toplevel.h
     wx/gtk1/win_gtk.h
     wx/gtk1/tooltip.h
     wx/gtk1/toplevel.h
     wx/gtk1/win_gtk.h


@@ -1082,7 +1199,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/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
     src/generic/listctrl.cpp
     src/generic/msgdlgg.cpp
     src/generic/prntdlgg.cpp


@@ -1121,7 +1237,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk1/tbargtk.cpp
     src/gtk1/textctrl.cpp
     src/gtk1/tglbtn.cpp
     src/gtk1/tbargtk.cpp
     src/gtk1/textctrl.cpp
     src/gtk1/tglbtn.cpp

-    src/gtk1/utilsres.cpp

 </set>
 <set var="GTK1_HDR" hints="files">
     wx/generic/colrdlgg.h
 </set>
 <set var="GTK1_HDR" hints="files">
     wx/generic/colrdlgg.h


@@ -1213,7 +1328,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/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
     src/motif/gsockmot.cpp
     src/motif/icon.cpp
     src/motif/listbox.cpp


@@ -1246,7 +1360,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/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
     src/generic/listctrl.cpp
     src/generic/notebook.cpp
     src/generic/prntdlgg.cpp


@@ -1259,7 +1372,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/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
     wx/generic/listctrl.h
     wx/generic/notebook.h
     wx/generic/prntdlgg.h


@@ -1294,7 +1406,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/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
     wx/motif/icon.h
     wx/motif/listbox.h
     wx/motif/mdi.h


@@ -1316,7 +1427,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/motif/stattext.h
     wx/motif/textctrl.h
     wx/motif/tglbtn.h
     wx/motif/stattext.h
     wx/motif/textctrl.h
     wx/motif/tglbtn.h

-    wx/motif/timer.h

     wx/motif/toolbar.h
     wx/motif/toplevel.h
     wx/motif/window.h
     wx/motif/toolbar.h
     wx/motif/toplevel.h
     wx/motif/window.h


@@ -1330,6 +1440,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="X11_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)
 
 <set var="X11_LOWLEVEL_SRC" hints="files">
     $(XWIN_LOWLEVEL_SRC)

+    src/common/gsocketiohandler.cpp
+    src/generic/icon.cpp

     src/generic/timer.cpp
     src/x11/app.cpp
     src/x11/bitmap.cpp
     src/generic/timer.cpp
     src/x11/app.cpp
     src/x11/bitmap.cpp


@@ -1345,9 +1457,6 @@ 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/dcscreen.cpp
     src/x11/evtloop.cpp
     src/x11/font.cpp

-    src/x11/gdiobj.cpp
-    src/x11/gsockx11.cpp
-    src/x11/icon.cpp

     src/x11/minifram.cpp
     src/x11/nanox.c
     src/x11/palette.cpp
     src/x11/minifram.cpp
     src/x11/nanox.c
     src/x11/palette.cpp


@@ -1363,9 +1472,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="X11_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
 </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/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
     wx/x11/clipbrd.h
     wx/x11/colour.h
     wx/x11/cursor.h


@@ -1379,8 +1490,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/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
     wx/x11/minifram.h
     wx/x11/palette.h
     wx/x11/pen.h


@@ -1419,14 +1528,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/dib.cpp
     src/msw/display.cpp
     src/msw/enhmeta.cpp
     src/msw/dib.cpp
     src/msw/display.cpp
     src/msw/enhmeta.cpp

-    src/msw/evtloop.cpp

     src/msw/font.cpp
     src/msw/fontenum.cpp
     src/msw/fontutil.cpp
     src/msw/gdiimage.cpp
     src/msw/gdiobj.cpp
     src/msw/font.cpp
     src/msw/fontenum.cpp
     src/msw/fontutil.cpp
     src/msw/gdiimage.cpp
     src/msw/gdiobj.cpp

+    src/msw/gdiplus.cpp
+    src/msw/graphics.cpp

     src/msw/gsockmsw.cpp
     src/msw/icon.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
     src/msw/minifram.cpp
     src/msw/ole/dataobj.cpp
     src/msw/ole/dropsrc.cpp


@@ -1440,7 +1551,6 @@ 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/region.cpp
     src/msw/renderer.cpp
     src/msw/settings.cpp

-    src/msw/timer.cpp

     src/msw/tooltip.cpp
     src/msw/toplevel.cpp
     src/msw/utilsgui.cpp
     src/msw/tooltip.cpp
     src/msw/toplevel.cpp
     src/msw/utilsgui.cpp


@@ -1475,6 +1585,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/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
     src/msw/combobox.cpp
     src/msw/control.cpp
     src/msw/dialog.cpp


@@ -1483,7 +1594,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/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
     src/msw/iniconf.cpp
     src/msw/listbox.cpp
     src/msw/listctrl.cpp


@@ -1514,6 +1624,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/treectrl.cpp
 </set>
 <set var="MSW_HDR" hints="files">
     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
     wx/msw/accel.h
     wx/msw/app.h
     wx/msw/bitmap.h


@@ -1526,6 +1639,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/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
     wx/msw/combobox.h
     wx/msw/control.h
     wx/msw/cursor.h


@@ -1545,7 +1659,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/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
     wx/msw/icon.h
     wx/msw/imaglist.h
     wx/msw/iniconf.h


@@ -1589,7 +1702,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/tbar95.h
     wx/msw/textctrl.h
     wx/msw/tglbtn.h
     wx/msw/tbar95.h
     wx/msw/textctrl.h
     wx/msw/tglbtn.h

-    wx/msw/timer.h

     wx/msw/tooltip.h
     wx/msw/toplevel.h
     wx/msw/treectrl.h
     wx/msw/tooltip.h
     wx/msw/toplevel.h
     wx/msw/treectrl.h


@@ -1640,7 +1752,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/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>
     wx/msw/ole/automtn.h
     wx/msw/ole/uuid.h
 </set>


@@ -1649,6 +1760,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
 <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
     src/generic/fontdlgg.cpp
     src/msw/wince/checklst.cpp
     src/msw/wince/choicece.cpp


@@ -1662,6 +1774,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="WINCE_HDR" hints="files">
     wx/generic/fdrepdlg.h
 </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
     wx/generic/fontdlgg.h
     wx/msw/wince/checklst.h
     wx/msw/wince/choicece.h


@@ -1679,13 +1792,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <set var="MGL_LOWLEVEL_SRC" hints="files">
 <!-- ====================================================================== -->
 
 <set var="MGL_LOWLEVEL_SRC" hints="files">

+    src/common/fontmgrcmn.cpp

     src/generic/caret.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/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
     src/mgl/cursor.cpp
     src/mgl/data.cpp
     src/mgl/dc.cpp


@@ -1693,13 +1810,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mgl/dcmemory.cpp
     src/mgl/dcscreen.cpp
     src/mgl/dirmgl.cpp
     src/mgl/dcmemory.cpp
     src/mgl/dcscreen.cpp
     src/mgl/dirmgl.cpp

-    src/mgl/display.cpp

     src/mgl/evtloop.cpp
     src/mgl/font.cpp
     src/mgl/fontenum.cpp
     src/mgl/evtloop.cpp
     src/mgl/font.cpp
     src/mgl/fontenum.cpp

+    src/mgl/fontmgr.cpp

     src/mgl/fontutil.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
     src/mgl/palette.cpp
     src/mgl/pen.cpp
     src/mgl/region.cpp


@@ -1710,23 +1825,21 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="MGL_LOWLEVEL_HDR" hints="files">
     wx/generic/caret.h
 </set>
 <set var="MGL_LOWLEVEL_HDR" hints="files">
     wx/generic/caret.h

-    wx/generic/timer.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/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
     wx/mgl/dcmemory.h
     wx/mgl/dcscreen.h
     wx/mgl/cursor.h
     wx/mgl/dc.h
     wx/mgl/dcclient.h
     wx/mgl/dcmemory.h
     wx/mgl/dcscreen.h

-    wx/mgl/display.h

     wx/mgl/font.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
     wx/mgl/palette.h
     wx/mgl/pen.h
     wx/mgl/popupwin.h


@@ -1737,11 +1850,77 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 
 </set>
 
 

+<!-- ====================================================================== -->
+<!--                                wxDFB                                   -->
+<!-- ====================================================================== -->
+
+<set var="DFB_LOWLEVEL_SRC" hints="files">
+    src/common/fontmgrcmn.cpp
+    src/common/gsocketiohandler.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/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/fontmgr.cpp
+    src/dfb/nonownedwnd.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/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/nonownedwnd.h
+    wx/dfb/pen.h
+    wx/dfb/popupwin.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">
 <!-- ====================================================================== -->
 <!--                               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>
 </set>
 <set var="OS2_LOWLEVEL_HDR" hints="files">
 </set>


@@ -1754,7 +1933,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/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: -->
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
     <!-- OS/2 specific files: -->


@@ -1780,7 +1958,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/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
     src/os2/dnd.cpp
     src/os2/evtloop.cpp
     src/os2/filedlg.cpp


@@ -1791,7 +1968,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/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
     src/os2/gsockpm.cpp
     src/os2/helpwin.cpp
     src/os2/icon.cpp


@@ -1862,7 +2038,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/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
     wx/os2/dnd.h
     wx/os2/filedlg.h
     wx/os2/font.h


@@ -1870,7 +2045,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/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
     wx/os2/helpwin.h
     wx/os2/icon.h
     wx/os2/iniconf.h


@@ -1902,7 +2076,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/tabctrl.h
     wx/os2/textctrl.h
     wx/os2/tglbtn.h
     wx/os2/tabctrl.h
     wx/os2/textctrl.h
     wx/os2/tglbtn.h

-    wx/os2/timer.h

     wx/os2/toolbar.h
     wx/os2/tooltip.h
     wx/os2/toplevel.h
     wx/os2/toolbar.h
     wx/os2/tooltip.h
     wx/os2/toplevel.h


@@ -1934,8 +2107,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="MAC_OSX_SRC" hints="files">
 <if cond="PLATFORM_MACOSX=='1'">
 
 <set var="MAC_OSX_SRC" hints="files">
 <if cond="PLATFORM_MACOSX=='1'">

-    <!-- Unix files used by wxMac: -->
-    src/unix/snglinst.cpp

     <!-- wxWebKit files -->
     src/html/htmlctrl/webkit/webkit.mm
     <!-- Native color/font dialogs -->
     <!-- wxWebKit files -->
     src/html/htmlctrl/webkit/webkit.mm
     <!-- Native color/font dialogs -->


@@ -1948,6 +2119,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/carbon/accel.cpp
     src/mac/carbon/aga.cpp
     src/mac/carbon/app.cpp
     src/mac/carbon/accel.cpp
     src/mac/carbon/aga.cpp
     src/mac/carbon/app.cpp

+    src/mac/carbon/artmac.cpp

     src/mac/carbon/bitmap.cpp
     src/mac/carbon/bmpbuttn.cpp
     src/mac/carbon/brush.cpp
     src/mac/carbon/bitmap.cpp
     src/mac/carbon/bmpbuttn.cpp
     src/mac/carbon/brush.cpp


@@ -1982,9 +2154,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/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/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
     src/mac/carbon/mdi.cpp
     src/mac/carbon/menu.cpp
     src/mac/carbon/menuitem.cpp


@@ -1992,9 +2166,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/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/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
     src/mac/carbon/printdlg.cpp
     src/mac/carbon/printmac.cpp
     src/mac/carbon/radiobox.cpp


@@ -2006,6 +2180,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/carbon/slider.cpp
     src/mac/carbon/spinbutt.cpp
     src/mac/carbon/spinctrl.cpp
     src/mac/carbon/slider.cpp
     src/mac/carbon/spinbutt.cpp
     src/mac/carbon/spinctrl.cpp

+    src/mac/carbon/srchctrl.cpp

     src/mac/carbon/statbmp.cpp
     src/mac/carbon/statbox.cpp
     src/mac/carbon/statbrma.cpp
     src/mac/carbon/statbmp.cpp
     src/mac/carbon/statbox.cpp
     src/mac/carbon/statbrma.cpp


@@ -2058,7 +2233,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/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
     wx/mac/dnd.h
     wx/mac/evtloop.h
     wx/mac/filedlg.h


@@ -2066,8 +2240,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/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
     wx/mac/icon.h
     wx/mac/gsockmac.h
     wx/mac/helpxxxx.h
     wx/mac/icon.h


@@ -2100,6 +2272,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/sound.h
     wx/mac/spinbutt.h
     wx/mac/spinctrl.h
     wx/mac/sound.h
     wx/mac/spinbutt.h
     wx/mac/spinctrl.h

+    wx/mac/srchctrl.h

     wx/mac/statbmp.h
     wx/mac/statbox.h
     wx/mac/statline.h
     wx/mac/statbmp.h
     wx/mac/statbox.h
     wx/mac/statline.h


@@ -2108,7 +2281,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/tabctrl.h
     wx/mac/taskbarosx.h
     wx/mac/textctrl.h
     wx/mac/tabctrl.h
     wx/mac/taskbarosx.h
     wx/mac/textctrl.h

-    wx/mac/timer.h

     wx/mac/tglbtn.h
     wx/mac/toolbar.h
     wx/mac/tooltip.h
     wx/mac/tglbtn.h
     wx/mac/toolbar.h
     wx/mac/tooltip.h


@@ -2146,7 +2318,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/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
     wx/mac/carbon/dnd.h
     wx/mac/carbon/evtloop.h
     wx/mac/carbon/filedlg.h


@@ -2154,7 +2325,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/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
     wx/mac/carbon/gsockmac.h
     wx/mac/carbon/helpxxxx.h
     wx/mac/carbon/icon.h


@@ -2178,6 +2348,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/carbon/printdlg.h
     wx/mac/carbon/printmac.h
     wx/mac/carbon/private.h
     wx/mac/carbon/printdlg.h
     wx/mac/carbon/printmac.h
     wx/mac/carbon/private.h

+    wx/mac/carbon/private/mactext.h
+    wx/mac/carbon/private/overlay.h
+    wx/mac/carbon/private/print.h

     wx/mac/carbon/radiobox.h
     wx/mac/carbon/radiobut.h
     wx/mac/carbon/region.h
     wx/mac/carbon/radiobox.h
     wx/mac/carbon/radiobut.h
     wx/mac/carbon/region.h


@@ -2185,6 +2358,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/carbon/slider.h
     wx/mac/carbon/spinbutt.h
     wx/mac/carbon/spinctrl.h
     wx/mac/carbon/slider.h
     wx/mac/carbon/spinbutt.h
     wx/mac/carbon/spinctrl.h

+    wx/mac/carbon/srchctrl.h

     wx/mac/carbon/statbmp.h
     wx/mac/carbon/statbox.h
     wx/mac/carbon/statline.h
     wx/mac/carbon/statbmp.h
     wx/mac/carbon/statbox.h
     wx/mac/carbon/statline.h


@@ -2192,7 +2366,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/carbon/statusbr.h
     wx/mac/carbon/tabctrl.h
     wx/mac/carbon/textctrl.h
     wx/mac/carbon/statusbr.h
     wx/mac/carbon/tabctrl.h
     wx/mac/carbon/textctrl.h

-    wx/mac/carbon/timer.h

     wx/mac/carbon/tglbtn.h
     wx/mac/carbon/toolbar.h
     wx/mac/carbon/tooltip.h
     wx/mac/carbon/tglbtn.h
     wx/mac/carbon/toolbar.h
     wx/mac/carbon/tooltip.h


@@ -2258,6 +2431,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/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
     src/cocoa/display.mm
     src/cocoa/drawer.mm
     src/cocoa/evtloop.mm


@@ -2268,7 +2442,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/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
     src/cocoa/icon.mm
     src/cocoa/listbox.mm
     src/cocoa/main.cpp


@@ -2296,14 +2469,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/toolbar.mm
     src/cocoa/tooltip.mm
     src/cocoa/toplevel.mm
     src/cocoa/toolbar.mm
     src/cocoa/tooltip.mm
     src/cocoa/toplevel.mm

-    src/cocoa/utils.cpp
+    src/cocoa/utils.mm

     src/cocoa/utilsexc.mm
     src/cocoa/window.mm
     <!-- Generic implementations used by wxCocoa: -->
     src/generic/accel.cpp
     src/generic/caret.cpp
     src/generic/colrdlgg.cpp
     src/cocoa/utilsexc.mm
     src/cocoa/window.mm
     <!-- Generic implementations used by wxCocoa: -->
     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
     src/generic/fdrepdlg.cpp
     src/generic/fontdlgg.cpp
     src/generic/imaglist.cpp


@@ -2352,14 +2524,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/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/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
     wx/cocoa/icon.h
     wx/cocoa/listbox.h
     wx/cocoa/log.h


@@ -2382,13 +2553,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cocoa/statline.h
     wx/cocoa/stattext.h
     wx/cocoa/textctrl.h
     wx/cocoa/statline.h
     wx/cocoa/stattext.h
     wx/cocoa/textctrl.h

-    wx/cocoa/timer.h

     wx/cocoa/toolbar.h
     wx/cocoa/toolbar.h

+    wx/cocoa/tooltip.h

     wx/cocoa/toplevel.h
     wx/cocoa/window.h
     <!-- Generic implementations used by wxCocoa: -->
     wx/generic/caret.h
     wx/cocoa/toplevel.h
     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
     wx/generic/fdrepdlg.h
     wx/generic/fontdlgg.h
     wx/generic/imaglist.h


@@ -2409,6 +2579,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
 <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>
 
     src/univ/themes/win32.cpp
 </set>
 


@@ -2419,7 +2590,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/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
     src/generic/listctrl.cpp
     src/generic/mdig.cpp
     src/generic/msgdlgg.cpp


@@ -2454,7 +2624,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/statline.cpp
     src/univ/stattext.cpp
     src/univ/statusbr.cpp

+    src/univ/stdrend.cpp

     src/univ/textctrl.cpp
     src/univ/textctrl.cpp

+    src/univ/tglbtn.cpp

     src/univ/theme.cpp
     src/univ/toolbar.cpp
     src/univ/topluniv.cpp
     src/univ/theme.cpp
     src/univ/toolbar.cpp
     src/univ/topluniv.cpp


@@ -2474,6 +2646,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/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
     wx/univ/choice.h
     wx/univ/colschem.h
     wx/univ/combobox.h


@@ -2501,6 +2674,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/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
     wx/univ/textctrl.h
     wx/univ/theme.h
     wx/univ/toolbar.h


@@ -2508,63 +2682,73 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/univ/window.h
 </set>
 
     wx/univ/window.h
 </set>
 

-

 <!-- ====================================================================== -->
 <!--                               wxAdvanced                               -->
 <!-- ====================================================================== -->
 
 <set var="ADVANCED_CMN_SRC" hints="files">
 <!-- ====================================================================== -->
 <!--                               wxAdvanced                               -->
 <!-- ====================================================================== -->
 
 <set var="ADVANCED_CMN_SRC" hints="files">

+    src/common/animatecmn.cpp

     src/common/datavcmn.cpp
     src/common/datavcmn.cpp

+    src/common/hyperlnkcmn.cpp
+    src/generic/aboutdlgg.cpp
+    src/generic/animateg.cpp
+    src/generic/bmpcboxg.cpp

     src/generic/calctrl.cpp
     src/generic/calctrl.cpp

+    src/generic/datavgen.cpp

     src/generic/datectlg.cpp
     src/generic/datectlg.cpp

+    src/generic/editlbox.cpp

     src/generic/grid.cpp
     src/generic/gridctrl.cpp
     src/generic/gridsel.cpp
     src/generic/helpext.cpp
     src/generic/grid.cpp
     src/generic/gridctrl.cpp
     src/generic/gridsel.cpp
     src/generic/helpext.cpp

+    src/generic/hyperlinkg.cpp

     src/generic/laywin.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/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">
 </set>
 
 <set var="ADVANCED_CMN_HDR" hints="files">

+    wx/aboutdlg.h
+    wx/animate.h
+    wx/animdecod.h
+    wx/bmpcbox.h

     wx/calctrl.h
     wx/dataview.h
     wx/dateevt.h
     wx/dcbuffer.h
     wx/calctrl.h
     wx/dataview.h
     wx/dateevt.h
     wx/dcbuffer.h

+    wx/editlbox.h
+    wx/generic/aboutdlgg.h
+    wx/generic/animate.h
+    wx/generic/bmpcbox.h

     wx/generic/calctrl.h
     wx/generic/datectrl.h
     wx/generic/calctrl.h
     wx/generic/datectrl.h

+    wx/generic/dataview.h

     wx/generic/grid.h
     wx/generic/gridctrl.h
     wx/generic/gridsel.h
     wx/generic/helpext.h
     wx/generic/grid.h
     wx/generic/gridctrl.h
     wx/generic/gridsel.h
     wx/generic/helpext.h

+    wx/generic/hyperlink.h

     wx/generic/laywin.h
     wx/generic/propdlg.h
     wx/generic/sashwin.h
     wx/generic/splash.h
     wx/generic/wizard.h
     wx/grid.h
     wx/generic/laywin.h
     wx/generic/propdlg.h
     wx/generic/sashwin.h
     wx/generic/splash.h
     wx/generic/wizard.h
     wx/grid.h

+    wx/hyperlink.h

     wx/joystick.h
     wx/laywin.h
     wx/joystick.h
     wx/laywin.h

+    wx/odcombo.h

     wx/propdlg.h
     wx/sashwin.h
     wx/sound.h
     wx/splash.h
     wx/taskbar.h
     wx/tipdlg.h
     wx/propdlg.h
     wx/sashwin.h
     wx/sound.h
     wx/splash.h
     wx/taskbar.h
     wx/tipdlg.h

-    wx/wave.h

     wx/wizard.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">
 </set>
 
 <set var="ADVANCED_CMN_NATIVE_HDR" hints="files">


@@ -2574,6 +2758,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="ADVANCED_MSW_SRC" hints="files">
     src/common/taskbarcmn.cpp
 
 <set var="ADVANCED_MSW_SRC" hints="files">
     src/common/taskbarcmn.cpp

+    src/msw/aboutdlg.cpp

     src/msw/sound.cpp
     src/msw/taskbar.cpp
 </set>
     src/msw/sound.cpp
     src/msw/taskbar.cpp
 </set>


@@ -2600,6 +2785,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="ADVANCED_MAC_SRC" hints="files">
     src/common/taskbarcmn.cpp
 
 <set var="ADVANCED_MAC_SRC" hints="files">
     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/carbon/drawer.cpp
     src/mac/carbon/sound.cpp
     src/mac/carbon/taskbar.cpp


@@ -2644,11 +2830,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="ADVANCED_GTK_SRC" hints="files">
 </set>
 
 <set var="ADVANCED_GTK_SRC" hints="files">

-    src/gtk/taskbar.cpp
+    src/gtk/aboutdlg.cpp
+    src/gtk/animate.cpp

     src/gtk/dataview.cpp
     src/gtk/dataview.cpp

+    src/gtk/hyperlink.cpp
+    src/gtk/taskbar.cpp

     src/gtk/eggtrayicon.c
 </set>
     src/gtk/eggtrayicon.c
 </set>

+<set var="ADVANCED_GTK_HDR" hints="files">
+    wx/gtk/animate.h
+    wx/gtk/hyperlink.h
+</set>
+

 <set var="ADVANCED_GTK1_SRC" hints="files">
 <set var="ADVANCED_GTK1_SRC" hints="files">

+    src/gtk1/eggtrayicon.c
+    src/gtk1/taskbar.cpp
+</set>
+<set var="ADVANCED_GTK1_HDR" hints="files">

 </set>
 
 <!-- ====================================================================== -->
 </set>
 
 <!-- ====================================================================== -->


@@ -2666,6 +2864,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="MEDIA_MSW_SRC" hints="files">
     src/msw/mediactrl_am.cpp
     src/msw/mediactrl_wmp10.cpp
 <set var="MEDIA_MSW_SRC" hints="files">
     src/msw/mediactrl_am.cpp
     src/msw/mediactrl_wmp10.cpp

+    src/msw/mediactrl_qt.cpp

     src/msw/ole/activex.cpp
 </set>
 <set var="MEDIA_MSW_HDR" hints="files">
     src/msw/ole/activex.cpp
 </set>
 <set var="MEDIA_MSW_HDR" hints="files">


@@ -2748,6 +2947,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <!-- wxHTML users: -->
     src/generic/htmllbox.cpp
 </set>
     <!-- wxHTML users: -->
     src/generic/htmllbox.cpp
 </set>

+<set var="MSW_HTML_HDR" hints="files">
+    <if cond="TOOLKIT=='MSW'">wx/msw/helpbest.h</if>
+</set>

 <set var="HTML_HDR" hints="files">
     wx/html/helpctrl.h
     wx/html/helpdata.h
 <set var="HTML_HDR" hints="files">
     wx/html/helpctrl.h
     wx/html/helpdata.h


@@ -2767,6 +2969,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/wxhtml.h
     <!-- wxHTML users: -->
     wx/htmllbox.h
     wx/wxhtml.h
     <!-- wxHTML users: -->
     wx/htmllbox.h

+    $(MSW_HTML_HDR)

 </set>
 
 
 </set>
 
 


@@ -2776,33 +2979,45 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <set var="XRC_SRC" hints="files">
 <!-- ====================================================================== -->
 
 <set var="XRC_SRC" hints="files">

-    src/xrc/xh_bmpbt.cpp
+    src/xrc/xh_animatctrl.cpp

     src/xrc/xh_bmp.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_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_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_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_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_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_panel.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_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
     src/xrc/xh_sizer.cpp
     src/xrc/xh_slidr.cpp
     src/xrc/xh_spin.cpp


@@ -2824,33 +3039,44 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="XRC_HDR" hints="files">
     wx/xrc/xh_all.h
 </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_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_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_combo.h
     wx/xrc/xh_datectrl.h

+    wx/xrc/xh_dirpicker.h

     wx/xrc/xh_dlg.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_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_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_panel.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_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
     wx/xrc/xh_sizer.h
     wx/xrc/xh_slidr.h
     wx/xrc/xh_spin.h


@@ -2891,30 +3117,51 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!--                             OpenGL canvas                              -->
 <!-- ====================================================================== -->
 
 <!--                             OpenGL canvas                              -->
 <!-- ====================================================================== -->
 

-<set var="OPENGL_SRC" hints="files">
+<set var="OPENGL_SRC_PLATFORM" hints="files">
+    src/common/glcmn.cpp

     <if cond="TOOLKIT=='MAC'">src/mac/carbon/glcanvas.cpp</if>
     <if cond="TOOLKIT=='COCOA'">src/cocoa/glcanvas.mm</if>
     <if cond="TOOLKIT=='MAC'">src/mac/carbon/glcanvas.cpp</if>
     <if cond="TOOLKIT=='COCOA'">src/cocoa/glcanvas.mm</if>

-    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">src/gtk/glcanvas.cpp</if>
-    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">src/gtk1/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
+        src/gtk/glcanvas.cpp
+        src/unix/glx11.cpp
+    </if>
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">
+        src/gtk1/glcanvas.cpp
+        src/unix/glx11.cpp
+    </if>

     <if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>
     <if cond="TOOLKIT=='WINCE'">src/msw/glcanvas.cpp</if>
     <if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>
     <if cond="TOOLKIT=='WINCE'">src/msw/glcanvas.cpp</if>

-    <if cond="TOOLKIT=='MOTIF'">src/x11/glcanvas.cpp</if>
-    <if cond="TOOLKIT=='X11'">src/x11/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='MOTIF'">src/x11/glcanvas.cpp src/unix/glx11.cpp</if>
+    <if cond="TOOLKIT=='X11'">src/x11/glcanvas.cpp src/unix/glx11.cpp</if>

     <if cond="TOOLKIT=='PM'">src/os2/glcanvas.cpp</if>
 </set>
 
     <if cond="TOOLKIT=='PM'">src/os2/glcanvas.cpp</if>
 </set>
 

-<set var="OPENGL_HDR" hints="files">
-    <if cond="TOOLKIT=='MAC'">wx/mac/carbon/glcanvas.h</if>
+<set var="OPENGL_SRC" hints="files">
+    src/common/glcmn.cpp
+    $(OPENGL_SRC_PLATFORM)
+</set>
+
+<set var="OPENGL_HDR_PLATFORM" hints="files">
+    <if cond="TOOLKIT=='MAC'">wx/mac/glcanvas.h wx/mac/carbon/glcanvas.h</if>

     <if cond="TOOLKIT=='COCOA'">wx/cocoa/glcanvas.h</if>
     <if cond="TOOLKIT=='COCOA'">wx/cocoa/glcanvas.h</if>

-    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">wx/gtk/glcanvas.h</if>
-    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">wx/gtk1/glcanvas.h</if>
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
+        wx/gtk/glcanvas.h
+        wx/unix/glx11.h
+    </if>
+    <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">
+        wx/gtk1/glcanvas.h
+        wx/unix/glx11.h
+    </if>

     <if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
     <if cond="TOOLKIT=='WINCE'">wx/msw/glcanvas.h</if>
     <if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
     <if cond="TOOLKIT=='WINCE'">wx/msw/glcanvas.h</if>

-    <if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h</if>
-    <if cond="TOOLKIT=='X11'">wx/x11/glcanvas.h</if>
-    <if cond="TOOLKIT=='PM'">wx/os2/glcanvas.h</if>
+    <if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h wx/unix/glx11.h</if>
+    <if cond="TOOLKIT=='X11'">wx/x11/glcanvas.h wx/unix/glx11.h</if>

 </set>
 
 </set>
 

+<set var="OPENGL_HDR" hints="files">
+    wx/glcanvas.h
+    $(OPENGL_HDR_PLATFORM)
+</set>

 
 
 <!-- ====================================================================== -->
 
 
 <!-- ====================================================================== -->


@@ -2947,6 +3194,68 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/unix/sound_sdl.cpp
 </set>
 
     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/richtexthtml.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>
+
+
+<!-- ====================================================================== -->
+<!--                                wxSTC                                   -->
+<!-- ====================================================================== -->
+
+<set var="STC_SRC" hints="files">
+    src/stc/stc.cpp
+    src/stc/PlatWX.cpp
+    src/stc/ScintillaWX.cpp
+</set>
+
+<set var="STC_HDR" hints="files">
+    wx/stc/stc.h
+</set>
+

 <!-- ====================================================================== -->
 <!--                    Define sources for specific libraries:              -->
 <!-- ====================================================================== -->
 <!-- ====================================================================== -->
 <!--                    Define sources for specific libraries:              -->
 <!-- ====================================================================== -->


@@ -3009,6 +3318,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_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">
     </set>
 
     <set var="BASE_SRC" hints="files">


@@ -3054,6 +3364,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=='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>
     </set>
     <set var="LOWLEVEL_HDR" hints="files">
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_LOWLEVEL_HDR)</if>


@@ -3066,6 +3377,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=='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">
     </set>
 
     <set var="GUI_SRC" hints="files">


@@ -3108,6 +3420,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <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=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK1_SRC)</if>
         <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>

+        <if cond="TOOLKIT=='MGL' and PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_SRC)</if>

         <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
     </set>
     <set var="ADVANCED_PLATFORM_HDR" hints="files">
         <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
     </set>
     <set var="ADVANCED_PLATFORM_HDR" hints="files">


@@ -3116,8 +3429,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <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=='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=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK_HDR)</if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK1_HDR)</if>

         <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
         <if cond="TOOLKIT=='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>
 
         <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_HDR)</if>
     </set>
 


@@ -3176,7 +3491,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
             $(LOWLEVEL_HDR)
             $(GUI_CORE_HEADERS)
             $(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
             $(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)
+            $(STC_HDR)

         </if>
     </set>
 
         </if>
     </set>