enabling clip

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

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index b0f9e23262bd51b929d4156d23179b1c31a19455..cde7bbdadc5faf154771094ce8452c44695716f1 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -54,22 +54,33 @@ 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/private/fdiodispatcher.h
+    wx/private/selectdispatcher.h
+    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


@@ -95,10 +106,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/stackwalk.cpp
     src/msw/stdpaths.cpp
     src/msw/thread.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


@@ -143,12 +156,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) -->


@@ -197,14 +212,26 @@ 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/private/fdiodispatcher.h
+    wx/private/selectdispatcher.h
+    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/pipe.h

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


@@ -289,7 +316,11 @@ 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


@@ -301,6 +332,7 @@ 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


@@ -309,8 +341,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/filefn.cpp
     src/common/filename.cpp
     src/common/filesys.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,15 +369,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


@@ -361,9 +404,12 @@ 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/chkconf.h
     wx/clntdata.h
     wx/cmdline.h


@@ -372,6 +418,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/convauto.h
     wx/containr.h
     wx/cpp.h
     wx/convauto.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


@@ -386,15 +433,17 @@ 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/ffile.h
     wx/file.h

-    wx/fileback.h

     wx/fileconf.h
     wx/filefn.h
     wx/filename.h
     wx/filesys.h
     wx/fontenc.h
     wx/fontmap.h
     wx/fileconf.h
     wx/filefn.h
     wx/filename.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


@@ -408,8 +457,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/ioswrap.h
     wx/ipc.h
     wx/ipcbase.h
     wx/ioswrap.h
     wx/ipc.h
     wx/ipcbase.h

-    wx/isql.h
-    wx/isqlext.h

     wx/link.h
     wx/list.h
     wx/listimpl.cpp
     wx/link.h
     wx/list.h
     wx/listimpl.cpp


@@ -442,7 +489,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


@@ -451,6 +502,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


@@ -460,6 +512,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


@@ -552,6 +607,7 @@ 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/anidecod.cpp
     src/common/appcmn.cpp
     src/common/accesscmn.cpp
     src/common/anidecod.cpp
     src/common/appcmn.cpp


@@ -559,6 +615,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/artstd.cpp
     src/common/bmpbase.cpp
     src/common/bookctrl.cpp
     src/common/artstd.cpp
     src/common/bmpbase.cpp
     src/common/bookctrl.cpp

+    src/common/btncmn.cpp
+    src/common/cairo.cpp

     src/common/choiccmn.cpp
     src/common/clipcmn.cpp
     src/common/clrpickercmn.cpp
     src/common/choiccmn.cpp
     src/common/clipcmn.cpp
     src/common/clrpickercmn.cpp


@@ -573,6 +631,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/datacmn.cpp
     src/common/dcbase.cpp
     src/common/dcbufcmn.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


@@ -581,14 +641,15 @@ 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/filectrlcmn.cpp

     src/common/filepickercmn.cpp
     src/common/fontpickercmn.cpp
     src/common/fldlgcmn.cpp
     src/common/fontcmn.cpp
     src/common/fontenumcmn.cpp
     src/common/fontmap.cpp
     src/common/filepickercmn.cpp
     src/common/fontpickercmn.cpp
     src/common/fldlgcmn.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/framecmn.cpp
     src/common/gaugecmn.cpp
     src/common/gbsizer.cpp


@@ -608,6 +669,7 @@ 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/imagtiff.cpp
     src/common/imagxpm.cpp
     src/common/layout.cpp


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


@@ -626,11 +689,13 @@ 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/textentrycmn.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


@@ -642,13 +707,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/buttonbar.cpp
     src/generic/choicdgg.cpp
     src/generic/choicbkg.cpp
     src/generic/buttonbar.cpp
     src/generic/choicdgg.cpp
     src/generic/choicbkg.cpp

-    src/generic/clrpickerg.cpp

     src/generic/combog.cpp
     src/generic/dcpsg.cpp
     src/generic/dirctrlg.cpp
     src/generic/dragimgg.cpp
     src/generic/combog.cpp
     src/generic/dcpsg.cpp
     src/generic/dirctrlg.cpp
     src/generic/dragimgg.cpp

-    src/generic/filepickerg.cpp
-    src/generic/fontpickerg.cpp
+    src/generic/filectrlg.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


@@ -660,6 +723,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


@@ -672,11 +736,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/bmpbuttn.h
     wx/brush.h
     wx/button.h
     wx/bmpbuttn.h
     wx/brush.h
     wx/button.h

+    wx/cairo.h

     wx/checkbox.h
     wx/checklst.h
     wx/choicdlg.h
     wx/choice.h
     wx/cmndata.h
     wx/checkbox.h
     wx/checklst.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


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


@@ -700,17 +767,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/accel.h
     wx/generic/buttonbar.h
     wx/generic/choicdgg.h
     wx/generic/accel.h
     wx/generic/buttonbar.h
     wx/generic/choicdgg.h

-    wx/generic/clrpickerg.h
-    wx/generic/colpaneg.h

     wx/generic/colrdlgg.h
     wx/generic/combo.h
     wx/generic/dcpsg.h
     wx/generic/dirctrlg.h
     wx/generic/dragimgg.h
     wx/generic/colrdlgg.h
     wx/generic/combo.h
     wx/generic/dcpsg.h
     wx/generic/dirctrlg.h
     wx/generic/dragimgg.h

