shutdown sockets gracefully instead of doing it with TCP reset (patch 1682438)

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

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 2e1a14d6d71830e36281046aa4762aa40358adf6..2e4248bcafb8538a464ab285819c1b498cc8e5f0 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -199,6 +199,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     $(BASE_MAC_SRC)
     src/unix/baseunix.cpp
     src/unix/dlunix.cpp
     $(BASE_MAC_SRC)
     src/unix/baseunix.cpp
     src/unix/dlunix.cpp

+    src/unix/snglinst.cpp

     src/unix/stdpaths.cpp
 </set>
 <set var="BASE_MACOSX_WXMAC_HDR" hints="files">
     src/unix/stdpaths.cpp
 </set>
 <set var="BASE_MACOSX_WXMAC_HDR" hints="files">


@@ -289,6 +290,8 @@ 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/clntdata.cpp
     src/common/cmdline.cpp
     src/common/archive.cpp
     src/common/clntdata.cpp
     src/common/cmdline.cpp


@@ -304,12 +307,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/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


@@ -334,6 +341,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/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
     src/common/textbuf.cpp
     src/common/textfile.cpp
     src/common/tokenzr.cpp


@@ -370,6 +378,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/config.h
     wx/convauto.h
     wx/containr.h
     wx/config.h
     wx/convauto.h
     wx/containr.h

+    wx/cpp.h

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


@@ -392,6 +401,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


@@ -440,6 +451,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/stream.h
     wx/string.h
     wx/sysopt.h
     wx/stream.h
     wx/string.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


@@ -550,6 +562,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="GUI_CMN_SRC" hints="files">
     src/common/accesscmn.cpp
 
 <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
     src/common/appcmn.cpp
     src/common/artprov.cpp
     src/common/artstd.cpp


@@ -568,6 +581,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/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
     src/common/dlgcmn.cpp
     src/common/dndcmn.cpp
     src/common/dobjcmn.cpp


@@ -584,12 +599,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/fontcmn.cpp
     src/common/fontenumcmn.cpp
     src/common/fontmap.cpp
     src/common/fontcmn.cpp
     src/common/fontenumcmn.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


@@ -602,13 +619,16 @@ 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/pickerbase.cpp
     src/common/popupcmn.cpp
     src/common/paper.cpp
     src/common/pickerbase.cpp
     src/common/popupcmn.cpp


@@ -619,6 +639,7 @@ 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/stockitem.cpp
     src/common/tbarbase.cpp
     src/common/statbar.cpp
     src/common/stockitem.cpp
     src/common/tbarbase.cpp


@@ -636,6 +657,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/choicdgg.cpp
     src/generic/choicbkg.cpp
     src/generic/clrpickerg.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/combog.cpp
     src/generic/dcpsg.cpp
     src/generic/dirctrlg.cpp


@@ -653,6 +675,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


@@ -670,6 +693,7 @@ 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/combo.h
     wx/combobox.h
     wx/control.h


@@ -677,6 +701,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cursor.h
     wx/dc.h
     wx/dcclient.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


@@ -693,6 +718,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/buttonbar.h
     wx/generic/choicdgg.h
     wx/generic/clrpickerg.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/colrdlgg.h
     wx/generic/combo.h
     wx/generic/dcpsg.h


@@ -702,7 +728,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/filepickerg.h
     wx/generic/fontdlgg.h
     wx/generic/fontpickerg.h
     wx/generic/filepickerg.h
     wx/generic/fontdlgg.h
     wx/generic/fontpickerg.h

-    wx/generic/imaglist.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


@@ -714,9 +739,11 @@ 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/timer.h
     wx/generic/treectlg.h
     wx/generic/textdlgg.h
     wx/generic/timer.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


@@ -725,6 +752,7 @@ 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


@@ -752,6 +780,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
     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


@@ -802,6 +831,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


@@ -811,6 +841,7 @@ 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


@@ -828,6 +859,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


@@ -856,6 +888,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


@@ -864,6 +897,7 @@ 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
 </set>
     wx/unix/fontutil.h
     wx/unix/utilsx11.h
 </set>


@@ -878,6 +912,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/icon.cpp
     src/generic/paletteg.cpp
     src/gtk/app.cpp
     src/generic/icon.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/bitmap.cpp
     src/gtk/brush.cpp
     src/gtk/clipbrd.cpp


@@ -892,9 +927,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/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


@@ -913,6 +946,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/icon.h
     wx/generic/paletteg.h
     wx/gtk/app.h
     wx/generic/icon.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


@@ -944,7 +978,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


@@ -959,6 +993,7 @@ 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


@@ -1007,6 +1042,7 @@ 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/collpane.h

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


@@ -1070,7 +1106,6 @@ 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/main.cpp
     src/gtk1/minifram.cpp
     src/gtk1/gsockgtk.cpp
     src/gtk1/main.cpp
     src/gtk1/minifram.cpp


@@ -1122,7 +1157,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


@@ -1253,7 +1287,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


@@ -1286,7 +1319,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


@@ -1299,7 +1331,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


@@ -1369,6 +1400,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/common/selectdispatcher.cpp

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


@@ -1385,8 +1418,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/minifram.cpp
     src/x11/nanox.c
     src/x11/palette.cpp
     src/x11/minifram.cpp
     src/x11/nanox.c
     src/x11/palette.cpp


@@ -1464,8 +1495,11 @@ 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/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


@@ -1523,7 +1557,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


