fix return type for "map_event" and "unmap_event" handlers

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

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 0be95ab39781a244403569f196338b49d111158b..8ab26e35203da7a2209067bf015ca740058f5dfc 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -62,6 +62,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/unix/stackwalk.cpp
     src/unix/stdpaths.cpp
     src/unix/threadpsx.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_AND_GUI_UNIX_SRC" hints="files">
     src/unix/utilsunx.cpp


@@ -95,6 +96,7 @@ 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>
     src/msw/utils.cpp
     src/msw/utilsexc.cpp
 </set>


@@ -199,7 +201,9 @@ 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
     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)


@@ -289,7 +293,10 @@ 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/clntdata.cpp
     src/common/cmdline.cpp
     src/common/config.cpp
     src/common/clntdata.cpp
     src/common/cmdline.cpp
     src/common/config.cpp


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


@@ -333,15 +344,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


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


@@ -370,6 +390,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


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

+    wx/flags.h

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


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


@@ -439,7 +463,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


@@ -448,6 +476,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


@@ -457,6 +486,8 @@ 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/wxcrtvararg.h

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


@@ -550,11 +581,13 @@ 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/bmpbase.cpp
     src/common/bookctrl.cpp
     src/common/appcmn.cpp
     src/common/artprov.cpp
     src/common/artstd.cpp
     src/common/bmpbase.cpp
     src/common/bookctrl.cpp

+    src/common/btncmn.cpp

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


@@ -568,6 +601,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/ctrlsub.cpp
     src/common/datacmn.cpp
     src/common/dcbase.cpp
     src/common/ctrlsub.cpp
     src/common/datacmn.cpp
     src/common/dcbase.cpp

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

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


@@ -584,12 +620,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,6 +640,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


@@ -610,6 +649,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


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

+    src/common/srchcmn.cpp

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

+    src/common/stattextcmn.cpp

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

-    src/common/timercmn.cpp

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


@@ -637,6 +678,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


@@ -654,6 +696,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


@@ -671,6 +714,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


@@ -678,9 +722,11 @@ 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

+    wx/dcsvg.h

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


@@ -694,6 +740,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


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

+    wx/generic/srchctlg.h

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

-    wx/generic/timer.h

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

+    wx/graphics.h

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


@@ -725,9 +773,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


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


@@ -788,7 +839,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


@@ -802,6 +852,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 +862,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 +880,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


@@ -880,6 +933,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


@@ -895,7 +949,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/evtloop.cpp
     src/gtk/font.cpp
     src/gtk/gsockgtk.cpp
     src/gtk/evtloop.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


@@ -914,6 +967,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


@@ -932,7 +986,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


@@ -945,6 +998,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/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 +1013,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 +1062,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


@@ -1108,7 +1164,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


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

-    wx/motif/timer.h

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


@@ -1364,6 +1418,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


@@ -1380,7 +1436,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


@@ -1458,6 +1513,8 @@ 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/imaglist.cpp
     src/msw/gsockmsw.cpp
     src/msw/icon.cpp
     src/msw/imaglist.cpp


@@ -1474,7 +1531,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


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

-    wx/msw/timer.h

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


@@ -1717,10 +1772,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/imaglist.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


@@ -1736,6 +1793,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


@@ -1750,7 +1808,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/colour.h
     wx/generic/icon.h
     wx/generic/imaglist.h
     wx/generic/colour.h
     wx/generic/icon.h
     wx/generic/imaglist.h

-    wx/generic/timer.h
+    wx/generic/mask.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


@@ -1762,7 +1820,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,6 +1835,15 @@ 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/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/app.cpp
     src/dfb/bitmap.cpp
     src/dfb/brush.cpp


@@ -1790,6 +1856,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


@@ -1797,13 +1866,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/dfb/utils.cpp
     src/dfb/window.cpp
     src/dfb/wrapdfb.cpp
     src/dfb/utils.cpp
     src/dfb/window.cpp
     src/dfb/wrapdfb.cpp