-    wx/generic/filedlgg.h
-    wx/generic/filepickerg.h
-    wx/generic/fontdlgg.h
-    wx/generic/fontpickerg.h
+    wx/generic/filectrlg.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


@@ -722,8 +784,8 @@ 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/graphics.h
     wx/helphtml.h
     wx/generic/treectlg.h
     wx/graphics.h
     wx/helphtml.h


@@ -734,9 +796,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


@@ -753,6 +817,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/statusbr.h
     wx/textctrl.h
     wx/textdlg.h
     wx/statusbr.h
     wx/textctrl.h
     wx/textdlg.h

+    wx/textentry.h

     wx/toolbar.h
     wx/validate.h
     wx/valtext.h
     wx/toolbar.h
     wx/validate.h
     wx/valtext.h


@@ -788,6 +853,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/effects.h
     wx/evtloop.h
     wx/fdrepdlg.h
     wx/effects.h
     wx/evtloop.h
     wx/fdrepdlg.h

+    wx/filectrl.h

     wx/filepicker.h
     wx/fontpicker.h
     wx/fmappriv.h
     wx/filepicker.h
     wx/fontpicker.h
     wx/fmappriv.h


@@ -798,7 +864,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


@@ -812,6 +877,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


@@ -821,6 +887,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


@@ -838,6 +905,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


@@ -890,12 +958,12 @@ 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/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


@@ -903,9 +971,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/dcscreen.cpp
     src/gtk/dnd.cpp
     src/gtk/evtloop.cpp
     src/gtk/dcscreen.cpp
     src/gtk/dnd.cpp
     src/gtk/evtloop.cpp

+    src/gtk/filectrl.cpp

     src/gtk/font.cpp
     src/gtk/gsockgtk.cpp
     src/gtk/font.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


@@ -916,7 +984,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/tooltip.cpp
     src/gtk/toplevel.cpp
     src/gtk/utilsgtk.cpp
     src/gtk/tooltip.cpp
     src/gtk/toplevel.cpp
     src/gtk/utilsgtk.cpp

-    src/gtk/win_gtk.c
+    src/gtk/win_gtk.cpp

     src/gtk/window.cpp
 </set>
 <set var="GTK_LOWLEVEL_HDR" hints="files">
     src/gtk/window.cpp
 </set>
 <set var="GTK_LOWLEVEL_HDR" hints="files">


@@ -924,6 +992,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


@@ -942,7 +1011,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/pen.h
     wx/gtk/popupwin.h
     wx/gtk/region.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


@@ -951,18 +1019,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="GTK_SRC" hints="files">
     <!-- Generic implementations used by wxGTK: -->
     src/generic/accel.cpp
 <set var="GTK_SRC" hints="files">
     <!-- Generic implementations used by wxGTK: -->
     src/generic/accel.cpp

-    src/generic/colrdlgg.cpp
-    src/generic/dirdlgg.cpp

     src/generic/fdrepdlg.cpp
     src/generic/fdrepdlg.cpp

-    src/generic/filedlgg.cpp
+    <!-- Needed as long as we support GTK+ < 2.6 -->
+    src/generic/filepickerg.cpp

     src/generic/graphicc.cpp
     src/generic/listctrl.cpp
     src/generic/graphicc.cpp
     src/generic/listctrl.cpp

-    src/generic/msgdlgg.cpp

     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
     src/generic/tabg.cpp
     <!-- Generic implementations used by wxGPE: -->
     src/generic/fontdlgg.cpp
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
     src/generic/tabg.cpp
     <!-- Generic implementations used by wxGPE: -->
     src/generic/fontdlgg.cpp

+    src/generic/msgdlgg.cpp

     <!-- GTK+ specific files: -->
     src/gtk/artgtk.cpp
     src/gtk/bmpbuttn.cpp
     <!-- GTK+ specific files: -->
     src/gtk/artgtk.cpp
     src/gtk/bmpbuttn.cpp


@@ -970,6 +1037,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


@@ -984,6 +1052,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/gauge.cpp
     src/gtk/gnome/gprint.cpp
     src/gtk/gnome/gvfs.cpp
     src/gtk/gauge.cpp
     src/gtk/gnome/gprint.cpp
     src/gtk/gnome/gvfs.cpp

+    src/gtk/print.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


@@ -1002,14 +1071,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/stattext.cpp
     src/gtk/tbargtk.cpp
     src/gtk/textctrl.cpp
     src/gtk/stattext.cpp
     src/gtk/tbargtk.cpp
     src/gtk/textctrl.cpp

+    src/gtk/textentry.cpp

     src/gtk/tglbtn.cpp
     src/gtk/treeentry_gtk.c
     src/gtk/tglbtn.cpp
     src/gtk/treeentry_gtk.c

-    src/gtk/utilsres.cpp

 </set>
 <set var="GTK_HDR" hints="files">
 </set>
 <set var="GTK_HDR" hints="files">

-    wx/generic/colrdlgg.h
-    wx/generic/dirdlgg.h

     wx/generic/fdrepdlg.h
     wx/generic/fdrepdlg.h

+    wx/generic/filepickerg.h
+    wx/generic/fontdlgg.h

     wx/generic/listctrl.h
     wx/generic/statusbr.h
     wx/generic/tabg.h
     wx/generic/listctrl.h
     wx/generic/statusbr.h
     wx/generic/tabg.h