@@ -1723,9 +1756,12 @@ 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/colour.cpp
     src/generic/icon.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/generic/timer.cpp
     src/mgl/app.cpp
     src/mgl/bitmap.cpp


@@ -1741,8 +1777,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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/palette.cpp
     src/mgl/pen.cpp
     src/mgl/region.cpp
     src/mgl/palette.cpp
     src/mgl/pen.cpp
     src/mgl/region.cpp


@@ -1755,6 +1791,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/caret.h
     wx/generic/colour.h
     wx/generic/icon.h
     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/generic/timer.h
     wx/mgl/app.h
     wx/mgl/bitmap.h


@@ -1767,7 +1805,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mgl/dcmemory.h
     wx/mgl/dcscreen.h
     wx/mgl/font.h
     wx/mgl/dcmemory.h
     wx/mgl/dcscreen.h
     wx/mgl/font.h

-    wx/mgl/fontutil.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


@@ -1778,11 +1815,79 @@ 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/common/selectdispatcher.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/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/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>


@@ -1830,7 +1935,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


@@ -1971,8 +2075,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 -->


@@ -2019,9 +2121,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


@@ -2029,6 +2133,7 @@ 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/printdlg.cpp
     src/mac/carbon/palette.cpp
     src/mac/carbon/pen.cpp
     src/mac/carbon/printdlg.cpp


@@ -2042,6 +2147,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


@@ -2134,6 +2240,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


@@ -2210,6 +2317,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


@@ -2217,6 +2327,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


@@ -2301,7 +2412,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


@@ -2439,6 +2549,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>
 


@@ -2449,7 +2560,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


@@ -2484,6 +2594,7 @@ 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/tglbtn.cpp
     src/univ/theme.cpp
     src/univ/textctrl.cpp
     src/univ/tglbtn.cpp
     src/univ/theme.cpp


@@ -2505,6 +2616,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


@@ -2532,6 +2644,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


@@ -2539,13 +2652,17 @@ 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/datavgen.cpp
     src/generic/datectlg.cpp
     src/generic/calctrl.cpp
     src/generic/datavgen.cpp
     src/generic/datectlg.cpp


@@ -2553,7 +2670,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/gridctrl.cpp
     src/generic/gridsel.cpp
     src/generic/helpext.cpp
     src/generic/gridctrl.cpp
     src/generic/gridsel.cpp
     src/generic/helpext.cpp

-    src/generic/hyperlink.cpp
+    src/generic/hyperlinkg.cpp

     src/generic/laywin.cpp
     src/generic/odcombo.cpp
     src/generic/propdlg.cpp
     src/generic/laywin.cpp
     src/generic/odcombo.cpp
     src/generic/propdlg.cpp


@@ -2564,10 +2681,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="ADVANCED_CMN_HDR" hints="files">
 </set>
 
 <set var="ADVANCED_CMN_HDR" hints="files">

+    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/aboutdlg.h
+    wx/generic/aboutdlgg.h
+    wx/generic/animate.h
+    wx/generic/bmpcbox.h

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


@@ -2575,6 +2699,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/gridctrl.h
     wx/generic/gridsel.h
     wx/generic/helpext.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/laywin.h
     wx/generic/propdlg.h
     wx/generic/sashwin.h


@@ -2591,7 +2716,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/splash.h
     wx/taskbar.h
     wx/tipdlg.h
     wx/splash.h
     wx/taskbar.h
     wx/tipdlg.h

-    wx/wave.h

     wx/wizard.h
 </set>
 
     wx/wizard.h
 </set>
 


@@ -2602,6 +2726,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>


@@ -2628,6 +2753,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


@@ -2672,11 +2798,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>
 
 <!-- ====================================================================== -->


@@ -2694,6 +2832,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">


@@ -2776,6 +2915,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


@@ -2795,7 +2937,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

-    wx/msw/helpbest.h
+    $(MSW_HTML_HDR)

 </set>
 
 
 </set>
 
 


@@ -2805,8 +2947,10 @@ 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_bttn.cpp
     src/xrc/xh_cald.cpp
     src/xrc/xh_chckb.cpp


@@ -2814,6 +2958,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/xrc/xh_choic.cpp
     src/xrc/xh_choicbk.cpp
     src/xrc/xh_clrpicker.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_combo.cpp
     src/xrc/xh_datectrl.cpp
     src/xrc/xh_dirpicker.cpp


@@ -2836,8 +2981,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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


@@ -2859,8 +3007,10 @@ 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_bttn.h
     wx/xrc/xh_cald.h
     wx/xrc/xh_chckb.h


@@ -2868,6 +3018,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/xrc/xh_choic.h
     wx/xrc/xh_choicbk.h
     wx/xrc/xh_clrpicker.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_combo.h
     wx/xrc/xh_datectrl.h
     wx/xrc/xh_dirpicker.h


@@ -2890,8 +3041,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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


@@ -3018,12 +3171,21 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/richtext/richtextstyles.cpp
     src/richtext/richtextxml.cpp
     src/richtext/richtexthtml.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
 </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/richtextstyles.h
     wx/richtext/richtextxml.h

+    wx/richtext/richtextformatdlg.h
+    wx/richtext/richtextsymboldlg.h
+    wx/richtext/richtextstyledlg.h
+    wx/richtext/richtextprint.h

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


@@ -3134,6 +3296,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>


@@ -3146,6 +3309,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">


@@ -3188,6 +3352,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">


@@ -3196,8 +3361,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>