-    src/generic/caret.cpp
-    src/generic/colour.cpp
-    src/generic/icon.cpp
-    src/generic/imaglist.cpp
-    src/generic/timer.cpp

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

+    wx/generic/caret.h
+    wx/generic/colour.h
+    wx/generic/icon.h
+    wx/generic/imaglist.h
+    wx/generic/mask.h

     wx/dfb/app.h
     wx/dfb/bitmap.h
     wx/dfb/brush.h
     wx/dfb/app.h
     wx/dfb/bitmap.h
     wx/dfb/brush.h


@@ -1816,6 +1885,7 @@ 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/popupwin.h
     wx/dfb/private.h
     wx/dfb/pen.h
     wx/dfb/popupwin.h
     wx/dfb/private.h


@@ -1823,11 +1893,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/dfb/toplevel.h
     wx/dfb/window.h
     wx/dfb/wrapdfb.h
     wx/dfb/toplevel.h
     wx/dfb/window.h
     wx/dfb/wrapdfb.h

-    wx/generic/caret.h
-    wx/generic/colour.h
-    wx/generic/icon.h
-    wx/generic/imaglist.h
-    wx/generic/timer.h

 </set>
 
 
 </set>
 
 


@@ -1992,7 +2057,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


@@ -2024,8 +2088,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 -->


@@ -2038,6 +2100,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


@@ -2072,6 +2135,7 @@ 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


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


@@ -2096,6 +2161,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


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


@@ -2188,6 +2253,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


@@ -2196,7 +2262,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


@@ -2264,6 +2329,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


@@ -2271,6 +2339,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


@@ -2278,7 +2347,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


@@ -2466,8 +2534,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cocoa/statline.h
     wx/cocoa/stattext.h
     wx/cocoa/textctrl.h
     wx/cocoa/statline.h
     wx/cocoa/stattext.h
     wx/cocoa/textctrl.h

-    wx/cocoa/timer.h

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

+    wx/cocoa/tooltip.h

     wx/cocoa/toplevel.h
     wx/cocoa/window.h
     <!-- Generic implementations used by wxCocoa: -->
     wx/cocoa/toplevel.h
     wx/cocoa/window.h
     <!-- Generic implementations used by wxCocoa: -->


@@ -2559,6 +2627,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


@@ -2594,21 +2663,26 @@ 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

+    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


@@ -2619,10 +2693,18 @@ 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/dataview.h
     wx/dateevt.h
     wx/dcbuffer.h
     wx/calctrl.h
     wx/dataview.h
     wx/dateevt.h
     wx/dcbuffer.h

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

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


@@ -2630,6 +2712,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


@@ -2646,7 +2729,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>
 


@@ -2657,6 +2739,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>


@@ -2683,6 +2766,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


@@ -2727,11 +2811,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>
 
 <!-- ====================================================================== -->


@@ -2749,6 +2845,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">


@@ -2831,6 +2928,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


@@ -2850,7 +2950,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>
 
 


@@ -2860,8 +2960,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


@@ -2869,6 +2971,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


@@ -2891,8 +2994,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


@@ -2914,8 +3020,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


@@ -2923,6 +3031,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


@@ -2945,8 +3054,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


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

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

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

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

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

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

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

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

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

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

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

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

 </set>
 
 </set>
 

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

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


@@ -3073,12 +3205,36 @@ 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>
+
+
+<!-- ====================================================================== -->
+<!--                                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>
 
 <!-- ====================================================================== -->


@@ -3245,6 +3401,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">


@@ -3253,8 +3410,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>
 


@@ -3314,6 +3473,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
             $(GUI_CORE_HEADERS)
             $(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
             $(OPENGL_HDR) $(QA_HDR) $(DBGRID_HDR) $(XRC_HDR) $(AUI_HDR) $(RICHTEXT_HDR)
             $(GUI_CORE_HEADERS)
             $(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
             $(OPENGL_HDR) $(QA_HDR) $(DBGRID_HDR) $(XRC_HDR) $(AUI_HDR) $(RICHTEXT_HDR)

+            $(STC_HDR)

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