@@ -1018,6 +1087,8 @@ 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/colordlg.h
     wx/gtk/choice.h
     wx/gtk/combobox.h


@@ -1025,6 +1096,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/clrpicker.h
     wx/gtk/dialog.h
     wx/gtk/dirdlg.h
     wx/gtk/clrpicker.h
     wx/gtk/dialog.h
     wx/gtk/dirdlg.h

+    wx/gtk/filectrl.h

     wx/gtk/filedlg.h
     wx/gtk/fontpicker.h
     wx/gtk/filepicker.h
     wx/gtk/filedlg.h
     wx/gtk/fontpicker.h
     wx/gtk/filepicker.h


@@ -1033,6 +1105,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/gauge.h
     wx/gtk/gnome/gprint.h
     wx/gtk/gnome/gvfs.h
     wx/gtk/gauge.h
     wx/gtk/gnome/gprint.h
     wx/gtk/gnome/gvfs.h

+    wx/gtk/print.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


@@ -1052,6 +1125,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/stattext.h
     wx/gtk/tbargtk.h
     wx/gtk/textctrl.h
     wx/gtk/stattext.h
     wx/gtk/tbargtk.h
     wx/gtk/textctrl.h

+    wx/gtk/textentry.h

     wx/gtk/tglbtn.h
     wx/gtk/treectrl.h
     wx/gtk/treeentry_gtk.h
     wx/gtk/tglbtn.h
     wx/gtk/treectrl.h
     wx/gtk/treeentry_gtk.h


@@ -1119,7 +1193,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk1/pen.h
     wx/gtk1/popupwin.h
     wx/gtk1/region.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


@@ -1128,17 +1201,20 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="GTK1_SRC" hints="files">
     <!-- Generic implementations used by wxGTK1: -->
     src/generic/accel.cpp
 <set var="GTK1_SRC" hints="files">
     <!-- Generic implementations used by wxGTK1: -->
     src/generic/accel.cpp

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

     src/generic/colrdlgg.cpp
     src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp
     src/generic/filedlgg.cpp
     src/generic/colrdlgg.cpp
     src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp
     src/generic/filedlgg.cpp

+    src/generic/filepickerg.cpp
+    src/generic/fontdlgg.cpp
+    src/generic/fontpickerg.cpp

     src/generic/listctrl.cpp
     src/generic/msgdlgg.cpp
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
     src/generic/tabg.cpp
     src/generic/listctrl.cpp
     src/generic/msgdlgg.cpp
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
     src/generic/tabg.cpp

-    <!-- Generic implementations used by wxGPE: -->
-    src/generic/fontdlgg.cpp

     <!-- GTK1 specific files: -->
     src/gtk1/bmpbuttn.cpp
     src/gtk1/button.cpp
     <!-- GTK1 specific files: -->
     src/gtk1/bmpbuttn.cpp
     src/gtk1/button.cpp


@@ -1170,12 +1246,17 @@ 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">
 </set>
 <set var="GTK1_HDR" hints="files">

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

     wx/generic/colrdlgg.h
     wx/generic/dirdlgg.h
     wx/generic/fdrepdlg.h
     wx/generic/colrdlgg.h
     wx/generic/dirdlgg.h
     wx/generic/fdrepdlg.h

+    wx/generic/filedlgg.h
+    wx/generic/filepickerg.h
+    wx/generic/fontdlgg.h
+    wx/generic/fontpickerg.h

     wx/generic/listctrl.h
     wx/generic/statusbr.h
     wx/generic/tabg.h
     wx/generic/listctrl.h
     wx/generic/statusbr.h
     wx/generic/tabg.h


@@ -1283,6 +1364,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/motif/statbox.cpp
     src/motif/stattext.cpp
     src/motif/textctrl.cpp
     src/motif/statbox.cpp
     src/motif/stattext.cpp
     src/motif/textctrl.cpp

+    src/motif/textentry.cpp

     src/motif/timer.cpp
     src/motif/toolbar.cpp
     src/motif/toplevel.cpp
     src/motif/timer.cpp
     src/motif/toolbar.cpp
     src/motif/toplevel.cpp


@@ -1290,10 +1372,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/motif/window.cpp
     src/motif/xmcombo/xmcombo.c
     <!-- Generic files used by wxMotif: -->
     src/motif/window.cpp
     src/motif/xmcombo/xmcombo.c
     <!-- Generic files used by wxMotif: -->

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

     src/generic/colrdlgg.cpp
     src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp
     src/generic/colrdlgg.cpp
     src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp

+    src/generic/filepickerg.cpp

     src/generic/fontdlgg.cpp
     src/generic/fontdlgg.cpp

+    src/generic/fontpickerg.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


@@ -1302,10 +1388,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/tabg.cpp
 </set>
 <set var="MOTIF_HDR" hints="files">
     src/generic/tabg.cpp
 </set>
 <set var="MOTIF_HDR" hints="files">

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

     wx/generic/colrdlgg.h
     wx/generic/colrdlgg.h

+    wx/generic/ctrlsub.h

     wx/generic/dirdlgg.h
     wx/generic/fdrepdlg.h
     wx/generic/dirdlgg.h
     wx/generic/fdrepdlg.h

+    wx/generic/filepickerg.h

     wx/generic/fontdlgg.h
     wx/generic/fontdlgg.h

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


@@ -1325,6 +1416,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/motif/colour.h
     wx/motif/combobox.h
     wx/motif/control.h
     wx/motif/colour.h
     wx/motif/combobox.h
     wx/motif/control.h

+    wx/motif/ctrlsub.h

     wx/motif/cursor.h
     wx/motif/dataform.h
     wx/motif/dataobj.h
     wx/motif/cursor.h
     wx/motif/dataform.h
     wx/motif/dataobj.h


@@ -1360,8 +1452,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/motif/statbox.h
     wx/motif/stattext.h
     wx/motif/textctrl.h
     wx/motif/statbox.h
     wx/motif/stattext.h
     wx/motif/textctrl.h

+    wx/motif/textentry.h

     wx/motif/tglbtn.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


@@ -1375,6 +1467,7 @@ 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/generic/icon.cpp
     src/generic/timer.cpp
     src/x11/app.cpp


@@ -1391,7 +1484,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/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


@@ -1463,12 +1555,12 @@ 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/graphics.cpp
     src/msw/gsockmsw.cpp
     src/msw/icon.cpp


@@ -1486,7 +1578,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


@@ -1513,6 +1604,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="MSW_SRC" hints="files">
 </set>
 
 <set var="MSW_SRC" hints="files">

+    src/generic/clrpickerg.cpp
+    src/generic/collpaneg.cpp
+    src/generic/filepickerg.cpp
+    src/generic/fontpickerg.cpp

     src/generic/statusbr.cpp
     src/generic/prntdlgg.cpp
     src/msw/accel.cpp
     src/generic/statusbr.cpp
     src/generic/prntdlgg.cpp
     src/msw/accel.cpp


@@ -1556,13 +1651,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/tabctrl.cpp
     src/msw/tbar95.cpp
     src/msw/textctrl.cpp
     src/msw/tabctrl.cpp
     src/msw/tbar95.cpp
     src/msw/textctrl.cpp

+    src/msw/textentry.cpp

     src/msw/tglbtn.cpp
     src/msw/treectrl.cpp
 </set>
 <set var="MSW_HDR" hints="files">
     wx/generic/clrpickerg.h
     src/msw/tglbtn.cpp
     src/msw/treectrl.cpp
 </set>
 <set var="MSW_HDR" hints="files">
     wx/generic/clrpickerg.h

-    wx/generic/fontpickerg.h
+    wx/generic/collpaneg.h

     wx/generic/filepickerg.h
     wx/generic/filepickerg.h

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


@@ -1578,6 +1675,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/combo.h
     wx/msw/combobox.h
     wx/msw/control.h
     wx/msw/combo.h
     wx/msw/combobox.h
     wx/msw/control.h

+    wx/msw/ctrlsub.h

     wx/msw/cursor.h
     wx/msw/dc.h
     wx/msw/dcclient.h
     wx/msw/cursor.h
     wx/msw/dc.h
     wx/msw/dcclient.h


@@ -1637,8 +1735,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/tabctrl.h
     wx/msw/tbar95.h
     wx/msw/textctrl.h
     wx/msw/tabctrl.h
     wx/msw/tbar95.h
     wx/msw/textctrl.h

+    wx/msw/textentry.h

     wx/msw/tglbtn.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


@@ -1729,6 +1827,7 @@ 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


@@ -1749,6 +1848,7 @@ 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/palette.cpp
     src/mgl/pen.cpp
     src/mgl/fontutil.cpp
     src/mgl/palette.cpp
     src/mgl/pen.cpp


@@ -1764,7 +1864,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/icon.h
     wx/generic/imaglist.h
     wx/generic/mask.h
     wx/generic/icon.h
     wx/generic/imaglist.h
     wx/generic/mask.h

-    wx/generic/timer.h

     wx/mgl/app.h
     wx/mgl/bitmap.h
     wx/mgl/brush.h
     wx/mgl/app.h
     wx/mgl/bitmap.h
     wx/mgl/brush.h


@@ -1776,7 +1875,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


@@ -1792,6 +1890,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <set var="DFB_LOWLEVEL_SRC" hints="files">
 <!-- ====================================================================== -->
 
 <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/caret.cpp
     src/generic/colour.cpp
     src/generic/icon.cpp


@@ -1810,6 +1910,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/dfb/evtloop.cpp
     src/dfb/font.cpp
     src/dfb/fontenum.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/pen.cpp
     src/dfb/region.cpp
     src/dfb/settings.cpp


@@ -1824,7 +1927,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/icon.h
     wx/generic/imaglist.h
     wx/generic/mask.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/app.h
     wx/dfb/bitmap.h
     wx/dfb/brush.h


@@ -1837,7 +1939,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/dfb/dfbptr.h
     wx/dfb/evtloop.h
     wx/dfb/font.h
     wx/dfb/dfbptr.h
     wx/dfb/evtloop.h
     wx/dfb/font.h

+    wx/dfb/nonownedwnd.h

     wx/dfb/pen.h
     wx/dfb/pen.h

+    wx/dfb/popupwin.h

     wx/dfb/private.h
     wx/dfb/region.h
     wx/dfb/toplevel.h
     wx/dfb/private.h
     wx/dfb/region.h
     wx/dfb/toplevel.h


@@ -1858,9 +1962,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="OS2_SRC" hints="files">
     <!-- Generic implementations used by wxOS2: -->
     src/generic/caret.cpp
 <set var="OS2_SRC" hints="files">
     <!-- Generic implementations used by wxOS2: -->
     src/generic/caret.cpp

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

     src/generic/colrdlgg.cpp
     src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp
     src/generic/colrdlgg.cpp
     src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp

+    src/generic/filepickerg.cpp
+    src/generic/fontpickerg.cpp

     src/generic/imaglist.cpp
     src/generic/listctrl.cpp
     src/generic/mdig.cpp
     src/generic/imaglist.cpp
     src/generic/listctrl.cpp
     src/generic/mdig.cpp


@@ -1940,6 +2048,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="OS2_HDR" hints="files">
     wx/generic/caret.h
 </set>
 <set var="OS2_HDR" hints="files">
     wx/generic/caret.h

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

     wx/generic/colrdlgg.h
     wx/generic/dirdlgg.h
     wx/generic/fdrepdlg.h
     wx/generic/colrdlgg.h
     wx/generic/dirdlgg.h
     wx/generic/fdrepdlg.h


@@ -2007,7 +2117,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


@@ -2039,8 +2148,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 -->


@@ -2053,6 +2160,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


@@ -2099,6 +2207,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


@@ -2112,6 +2221,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


@@ -2127,8 +2237,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/carbon/window.cpp
     <!-- Generic implementations used by wxMac: -->
     src/generic/caret.cpp
     src/mac/carbon/window.cpp
     <!-- Generic implementations used by wxMac: -->
     src/generic/caret.cpp

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

     src/generic/fdrepdlg.cpp
     src/generic/fdrepdlg.cpp

+    src/generic/filepickerg.cpp

     src/generic/fontdlgg.cpp
     src/generic/fontdlgg.cpp

+    src/generic/fontpickerg.cpp

     src/generic/listctrl.cpp
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
     src/generic/listctrl.cpp
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp


@@ -2171,7 +2285,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/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


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


@@ -2212,7 +2326,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


@@ -2280,6 +2393,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


@@ -2287,6 +2403,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


@@ -2294,7 +2411,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


@@ -2304,8 +2420,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/carbon/window.h
     <!-- Generic implementations used by wxMac: -->
     wx/generic/caret.h
     wx/mac/carbon/window.h
     <!-- Generic implementations used by wxMac: -->
     wx/generic/caret.h

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

     wx/generic/fdrepdlg.h
     wx/generic/fontdlgg.h
     wx/generic/fdrepdlg.h
     wx/generic/fontdlgg.h

+    wx/generic/fontpickerg.h

     wx/generic/listctrl.h
     wx/generic/statusbr.h
     wx/generic/tabg.h
     wx/generic/listctrl.h
     wx/generic/statusbr.h
     wx/generic/tabg.h


@@ -2333,6 +2452,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/NSMenu.mm
     src/cocoa/NSPanel.mm
     src/cocoa/NSScroller.mm
     src/cocoa/NSMenu.mm
     src/cocoa/NSPanel.mm
     src/cocoa/NSScroller.mm

+    src/cocoa/NSSlider.mm

     src/cocoa/NSTabView.mm
     src/cocoa/NSTableView.mm
     src/cocoa/NSTextField.mm
     src/cocoa/NSTabView.mm
     src/cocoa/NSTableView.mm
     src/cocoa/NSTextField.mm


@@ -2365,7 +2485,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/drawer.mm
     src/cocoa/evtloop.mm
     src/cocoa/filedlg.mm
     src/cocoa/drawer.mm
     src/cocoa/evtloop.mm
     src/cocoa/filedlg.mm

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

     src/cocoa/fontdlg.mm
     src/cocoa/fontenum.mm
     src/cocoa/fontutil.cpp
     src/cocoa/fontdlg.mm
     src/cocoa/fontenum.mm
     src/cocoa/fontutil.cpp


@@ -2398,15 +2518,19 @@ 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/cocoa/utilsexc.mm
     src/cocoa/window.mm
     <!-- Generic implementations used by wxCocoa: -->
     src/generic/accel.cpp
     src/generic/caret.cpp

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

     src/generic/colrdlgg.cpp
     src/generic/fdrepdlg.cpp
     src/generic/colrdlgg.cpp
     src/generic/fdrepdlg.cpp

+    src/generic/filepickerg.cpp

     src/generic/fontdlgg.cpp
     src/generic/fontdlgg.cpp

+    src/generic/fontpickerg.cpp

     src/generic/imaglist.cpp
     src/generic/listctrl.cpp
     src/generic/msgdlgg.cpp
     src/generic/imaglist.cpp
     src/generic/listctrl.cpp
     src/generic/msgdlgg.cpp


@@ -2423,6 +2547,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cocoa/NSMenu.h
     wx/cocoa/NSPanel.h
     wx/cocoa/NSScroller.h
     wx/cocoa/NSMenu.h
     wx/cocoa/NSPanel.h
     wx/cocoa/NSScroller.h

+    wx/cocoa/NSSlider.h

     wx/cocoa/NSTabView.h
     wx/cocoa/NSTableView.h
     wx/cocoa/NSTextField.h
     wx/cocoa/NSTabView.h
     wx/cocoa/NSTableView.h
     wx/cocoa/NSTextField.h


@@ -2482,14 +2607,19 @@ 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
     wx/cocoa/toplevel.h
     wx/cocoa/window.h

+    <!-- Semi-private headers -->
+    wx/cocoa/objc/objc_uniquifying.h

     <!-- Generic implementations used by wxCocoa: -->
     wx/generic/caret.h
     <!-- Generic implementations used by wxCocoa: -->
     wx/generic/caret.h

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

     wx/generic/fdrepdlg.h
     wx/generic/fontdlgg.h
     wx/generic/fdrepdlg.h
     wx/generic/fontdlgg.h

+    wx/generic/fontpickerg.h

     wx/generic/imaglist.h
     wx/generic/listctrl.h
     wx/generic/paletteg.h
     wx/generic/imaglist.h
     wx/generic/listctrl.h
     wx/generic/paletteg.h


@@ -2514,11 +2644,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="UNIV_SRC" hints="files">
     src/generic/accel.cpp
 
 <set var="UNIV_SRC" hints="files">
     src/generic/accel.cpp

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

     src/generic/colrdlgg.cpp
     src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp
     src/generic/filedlgg.cpp
     src/generic/colrdlgg.cpp
     src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp
     src/generic/filedlgg.cpp

+    src/generic/filepickerg.cpp

     src/generic/fontdlgg.cpp
     src/generic/fontdlgg.cpp

+    src/generic/fontpickerg.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


@@ -2563,9 +2698,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="UNIV_HDR" hints="files">
     wx/generic/accel.h
 </set>
 <set var="UNIV_HDR" hints="files">
     wx/generic/accel.h

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

     wx/generic/dirdlgg.h
     wx/generic/fdrepdlg.h
     wx/generic/dirdlgg.h
     wx/generic/fdrepdlg.h

+    wx/generic/filedlgg.h
+    wx/generic/filepickerg.h

     wx/generic/fontdlgg.h
     wx/generic/fontdlgg.h

+    wx/generic/fontpickerg.h

     wx/generic/listctrl.h
     wx/generic/mdig.h
     wx/generic/statusbr.h
     wx/generic/listctrl.h
     wx/generic/mdig.h
     wx/generic/statusbr.h


@@ -2606,12 +2748,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/univ/stdrend.h
     wx/univ/textctrl.h
     wx/univ/theme.h
     wx/univ/stdrend.h
     wx/univ/textctrl.h
     wx/univ/theme.h

+    wx/univ/tglbtn.h

     wx/univ/toolbar.h
     wx/univ/toplevel.h
     wx/univ/window.h
 </set>
 
     wx/univ/toolbar.h
     wx/univ/toplevel.h
     wx/univ/window.h
 </set>
 

-

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


@@ -2619,17 +2761,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="ADVANCED_CMN_SRC" hints="files">
     src/common/animatecmn.cpp
     src/common/datavcmn.cpp
 <set var="ADVANCED_CMN_SRC" hints="files">
     src/common/animatecmn.cpp
     src/common/datavcmn.cpp

+    src/common/hyperlnkcmn.cpp

     src/generic/aboutdlgg.cpp
     src/generic/bmpcboxg.cpp
     src/generic/calctrl.cpp
     src/generic/aboutdlgg.cpp
     src/generic/bmpcboxg.cpp
     src/generic/calctrl.cpp

-    src/generic/collpaneg.cpp

     src/generic/datavgen.cpp
     src/generic/datectlg.cpp
     src/generic/datavgen.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/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


@@ -2640,25 +2783,25 @@ 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/aboutdlg.h

     wx/animate.h
     wx/animdecod.h
     wx/bmpcbox.h
     wx/calctrl.h
     wx/animate.h
     wx/animdecod.h
     wx/bmpcbox.h
     wx/calctrl.h

-    wx/collpane.h

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

-    wx/aboutdlg.h
+    wx/editlbox.h

     wx/generic/aboutdlgg.h
     wx/generic/bmpcbox.h
     wx/generic/calctrl.h
     wx/generic/aboutdlgg.h
     wx/generic/bmpcbox.h
     wx/generic/calctrl.h

-    wx/generic/collpaneg.h

     wx/generic/datectrl.h
     wx/generic/dataview.h
     wx/generic/grid.h
     wx/generic/gridctrl.h
     wx/generic/gridsel.h
     wx/generic/helpext.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/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


@@ -2675,7 +2818,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>
 


@@ -2685,8 +2827,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="ADVANCED_MSW_SRC" hints="files">
 </set>
 
 <set var="ADVANCED_MSW_SRC" hints="files">

-    src/generic/animateg.cpp

     src/common/taskbarcmn.cpp
     src/common/taskbarcmn.cpp

+    src/generic/animateg.cpp

     src/msw/aboutdlg.cpp
     src/msw/sound.cpp
     src/msw/taskbar.cpp
     src/msw/aboutdlg.cpp
     src/msw/sound.cpp
     src/msw/taskbar.cpp


@@ -2714,10 +2856,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="ADVANCED_MAC_SRC" hints="files">
 </set>
 
 <set var="ADVANCED_MAC_SRC" hints="files">

-    src/generic/animateg.cpp

     src/common/taskbarcmn.cpp
     src/common/taskbarcmn.cpp

+    src/generic/animateg.cpp

     src/mac/carbon/aboutdlg.cpp
     src/mac/carbon/drawer.cpp
     src/mac/carbon/aboutdlg.cpp
     src/mac/carbon/drawer.cpp

+    src/mac/carbon/dataview.cpp
+    src/mac/carbon/databrow.cpp

     src/mac/carbon/sound.cpp
     src/mac/carbon/taskbar.cpp
     src/mac/corefoundation/hidjoystick.cpp
     src/mac/carbon/sound.cpp
     src/mac/carbon/taskbar.cpp
     src/mac/corefoundation/hidjoystick.cpp


@@ -2725,20 +2869,22 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="ADVANCED_MAC_HDR" hints="files">
     wx/generic/animate.h
     wx/mac/carbon/drawer.h
 <set var="ADVANCED_MAC_HDR" hints="files">
     wx/generic/animate.h
     wx/mac/carbon/drawer.h

+    wx/mac/carbon/dataview.h
+    wx/mac/carbon/databrow.h

     wx/mac/carbon/sound.h
     wx/mac/carbon/taskbarosx.h
     wx/mac/corefoundation/joystick.h
 </set>
 
 <set var="ADVANCED_COCOA_SRC" hints="files">
     wx/mac/carbon/sound.h
     wx/mac/carbon/taskbarosx.h
     wx/mac/corefoundation/joystick.h
 </set>
 
 <set var="ADVANCED_COCOA_SRC" hints="files">

-    src/generic/animateg.cpp

     src/cocoa/taskbar.mm
     src/common/taskbarcmn.cpp
     src/cocoa/taskbar.mm
     src/common/taskbarcmn.cpp

+    src/generic/animateg.cpp

     src/mac/corefoundation/hidjoystick.cpp
 </set>
 <set var="ADVANCED_COCOA_HDR" hints="files">
     src/mac/corefoundation/hidjoystick.cpp
 </set>
 <set var="ADVANCED_COCOA_HDR" hints="files">

-    wx/generic/animate.h

     wx/cocoa/taskbar.h
     wx/cocoa/taskbar.h

+    wx/generic/animate.h

     wx/mac/corefoundation/joystick.h
 </set>
 
     wx/mac/corefoundation/joystick.h
 </set>
 


@@ -2765,19 +2911,25 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/unix/taskbarx11.h
 </set>
 
     wx/unix/taskbarx11.h
 </set>
 

-<set var="ADVANCED_GTK_SRC" hints="files">
+<set var="ADVANCED_MOTIF_SRC" hints="files">

     src/generic/animateg.cpp
     src/generic/animateg.cpp

+</set>
+
+<set var="ADVANCED_MOTIF_HDR" hints="files">
+    wx/generic/animate.h
+</set>
+
+<set var="ADVANCED_GTK_SRC" hints="files">

     src/gtk/aboutdlg.cpp
     src/gtk/animate.cpp
     src/gtk/aboutdlg.cpp
     src/gtk/animate.cpp

-    src/gtk/collpane.cpp

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

+    src/gtk/hyperlink.cpp

     src/gtk/taskbar.cpp
     src/gtk/eggtrayicon.c
 </set>
 <set var="ADVANCED_GTK_HDR" hints="files">
     src/gtk/taskbar.cpp
     src/gtk/eggtrayicon.c
 </set>
 <set var="ADVANCED_GTK_HDR" hints="files">

-    wx/generic/animate.h

     wx/gtk/animate.h
     wx/gtk/animate.h

-    wx/gtk/collpane.h
+    wx/gtk/hyperlink.h

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


@@ -2789,20 +2941,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/animate.h
 </set>
 
     wx/generic/animate.h
 </set>
 

-<set var="ADVANCED_MOTIF_SRC" hints="files">
-    src/generic/animateg.cpp
-</set>
-<set var="ADVANCED_MOTIF_HDR" hints="files">
-    wx/generic/animate.h
-</set>
-
-<set var="ADVANCED_X11_SRC" hints="files">
-    src/generic/animateg.cpp
-</set>
-<set var="ADVANCED_X11_HDR" hints="files">
-    wx/generic/animate.h
-</set>
-

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


@@ -2818,6 +2956,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">


@@ -2900,6 +3039,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


@@ -2919,7 +3061,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>
 
 


@@ -2940,6 +3082,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


@@ -2960,8 +3103,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/xrc/xh_notbk.cpp
     src/xrc/xh_odcombo.cpp
     src/xrc/xh_panel.cpp
     src/xrc/xh_notbk.cpp
     src/xrc/xh_odcombo.cpp
     src/xrc/xh_panel.cpp

+    src/xrc/xh_propdlg.cpp

     src/xrc/xh_radbt.cpp
     src/xrc/xh_radbx.cpp
     src/xrc/xh_radbt.cpp
     src/xrc/xh_radbx.cpp

+    <!-- disabled until linking problems are fixed -->
+    <!-- src/xrc/xh_richtext.cpp -->

     src/xrc/xh_scrol.cpp
     src/xrc/xh_scwin.cpp
     src/xrc/xh_htmllbox.cpp
     src/xrc/xh_scrol.cpp
     src/xrc/xh_scwin.cpp
     src/xrc/xh_htmllbox.cpp


@@ -2969,6 +3115,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/xrc/xh_slidr.cpp
     src/xrc/xh_spin.cpp
     src/xrc/xh_split.cpp
     src/xrc/xh_slidr.cpp
     src/xrc/xh_spin.cpp
     src/xrc/xh_split.cpp

+    src/xrc/xh_srchctrl.cpp

     src/xrc/xh_statbar.cpp
     src/xrc/xh_stbmp.cpp
     src/xrc/xh_stbox.cpp
     src/xrc/xh_statbar.cpp
     src/xrc/xh_stbmp.cpp
     src/xrc/xh_stbox.cpp


@@ -2997,6 +3144,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


@@ -3017,8 +3165,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/xrc/xh_notbk.h
     wx/xrc/xh_odcombo.h
     wx/xrc/xh_panel.h
     wx/xrc/xh_notbk.h
     wx/xrc/xh_odcombo.h
     wx/xrc/xh_panel.h

+    wx/xrc/xh_propdlg.h

     wx/xrc/xh_radbt.h
     wx/xrc/xh_radbx.h
     wx/xrc/xh_radbt.h
     wx/xrc/xh_radbx.h

+    <!-- wx/xrc/xh_richtext.h -->

     wx/xrc/xh_scrol.h
     wx/xrc/xh_scwin.h
     wx/xrc/xh_htmllbox.h
     wx/xrc/xh_scrol.h
     wx/xrc/xh_scwin.h
     wx/xrc/xh_htmllbox.h


@@ -3026,6 +3176,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/xrc/xh_slidr.h
     wx/xrc/xh_spin.h
     wx/xrc/xh_split.h
     wx/xrc/xh_slidr.h
     wx/xrc/xh_spin.h
     wx/xrc/xh_split.h

+    wx/xrc/xh_srchctrl.h

     wx/xrc/xh_statbar.h
     wx/xrc/xh_stbmp.h
     wx/xrc/xh_stbox.h
     wx/xrc/xh_statbar.h
     wx/xrc/xh_stbmp.h
     wx/xrc/xh_stbox.h


@@ -3062,51 +3213,50 @@ 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>
 

-
-
-<!-- ====================================================================== -->
-<!--                              ODBC classes                              -->
-<!-- ====================================================================== -->
-
-<set var="ODBC_SRC" hints="files">
-    src/common/db.cpp
-    src/common/dbtable.cpp
-</set>
-<set var="ODBC_HDR" hints="files">
-    wx/db.h
-    wx/dbkeyg.h
-    wx/dbtable.h
-</set>
-
-<set var="DBGRID_SRC" hints="files">
-    src/common/dbgrid.cpp
-</set>
-<set var="DBGRID_HDR" hints="files">
-    wx/dbgrid.h
+<set var="OPENGL_HDR" hints="files">
+    wx/glcanvas.h
+    $(OPENGL_HDR_PLATFORM)

 </set>
 
 
 </set>
 
 


@@ -3151,15 +3301,33 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/richtext/richtextformatdlg.cpp
     src/richtext/richtextsymboldlg.cpp
     src/richtext/richtextstyledlg.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/richtextformatdlg.h
     wx/richtext/richtextsymboldlg.h
     wx/richtext/richtextstyledlg.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>
 
 <!-- ====================================================================== -->
 </set>
 
 <!-- ====================================================================== -->


@@ -3325,7 +3493,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC) $(ADVANCED_MOTIF_SRC)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK1_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC) $(ADVANCED_MOTIF_SRC)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK1_SRC)</if>

-        <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC) $(ADVANCED_X11_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">


@@ -3336,7 +3505,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR) $(ADVANCED_MOTIF_HDR)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK_HDR)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK1_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR) $(ADVANCED_MOTIF_HDR)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK_HDR)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK1_HDR)</if>

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


@@ -3395,7 +3565,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) $(AUI_HDR) $(RICHTEXT_HDR)
+            $(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(RICHTEXT_HDR)
+            $(STC_HDR)

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


@@ -3403,7 +3574,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="ALL_BASE_HEADERS" make_var="1" hints="files">
         $(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
         $(NET_CMN_HDR) $(NET_PLATFORM_HDR)
     <set var="ALL_BASE_HEADERS" make_var="1" hints="files">
         $(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
         $(NET_CMN_HDR) $(NET_PLATFORM_HDR)

-        $(XML_HDR) $(ODBC_HDR)
+        $(XML_HDR)

     </set>
     <set var="ALL_HEADERS" make_var="1" hints="files">
         $(ALL_BASE_HEADERS) $(ALL_GUI_HEADERS)
     </set>
     <set var="ALL_HEADERS" make_var="1" hints="files">
         $(ALL_BASE_HEADERS) $(ALL_GUI_HEADERS)


@@ -3424,7 +3595,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(NET_OS2_HDR)
         $(NET_UNIX_HDR)
         $(NET_MAC_CARBONLIB_HDR)
         $(NET_OS2_HDR)
         $(NET_UNIX_HDR)
         $(NET_MAC_CARBONLIB_HDR)

-        $(XML_HDR) $(ODBC_HDR)
+        $(XML_HDR)

     </set>
 
     <!-- used by 'make dist', should include wxBase sources for all ports -->
     </set>
 
     <!-- used by 'make dist', should include wxBase sources for all ports -->


@@ -3440,7 +3611,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(BASE_AND_GUI_MAC_SRC)
         $(BASE_AND_GUI_WIN32_SRC)
         $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_WINCE_SRC)
         $(BASE_AND_GUI_MAC_SRC)
         $(BASE_AND_GUI_WIN32_SRC)
         $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_WINCE_SRC)

-        $(XML_SRC) $(ODBC_SRC)
+        $(XML_SRC)

     </set>
 
 
     </set>