X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f7d03d2b665763eda91a84af5172bf044b865a9b..a0af0d98b5bb65da9f6b64a90dc3cfb642ee188e:/build/bakefiles/files.bkl

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index d183192091..b592ef699b 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -7,8 +7,8 @@
 IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 -->
-    
-    
+
+
 <!-- ======================================================================
                                        FILES
 
@@ -53,7 +53,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/unix/utilsunx.cpp
 </set>
 <set var="BASE_UNIX_HDR" hints="files">
+    wx/unix/apptbase.h
+    wx/unix/apptrait.h
+    wx/unix/execute.h
     wx/unix/mimetype.h
+    wx/unix/pipe.h
 </set>
 
 <set var="BASE_WIN32_SRC" hints="files">
@@ -75,12 +79,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/volume.cpp
 </set>
 <set var="BASE_WIN32_HDR" hints="files">
+    wx/msw/apptrait.h
+    wx/msw/apptbase.h
     wx/msw/chkconf.h
     wx/msw/crashrpt.h
     wx/msw/dde.h
     wx/msw/gccpriv.h
     wx/msw/mimetype.h
     wx/msw/winundef.h
+    wx/msw/wrapcctl.h
     wx/msw/wrapwin.h
 </set>
 
@@ -100,15 +107,25 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="BASE_MAC_SRC" hints="files">
     src/mac/dirmac.cpp
     src/mac/mimetmac.cpp
-    src/mac/utils.cpp
-    src/mac/utilsexc.cpp
     src/unix/baseunix.cpp
+    src/mac/utilsexc.cpp
+    src/mac/thread.cpp
+    src/mac/macnotfy.cpp
+    src/mac/morefilex/MoreFilesX.c
+</set>
+
+<set var="BASE_AND_GUI_MAC_SRC" hints="files">
+    src/mac/utils.cpp
+    src/mac/uma.cpp
 </set>
+
 <set var="BASE_MAC_HDR" hints="files">
 </set>
 
 <set var="BASE_OS2_SRC" hints="files">
     src/os2/dir.cpp
+    src/os2/mimetype.cpp
+    src/os2/thread.cpp
     src/os2/utils.cpp
     src/os2/utilsexc.cpp
 </set>
@@ -119,13 +136,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="BASE_CMN_SRC" hints="files">
     src/common/appbase.cpp
-    src/common/clntdata.cpp
     src/common/cmdline.cpp
     src/common/config.cpp
     src/common/datetime.cpp
     src/common/datstrm.cpp
-    src/common/db.cpp
-    src/common/dbtable.cpp
     src/common/dircmn.cpp
     src/common/dynarray.cpp
     src/common/dynlib.cpp
@@ -140,6 +154,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/filesys.cpp
     src/common/fmapbase.cpp
     src/common/fs_zip.cpp
+    src/common/gzstream.cpp
     src/common/hash.cpp
     src/common/hashmap.cpp
     src/common/init.cpp
@@ -168,6 +183,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/variant.cpp
     src/common/wfstream.cpp
     src/common/wxchar.cpp
+    src/common/xti.cpp
+    src/common/xtistrm.cpp
     src/common/zipstrm.cpp
     src/common/zstream.cpp
 </set>
@@ -178,6 +195,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/utilscmn.cpp
 </set>
 <set var="BASE_CMN_HDR" hints="files">
+    wx/afterstd.h
     wx/app.h
     wx/apptrait.h
     wx/arrimpl.cpp
@@ -186,7 +204,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/buffer.h
     wx/build.h
     wx/chkconf.h
-    wx/clntdata.h
     wx/cmdline.h
     wx/confbase.h
     wx/config.h
@@ -194,18 +211,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/datetime.h
     wx/datetime.inl
     wx/datstrm.h
-    wx/db.h
-    wx/dbkeyg.h
-    wx/dbtable.h
     wx/dde.h
     wx/debug.h
     wx/defs.h
     wx/dir.h
+    wx/dlimpexp.h
     wx/dynarray.h
     wx/dynlib.h
     wx/dynload.h
     wx/encconv.h
     wx/event.h
+    wx/except.h
     wx/features.h
     wx/ffile.h
     wx/file.h
@@ -217,8 +233,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/fontmap.h
     wx/fs_mem.h
     wx/fs_zip.h
+    wx/gzstream.h
     wx/hash.h
     wx/hashmap.h
+    wx/hashset.h
     wx/iconloc.h
     wx/init.h
     wx/intl.h
@@ -244,8 +262,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/object.h
     wx/platform.h
     wx/process.h
+    wx/ptr_scpd.h
     wx/regex.h
+    wx/scopeguard.h
     wx/snglinst.h
+    wx/stack.h
     wx/stopwatch.h
     wx/strconv.h
     wx/stream.h
@@ -255,6 +276,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/textfile.h
     wx/thread.h
     wx/thrimpl.cpp
+    wx/timer.h
     wx/tokenzr.h
     wx/txtstrm.h
     wx/types.h
@@ -267,6 +289,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/wx.h
     wx/wxchar.h
     wx/wxprec.h
+    wx/xti.h
+    wx/xtistrm.h
     wx/zipstrm.h
     wx/zstream.h
 </set>
@@ -285,7 +309,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="NET_WIN32_SRC" hints="files">
     src/msw/gsocket.c
-    src/msw/gsockmsw.c
+    src/msw/urlmsw.cpp
 </set>
 <set var="NET_WIN32_HDR" hints="files">
     wx/msw/gsockmsw.h
@@ -298,16 +322,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/unix/gsockunx.h
 </set>
 
-<set var="NET_MAC_SRC" hints="files">
-    src/mac/gsocket.c
-</set>
-<set var="NET_MAC_HDR" hints="files">
-    wx/mac/gsockmac.h
-</set>
-
 <set var="NET_OS2_SRC" hints="files">
+    src/os2/gsocket.c
 </set>
 <set var="NET_OS2_HDR" hints="files">
+    wx/unix/gsockunx.h
 </set>
 
 <set var="NET_CMN_SRC" hints="files">
@@ -348,8 +367,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/artprov.cpp
     src/common/artstd.cpp
     src/common/bmpbase.cpp
+    src/common/bookctrl.cpp
     src/common/choiccmn.cpp
     src/common/clipcmn.cpp
+    src/common/clntdata.cpp
     src/common/cmdproc.cpp
     src/common/cmndata.cpp
     src/common/containr.cpp
@@ -357,7 +378,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/ctrlcmn.cpp
     src/common/ctrlsub.cpp
     src/common/datacmn.cpp
-    src/common/dbgrid.cpp
     src/common/dcbase.cpp
     src/common/dlgcmn.cpp
     src/common/dndcmn.cpp
@@ -373,6 +393,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/fontmap.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
@@ -416,36 +437,26 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/wincmn.cpp
     src/common/xpmdecod.cpp
     src/generic/busyinfo.cpp
-    src/generic/calctrl.cpp
     src/generic/choicdgg.cpp
-    src/generic/dcbuffer.cpp
     src/generic/dcpsg.cpp
     src/generic/dirctrlg.cpp
     src/generic/dragimgg.cpp
-    src/generic/grid.cpp
-    src/generic/gridctrl.cpp
-    src/generic/gridsel.cpp
-    src/generic/helpext.cpp
-    src/generic/laywin.cpp
+    src/generic/listbkg.cpp
     src/generic/logg.cpp
     src/generic/numdlgg.cpp
     src/generic/panelg.cpp
     src/generic/progdlgg.cpp
+    src/generic/printps.cpp
     src/generic/renderg.cpp
-    src/generic/sashwin.cpp
     src/generic/scrlwing.cpp
     src/generic/selstore.cpp
     src/generic/spinctlg.cpp
-    src/generic/splash.cpp
     src/generic/splitter.cpp
-    src/generic/tbarsmpl.cpp
     src/generic/textdlgg.cpp
-    src/generic/tipdlg.cpp
     src/generic/tipwin.cpp
     src/generic/treectlg.cpp
     src/generic/vlbox.cpp
     src/generic/vscroll.cpp
-    src/generic/wizard.cpp
 </set>
 <set var="GUI_CMN_HDR" hints="files">
     wx/bmpbuttn.h
@@ -455,6 +466,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/checklst.h
     wx/choicdlg.h
     wx/choice.h
+    wx/clntdata.h
     wx/cmndata.h
     wx/combobox.h
     wx/control.h
@@ -467,39 +479,36 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/dcscreen.h
     wx/dialog.h
     wx/dirdlg.h
+    wx/dragimag.h
+    wx/encinfo.h
     wx/filedlg.h
     wx/frame.h
     wx/gauge.h
+    wx/gbsizer.h
     wx/gdicmn.h
     wx/generic/accel.h
-    wx/generic/calctrl.h
     wx/generic/choicdgg.h
     wx/generic/colrdlgg.h
     wx/generic/dcpsg.h
     wx/generic/dirctrlg.h
+    wx/generic/dragimgg.h
     wx/generic/filedlgg.h
     wx/generic/fontdlgg.h
-    wx/generic/grid.h
-    wx/generic/grid.h
-    wx/generic/gridctrl.h
-    wx/generic/helpext.h
     wx/generic/imaglist.h
-    wx/generic/laywin.h
     wx/generic/logg.h
     wx/generic/msgdlgg.h
+    wx/generic/numdlgg.h
     wx/generic/notebook.h
     wx/generic/panelg.h
     wx/generic/prntdlgg.h
+    wx/generic/printps.h
     wx/generic/progdlgg.h
-    wx/generic/sashwin.h
     wx/generic/scrolwin.h
     wx/generic/spinctlg.h
-    wx/generic/splash.h
     wx/generic/splitter.h
     wx/generic/textdlgg.h
     wx/generic/timer.h
     wx/generic/treectlg.h
-    wx/generic/wizard.h
     wx/helphtml.h
     wx/icon.h
     wx/layout.h
@@ -507,6 +516,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mdi.h
     wx/menu.h
     wx/msgdlg.h
+    wx/numdlg.h
     wx/palette.h
     wx/panel.h
     wx/pen.h
@@ -526,7 +536,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/statusbr.h
     wx/textctrl.h
     wx/textdlg.h
-    wx/timer.h
     wx/toolbar.h
     wx/validate.h
     wx/valtext.h
@@ -534,11 +543,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
     wx/accel.h
     wx/access.h
-    wx/afterstd.h
     wx/artprov.h
     wx/bitmap.h
+    wx/bookctrl.h
     wx/busyinfo.h
-    wx/calctrl.h
     wx/caret.h
     wx/clipbrd.h
     wx/cmdproc.h
@@ -546,8 +554,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/colour.h
     wx/cshelp.h
     wx/dataobj.h
-    wx/dbgrid.h
-    wx/dcbuffer.h
     wx/dcmirror.h
     wx/dcps.h
     wx/dialup.h
@@ -556,7 +562,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/dnd.h
     wx/docmdi.h
     wx/docview.h
-    wx/dragimag.h
     wx/effects.h
     wx/evtloop.h
     wx/fdrepdlg.h
@@ -569,7 +574,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/geometry.h
     wx/gifdecod.h
     wx/glcanvas.h
-    wx/grid.h
     wx/help.h
     wx/helpbase.h
     wx/helpwin.h
@@ -585,9 +589,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/imagpnm.h
     wx/imagtiff.h
     wx/imagxpm.h
-    wx/joystick.h
-    wx/laywin.h
     wx/listbase.h
+    wx/listbook.h
     wx/listctrl.h
     wx/matrix.h
     wx/menuitem.h
@@ -605,38 +608,27 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/quantize.h
     wx/rawbmp.h
     wx/region.h
-    wx/sashwin.h
     wx/scopeguard.h
     wx/spinbutt.h
     wx/spinctrl.h
-    wx/splash.h
     wx/splitter.h
-    wx/stack.h
     wx/statline.h
     wx/tab.h
     wx/tabctrl.h
-    wx/taskbar.h
     wx/tbarbase.h
-    wx/tbarsmpl.h
     wx/tglbtn.h
-    wx/tipdlg.h
     wx/tipwin.h
     wx/tooltip.h
     wx/toplevel.h
     wx/treebase.h
     wx/treectrl.h
     wx/valgen.h
+    wx/vidmode.h
     wx/vlbox.h
     wx/vms_x_fix.h
     wx/vscroll.h
-    wx/wave.h
-    wx/wizard.h
     wx/xpmdecod.h
     wx/xpmhand.h
-
-    wx/generic/dragimgg.h
-    wx/generic/gridsel.h
-
 </set>
 
 
@@ -645,21 +637,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <set var="XWIN_LOWLEVEL_SRC" hints="files">
-    src/common/taskbarcmn.cpp
     src/generic/caret.cpp
-    src/generic/printps.cpp
     src/unix/dialup.cpp
     src/unix/fontenum.cpp
     src/unix/fontutil.cpp
-    src/unix/taskbarx11.cpp
     src/unix/utilsx11.cpp
+    src/unix/displayx11.cpp
 </set>
 <set var="XWIN_LOWLEVEL_HDR" hints="files">
     wx/generic/caret.h
-    wx/generic/printps.h
     wx/unix/fontutil.h
-    wx/unix/taskbarx11.h
     wx/unix/utilsx11.h
+    wx/unix/displayx11.h
 </set>
 
 
@@ -689,9 +678,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/gsockgtk.c
     src/gtk/icon.cpp
     src/gtk/main.cpp
+    src/gtk/minifram.cpp
     src/gtk/pen.cpp
     src/gtk/popupwin.cpp
     src/gtk/region.cpp
+    src/gtk/renderer.cpp
     src/gtk/settings.cpp
     src/gtk/timer.cpp
     src/gtk/tooltip.cpp
@@ -717,6 +708,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
     src/generic/tabg.cpp
+    <!-- Generic implementations used by wxGPE: -->
+    src/generic/fontdlgg.cpp
     <!-- GTK+ specific files: -->
     src/gtk/bmpbuttn.cpp
     src/gtk/button.cpp
@@ -729,16 +722,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/fontdlg.cpp
     src/gtk/frame.cpp
     src/gtk/gauge.cpp
-    src/gtk/joystick.cpp
     src/gtk/listbox.cpp
     src/gtk/mdi.cpp
     src/gtk/menu.cpp
-    src/gtk/minifram.cpp
     src/gtk/msgdlg.cpp
     src/gtk/notebook.cpp
     src/gtk/radiobox.cpp
     src/gtk/radiobut.cpp
-    src/gtk/renderer.cpp
     src/gtk/scrolbar.cpp
     src/gtk/scrolwin.cpp
     src/gtk/slider.cpp
@@ -752,7 +742,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/textctrl.cpp
     src/gtk/tglbtn.cpp
     src/gtk/utilsres.cpp
-    src/gtk/wave.cpp
 </set>
 <set var="GTK_HDR" hints="files">
     wx/generic/dirdlgg.h
@@ -790,7 +779,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/gauge.h
     wx/gtk/gdiobj.h
     wx/gtk/icon.h
-    wx/gtk/joystick.h
     wx/gtk/listbox.h
     wx/gtk/mdi.h
     wx/gtk/menu.h
@@ -819,7 +807,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/tooltip.h
     wx/gtk/toplevel.h
     wx/gtk/treectrl.h
-    wx/gtk/wave.h
     wx/gtk/win_gtk.h
     wx/gtk/window.h
 </set>
@@ -839,6 +826,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="MOTIF_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
+    wx/x11/bitmap.h
+    wx/x11/brush.h
+    wx/x11/pen.h
+    wx/x11/region.h
 </set>
 <set var="MOTIF_SRC" hints="files">
     src/motif/accel.cpp
@@ -878,6 +869,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/motif/minifram.cpp
     src/motif/msgdlg.cpp
     src/motif/palette.cpp
+    src/motif/popupwin.cpp
     src/motif/radiobox.cpp
     src/motif/radiobut.cpp
     src/motif/scrolbar.cpp
@@ -893,6 +885,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/motif/toplevel.cpp
     src/motif/utils.cpp
     src/motif/window.cpp
+    src/motif/xmcombo/xmcombo.c
     <!-- Generic files used by wxMotif: -->
     src/generic/colrdlgg.cpp
     src/generic/dirdlgg.cpp
@@ -933,6 +926,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/motif/cursor.h
     wx/motif/dataform.h
     wx/motif/dataobj.h
+    wx/motif/dataobj2.h
     wx/motif/dc.h
     wx/motif/dcclient.h
     wx/motif/dcmemory.h
@@ -953,13 +947,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/motif/minifram.h
     wx/motif/msgdlg.h
     wx/motif/palette.h
+    wx/motif/popupwin.h
     wx/motif/print.h
     wx/motif/private.h
     wx/motif/radiobox.h
     wx/motif/radiobut.h
     wx/motif/region.h
     wx/motif/scrolbar.h
-    wx/motif/settings.h
     wx/motif/slider.h
     wx/motif/spinbutt.h
     wx/motif/statbmp.h
@@ -999,7 +993,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/x11/gdiobj.cpp
     src/x11/gsockx11.c
     src/x11/icon.cpp
-    src/x11/joystick.cpp
     src/x11/main.cpp
     src/x11/minifram.cpp
     src/x11/nanox.c
@@ -1016,7 +1009,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="X11_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
-    src/generic/timer.h
     wx/x11/app.h
     wx/x11/bitmap.h
     wx/x11/brush.h
@@ -1035,10 +1027,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/x11/font.h
     wx/x11/gdiobj.h
     wx/x11/icon.h
-    wx/x11/joystick.h
     wx/x11/minifram.h
     wx/x11/palette.h
     wx/x11/pen.h
+    wx/x11/popupwin.h
     wx/x11/print.h
     wx/x11/private.h
     wx/x11/privx.h
@@ -1056,7 +1048,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <set var="MSW_LOWLEVEL_SRC" hints="files">
-    src/common/taskbarcmn.cpp
     src/msw/app.cpp
     src/msw/bitmap.cpp
     src/msw/brush.cpp
@@ -1081,10 +1072,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/fontutil.cpp
     src/msw/gdiimage.cpp
     src/msw/gdiobj.cpp
+    src/msw/gsockmsw.c
     src/msw/helpchm.cpp
     src/msw/helpwin.cpp
     src/msw/icon.cpp
-    src/msw/joystick.cpp
     src/msw/minifram.cpp
     src/msw/ole/automtn.cpp
     src/msw/ole/dataobj.cpp
@@ -1095,20 +1086,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/palette.cpp
     src/msw/pen.cpp
     src/msw/popupwin.cpp
+    src/msw/printdlg.cpp
+    src/msw/printwin.cpp
     src/msw/region.cpp
+    src/msw/renderer.cpp
     src/msw/settings.cpp
-    src/msw/taskbar.cpp
     src/msw/timer.cpp
     src/msw/tooltip.cpp
     src/msw/toplevel.cpp
     src/msw/utilsgui.cpp
-    src/msw/wave.cpp
+    src/msw/uxtheme.cpp
     src/msw/window.cpp
 </set>
 <set var="MSW_LOWLEVEL_HDR" hints="files">
 </set>
 <set var="MSW_SRC" hints="files">
     src/generic/statusbr.cpp
+    src/generic/prntdlgg.cpp
     src/msw/accel.cpp
     src/msw/bmpbuttn.cpp
     src/msw/button.cpp
@@ -1138,12 +1132,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/notebook.cpp
     src/msw/ole/access.cpp
     src/msw/ownerdrw.cpp
-    src/msw/penwin.cpp
-    src/msw/printdlg.cpp
-    src/msw/printwin.cpp
     src/msw/radiobox.cpp
     src/msw/radiobut.cpp
-    src/msw/renderer.cpp
     src/msw/scrolbar.cpp
     src/msw/slider95.cpp
     src/msw/spinbutt.cpp
@@ -1158,7 +1148,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/textctrl.cpp
     src/msw/tglbtn.cpp
     src/msw/treectrl.cpp
-    src/msw/uxtheme.cpp
 </set>
 <set var="MSW_HDR" hints="files">
     wx/msw/accel.h
@@ -1201,7 +1190,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/icon.h
     wx/msw/imaglist.h
     wx/msw/iniconf.h
-    wx/msw/joystick.h
     wx/msw/listbox.h
     wx/msw/listctrl.h
     wx/msw/mdi.h
@@ -1245,7 +1233,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/statline.h
     wx/msw/stattext.h
     wx/msw/tabctrl.h
-    wx/msw/taskbar.h
     wx/msw/tbar95.h
     wx/msw/tbarmsw.h
     wx/msw/textctrl.h
@@ -1254,7 +1241,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/tooltip.h
     wx/msw/toplevel.h
     wx/msw/treectrl.h
-    wx/msw/wave.h
     wx/msw/window.h
 
     <!-- Resources must be installed together with headers: -->
@@ -1370,7 +1356,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="OS2_LOWLEVEL_HDR" hints="files">
 </set>
 <set var="OS2_SRC" hints="files">
+    <!-- Generic implementations used by wxOS2: -->
     src/generic/caret.cpp
+    src/generic/colrdlgg.cpp
+    src/generic/dirdlgg.cpp
+    src/generic/fdrepdlg.cpp
+    src/generic/imaglist.cpp
+    src/generic/listctrl.cpp
+    src/generic/mdig.cpp
+    src/generic/msgdlgg.cpp
+    src/generic/prntdlgg.cpp
+    src/generic/statusbr.cpp
+    <!-- OS/2 specific files: -->
     src/os2/accel.cpp
     src/os2/app.cpp
     src/os2/bitmap.cpp
@@ -1394,6 +1391,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/os2/dcscreen.cpp
     src/os2/dialog.cpp
     src/os2/dnd.cpp
+    src/os2/evtloop.cpp
     src/os2/filedlg.cpp
     src/os2/font.cpp
     src/os2/fontdlg.cpp
@@ -1403,18 +1401,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/os2/gauge.cpp
     src/os2/gdiimage.cpp
     src/os2/gdiobj.cpp
-    src/os2/gsocket.c
     src/os2/gsockpm.c
     src/os2/helpwin.cpp
     src/os2/icon.cpp
     src/os2/iniconf.cpp
-    src/os2/joystick.cpp
     src/os2/listbox.cpp
     src/os2/main.cpp
     src/os2/menu.cpp
     src/os2/menuitem.cpp
     src/os2/metafile.cpp
-    src/os2/mimetype.cpp
     src/os2/msgdlg.cpp
     src/os2/nativdlg.cpp
     src/os2/notebook.cpp
@@ -1436,16 +1431,21 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/os2/stattext.cpp
     src/os2/tabctrl.cpp
     src/os2/textctrl.cpp
-    src/os2/thread.cpp
     src/os2/timer.cpp
     src/os2/toolbar.cpp
     src/os2/tooltip.cpp
     src/os2/toplevel.cpp
-    src/os2/wave.cpp
+    src/os2/utilsgui.cpp
     src/os2/window.cpp
 </set>
 <set var="OS2_HDR" hints="files">
     wx/generic/caret.h
+    wx/generic/colrdlgg.h
+    wx/generic/dirdlgg.h
+    wx/generic/fdrepdlg.h
+    wx/generic/listctrl.h
+    wx/generic/mdig.h
+    wx/generic/statusbr.h
     wx/os2/accel.h
     wx/os2/app.h
     wx/os2/bitmap.h
@@ -1477,11 +1477,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/gauge.h
     wx/os2/gdiimage.h
     wx/os2/gdiobj.h
-    wx/os2/gsockos2.h
     wx/os2/helpwin.h
     wx/os2/icon.h
     wx/os2/iniconf.h
-    wx/os2/joystick.h
     wx/os2/listbox.h
     wx/os2/menu.h
     wx/os2/menuitem.h
@@ -1514,7 +1512,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/toolbar.h
     wx/os2/tooltip.h
     wx/os2/toplevel.h
-    wx/os2/wave.h
     wx/os2/window.h
 </set>
 
@@ -1563,16 +1560,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/frame.cpp
     src/mac/gauge.cpp
     src/mac/gdiobj.cpp
+    src/mac/gsockosx.c
     src/mac/icon.cpp
-    src/mac/joystick.cpp
     src/mac/listbox.cpp
-    src/mac/macnotfy.cpp
     src/mac/mdi.cpp
     src/mac/menu.cpp
     src/mac/menuitem.cpp
     src/mac/metafile.cpp
     src/mac/minifram.cpp
-    src/mac/morefilex/MoreFilesX.c
     src/mac/msgdlg.cpp
     src/mac/notebmac.cpp
     src/mac/palette.cpp
@@ -1595,13 +1590,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/stattext.cpp
     src/mac/tabctrl.cpp
     src/mac/textctrl.cpp
-    src/mac/thread.cpp
     src/mac/timer.cpp
+    src/mac/tglbtn.cpp
     src/mac/toolbar.cpp
     src/mac/tooltip.cpp
     src/mac/toplevel.cpp
-    src/mac/uma.cpp
-    src/mac/wave.cpp
     src/mac/window.cpp
     <!-- Generic implementations used by wxMac: -->
     src/generic/caret.cpp
@@ -1609,6 +1602,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/fontdlgg.cpp
     src/generic/imaglist.cpp
     src/generic/listctrl.cpp
+    src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
     src/generic/tabg.cpp
     <!-- Unix files used by wxMac: -->
@@ -1653,7 +1647,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/helpxxxx.h
     wx/mac/icon.h
     wx/mac/imaglist.h
-    wx/mac/joystick.h
     wx/mac/listbox.h
     wx/mac/listctrl.h
     wx/mac/macnotfy.h
@@ -1688,12 +1681,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/tabctrl.h
     wx/mac/textctrl.h
     wx/mac/timer.h
+    wx/mac/tglbtn.h
     wx/mac/toolbar.h
     wx/mac/tooltip.h
     wx/mac/toplevel.h
     wx/mac/treectrl.h
     wx/mac/uma.h
-    wx/mac/wave.h
     wx/mac/window.h
     <!-- Generic implementations used by wxMac: -->
     wx/generic/caret.h
@@ -1720,6 +1713,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/NSControl.mm
     src/cocoa/NSMenu.mm
     src/cocoa/NSPanel.mm
+    src/cocoa/NSTableView.mm
     src/cocoa/NSTextField.mm
     src/cocoa/NSView.mm
     src/cocoa/NSWindow.mm
@@ -1743,18 +1737,21 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/dcmemory.mm
     src/cocoa/dcscreen.cpp
     src/cocoa/dialog.mm
+    src/cocoa/evtloop.mm
     src/cocoa/font.cpp
     src/cocoa/fontenum.mm
     src/cocoa/fontutil.cpp
     src/cocoa/frame.mm
     src/cocoa/gauge.mm
     src/cocoa/gdiobj.cpp
-    src/cocoa/icon.cpp
+    src/cocoa/icon.mm
     src/cocoa/listbox.mm
     src/cocoa/main.cpp
+    src/cocoa/mbarman.mm
+    src/cocoa/mdi.mm
     src/cocoa/menu.mm
     src/cocoa/menuitem.mm
-    src/cocoa/pen.cpp
+    src/cocoa/pen.mm
     src/cocoa/radiobox.mm
     src/cocoa/radiobut.mm
     src/cocoa/region.cpp
@@ -1766,6 +1763,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/statline2.mm
     src/cocoa/stattext.mm
     src/cocoa/textctrl.mm
+    src/cocoa/toolbar.mm
     src/cocoa/toplevel.mm
     src/cocoa/utils.cpp
     src/cocoa/utilsexc.cpp
@@ -1780,20 +1778,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/fontdlgg.cpp
     src/generic/imaglist.cpp
     src/generic/listctrl.cpp
-    src/generic/mdig.cpp
     src/generic/msgdlgg.cpp
     src/generic/notebook.cpp
     src/generic/paletteg.cpp
     src/generic/statusbr.cpp
     src/generic/tabg.cpp
     src/generic/timer.cpp
+    <!-- wxMac stuff used by wxCocoa: -->
+    src/mac/gsockosx.c
 </set>
 <set var="COCOA_HDR" hints="files">
+    wx/cocoa/NSApplication.h
     wx/cocoa/NSBox.h
     wx/cocoa/NSButton.h
     wx/cocoa/NSControl.h
     wx/cocoa/NSMenu.h
     wx/cocoa/NSPanel.h
+    wx/cocoa/NSTableView.h
     wx/cocoa/NSTextField.h
     wx/cocoa/NSView.h
     wx/cocoa/NSWindow.h
@@ -1826,27 +1827,31 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cocoa/gdiobj.h
     wx/cocoa/icon.h
     wx/cocoa/listbox.h
+    wx/cocoa/mbarman.h
+    wx/cocoa/mdi.h
     wx/cocoa/menu.h
     wx/cocoa/menuitem.h
     wx/cocoa/pen.h
     wx/cocoa/radiobox.h
     wx/cocoa/radiobut.h
     wx/cocoa/region.h
+    wx/cocoa/slider.h
     wx/cocoa/spinbutt.h
     wx/cocoa/statbmp.h
     wx/cocoa/statbox.h
     wx/cocoa/statline.h
     wx/cocoa/stattext.h
     wx/cocoa/textctrl.h
+    wx/cocoa/toolbar.h
     wx/cocoa/toplevel.h
     wx/cocoa/window.h
     <!-- Generic implementations used by wxCocoa: -->
     wx/generic/caret.h
+    wx/generic/dirdlgg.h
     wx/generic/fdrepdlg.h
     wx/generic/fontdlgg.h
     wx/generic/imaglist.h
     wx/generic/listctrl.h
-    wx/generic/mdig.h
     wx/generic/paletteg.h
     wx/generic/statusbr.h
     wx/generic/tabg.h
@@ -1865,16 +1870,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/univ/themes/win32.cpp
 </set>
 
-<!-- don't ask... wxX11 must have something extra I guess -->
-<set var="UNIV_TEXTCTRL">
-    <if cond="TOOLKIT=='X11'">src/x11/textctrl.cpp</if>
-    <if cond="TOOLKIT=='MGL'">src/univ/textctrl.cpp</if>
-    <if cond="TOOLKIT=='GTK'">src/univ/textctrl.cpp</if>
-    <if cond="TOOLKIT=='MSW'">src/univ/textctrl.cpp</if>
-</set>
-
 <set var="UNIV_SRC" hints="files">
-    $(UNIV_TEXTCTRL)
     src/generic/accel.cpp
     src/generic/colrdlgg.cpp
     src/generic/dirdlgg.cpp
@@ -1895,6 +1891,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/univ/colschem.cpp
     src/univ/combobox.cpp
     src/univ/control.cpp
+    src/univ/ctrlrend.cpp
     src/univ/dialog.cpp
     src/univ/framuniv.cpp
     src/univ/gauge.cpp
@@ -1905,7 +1902,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/univ/notebook.cpp
     src/univ/radiobox.cpp
     src/univ/radiobut.cpp
-    src/univ/renderer.cpp
     src/univ/scrarrow.cpp
     src/univ/scrolbar.cpp
     src/univ/scrthumb.cpp
@@ -1916,6 +1912,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/univ/statline.cpp
     src/univ/stattext.cpp
     src/univ/statusbr.cpp
+    src/univ/textctrl.cpp
     src/univ/theme.cpp
     src/univ/toolbar.cpp
     src/univ/topluniv.cpp
@@ -1970,6 +1967,89 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 
+<!-- ====================================================================== -->
+<!--                               wxAdvanced                               -->
+<!-- ====================================================================== -->
+
+<set var="ADVANCED_CMN_SRC" hints="files">
+    src/generic/calctrl.cpp
+    src/generic/grid.cpp
+    src/generic/gridctrl.cpp
+    src/generic/gridsel.cpp
+    src/generic/helpext.cpp
+    src/generic/laywin.cpp
+    src/generic/sashwin.cpp
+    src/generic/splash.cpp
+    src/generic/tipdlg.cpp
+    src/generic/wizard.cpp
+</set>
+
+<set var="ADVANCED_CMN_HDR" hints="files">
+    wx/calctrl.h
+    wx/dcbuffer.h
+    wx/generic/calctrl.h
+    wx/generic/grid.h
+    wx/generic/gridctrl.h
+    wx/generic/gridsel.h
+    wx/generic/helpext.h
+    wx/generic/laywin.h
+    wx/generic/sashwin.h
+    wx/generic/splash.h
+    wx/generic/wizard.h
+    wx/grid.h
+    wx/joystick.h
+    wx/laywin.h
+    wx/sashwin.h
+    wx/sound.h
+    wx/splash.h
+    wx/taskbar.h
+    wx/tipdlg.h
+    wx/wave.h
+    wx/wizard.h
+</set>
+
+<set var="ADVANCED_MSW_SRC" hints="files">
+    src/common/taskbarcmn.cpp
+    src/msw/joystick.cpp
+    src/msw/sound.cpp
+    src/msw/taskbar.cpp
+</set>
+<set var="ADVANCED_MSW_HDR" hints="files">
+    wx/msw/joystick.h
+    wx/msw/sound.h
+    wx/msw/taskbar.h
+</set>
+
+<set var="ADVANCED_MAC_SRC" hints="files">
+    src/mac/joystick.cpp
+    src/mac/sound.cpp
+</set>
+<set var="ADVANCED_MAC_HDR" hints="files">
+    wx/mac/joystick.h
+    wx/mac/sound.h
+</set>
+
+<set var="ADVANCED_OS2_SRC" hints="files">
+    src/os2/joystick.cpp
+    src/os2/sound.cpp
+</set>
+<set var="ADVANCED_OS2_HDR" hints="files">
+    wx/os2/joystick.h
+    wx/os2/sound.h
+</set>
+
+<set var="ADVANCED_UNIX_SRC" hints="files">
+    src/common/taskbarcmn.cpp
+    src/unix/joystick.cpp
+    src/unix/sound.cpp
+    src/unix/taskbarx11.cpp
+</set>
+<set var="ADVANCED_UNIX_HDR" hints="files">
+    wx/unix/joystick.h
+    wx/unix/sound.h
+    wx/unix/taskbarx11.h
+</set>
+
 
 <!-- ====================================================================== -->
 <!--                               wxHTML                                   -->
@@ -1979,6 +2059,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <if cond="TOOLKIT=='MSW'">
         src/msw/helpbest.cpp
     </if>
+    <if cond="PLATFORM_UNIX=='1'">
+        src/html/chm.cpp
+    </if>
+    <if cond="PLATFORM_MACOSX=='1'">
+        src/html/chm.cpp
+    </if>
 </set>
 <set var="HTML_SRC" hints="files">
     $(HTML_SRC_PLATFORM)
@@ -2033,9 +2119,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="XML_SRC" hints="files">
     src/xml/xml.cpp
+    src/common/xtixml.cpp <!-- FIXME - temporary solution -->
 </set>
 <set var="XML_HDR" hints="files">
     wx/xml/xml.h
+    wx/xtixml.h <!-- FIXME - temporary solution -->
 </set>
 
 
@@ -2047,20 +2135,52 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <if cond="TOOLKIT=='MAC'">src/mac/glcanvas.cpp</if>
     <if cond="TOOLKIT=='GTK'">src/gtk/glcanvas.cpp</if>
     <if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>
-    <if cond="TOOLKIT=='MOTIF'">src/motif/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='MOTIF'">src/x11/glcanvas.cpp</if>
     <if cond="TOOLKIT=='X11'">src/x11/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='PM'">src/os2/glcanvas.cpp</if>
 </set>
 
 <set var="OPENGL_HDR" hints="files">
     <if cond="TOOLKIT=='MAC'">wx/mac/glcanvas.h</if>
     <if cond="TOOLKIT=='GTK'">wx/gtk/glcanvas.h</if>
     <if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
-    <if cond="TOOLKIT=='MOTIF'">wx/motif/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>
 </set>
 
 
 
+<!-- ====================================================================== -->
+<!--                              ODBD 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>
+
+
+<!-- ====================================================================== -->
+<!--                             Misc plugin sources:                       -->
+<!-- ====================================================================== -->
+
+<set var="UNIX_SOUND_SRC_SDL" hints="files">
+    src/unix/sound_sdl.cpp
+</set>
+
 <!-- ====================================================================== -->
 <!--                    Define sources for specific libraries:              -->
 <!-- ====================================================================== -->
@@ -2078,6 +2198,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC)</if>
         <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_SRC)</if>
+        <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_SRC)</if>
+    </set>
+    <set var="BASE_AND_GUI_TOOLKIT_SRC" hints="files">
+        <if cond="TOOLKIT=='MAC'">$(BASE_AND_GUI_MAC_SRC)</if>
     </set>
     <set var="BASE_AND_GUI_PLATFORM_SRC" hints="files">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_AND_GUI_UNIX_SRC)</if>
@@ -2095,27 +2219,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(BASE_CMN_SRC) $(BASE_PLATFORM_SRC)
     </set>
     <set var="BASE_AND_GUI_SRC" hints="files">
-        $(BASE_AND_GUI_CMN_SRC) $(BASE_AND_GUI_PLATFORM_SRC)
+        $(BASE_AND_GUI_CMN_SRC)
+        $(BASE_AND_GUI_PLATFORM_SRC) $(BASE_AND_GUI_TOOLKIT_SRC)
     </set>
-    
-    
+
+
     <!-- wxNet files: -->
-    <set var="NET_MACOSX_SRC" hints="files">
-        <if cond="TOOLKIT=='MAC'">$(NET_MAC_SRC)</if>
-        <if cond="TOOLKIT=='COCOA'">$(NET_DARWIN_SRC)</if>
-        <if cond="TOOLKIT=='GTK'">$(NET_DARWIN_SRC)</if>
-        <!-- FIXME: TOOLKIT!='MAC' is what we really want -->
-    </set>
     <set var="NET_PLATFORM_SRC" hints="files">
         <if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_SRC)</if>
         <if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_SRC)</if>
-        <if cond="PLATFORM_MACOSX=='1'">$(NET_MACOSX_SRC)</if>
+        <if cond="PLATFORM_MACOSX=='1'">$(NET_DARWIN_SRC)</if>
+        <if cond="PLATFORM_OS2=='1'">$(NET_OS2_SRC)</if>
     </set>
     <set var="NET_PLATFORM_HDR" hints="files">
         <if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_HDR)</if>
         <if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_HDR)</if>
-        <if cond="TOOLKIT=='MAC'">$(NET_MAC_HDR)</if>
-        <if cond="TOOLKIT=='COCOA'">$(NET_DARWIN_HDR)</if>
+        <if cond="PLATFORM_OS2=='1'">$(NET_OS2_HDR)</if>
+        <if cond="PLATFORM_MACOSX=='1'">$(NET_DARWIN_HDR)</if>
     </set>
 
     <set var="NET_SRC" hints="files">
@@ -2123,16 +2243,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     </set>
 
 
-
     <!-- GUI sources: -->
-    
+
     <set var="LOWLEVEL_SRC" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if>
-        <if cond="TOOLKIT=='OS2'">$(OS2_LOWLEVEL_SRC)</if>
+        <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_SRC)</if>
     </set>
@@ -2142,18 +2261,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_HDR)</if>
-        <if cond="TOOLKIT=='OS2'">$(OS2_LOWLEVEL_HDR)</if>
+        <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_HDR)</if>
     </set>
-    
+
     <set var="GUI_SRC" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
-        <if cond="TOOLKIT=='OS2'">$(OS2_SRC)</if>
+        <if cond="TOOLKIT=='PM'">$(OS2_SRC)</if>
     </set>
     <set var="GUI_HDR" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_HDR)</if>
@@ -2161,7 +2280,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='MSW'">$(MSW_HDR)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_HDR)</if>
-        <if cond="TOOLKIT=='OS2'">$(OS2_HDR)</if>
+        <if cond="TOOLKIT=='PM'">$(OS2_HDR)</if>
     </set>
 
     <set var="CORE_SRC" hints="files">
@@ -2173,22 +2292,80 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         </if>
     </set>
 
+    <!-- wxAdvanced files: -->
+    <set var="ADVANCED_PLATFORM_SRC" hints="files">
+        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC)</if>
+        <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_SRC)</if>
+        <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC)</if>
+        <if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_SRC)</if>
+        <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
+        <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
+    </set>
+    <set var="ADVANCED_PLATFORM_HDR" hints="files">
+        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR)</if>
+        <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_HDR)</if>
+        <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR)</if>
+        <if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_HDR)</if>
+        <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
+        <if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_HDR)</if>
+    </set>
+    <set var="ADVANCED_SRC">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC)</set>
+    <set var="ADVANCED_HDR">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR)</set>
+
+
+
+    <set var="GUI_CORE_HEADERS" hints="files">
+        <if cond="USE_GUI=='1' and WXUNIV=='0'">$(GUI_HDR)</if>
+        <if cond="USE_GUI=='1' and WXUNIV=='1'">$(UNIV_HDR)</if>
+    </set>
 
     <set var="ALL_GUI_HEADERS" hints="files">
-        <if cond="USE_GUI=='1' and WXUNIV=='0'">
-            $(GUI_CMN_HDR) $(LOWLEVEL_HDR) $(GUI_HDR)
-        </if>
-        <if cond="USE_GUI=='1' and WXUNIV=='1'">
-            $(GUI_CMN_HDR) $(LOWLEVEL_HDR) $(UNIV_HDR)
+        <if cond="USE_GUI=='1'">
+            $(GUI_CMN_HDR)
+            $(LOWLEVEL_HDR)
+            $(GUI_CORE_HEADERS)
+            $(ADVANCED_HDR) $(HTML_HDR)
+            $(OPENGL_HDR) $(DBGRID_HDR)
         </if>
     </set>
 
-    <set var="ALL_HEADERS" make_var="1" hints="files">
+
+    <set var="ALL_BASE_HEADERS" make_var="1" hints="files">
         $(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
         $(NET_CMN_HDR) $(NET_PLATFORM_HDR)
-        $(ALL_GUI_HEADERS)
-        $(HTML_HDR) $(XML_HDR)
-        $(OPENGL_HDR)
+        $(XML_HDR) $(ODBC_HDR)
+    </set>
+
+    <set var="ALL_HEADERS" make_var="1" hints="files">
+        $(ALL_BASE_HEADERS) $(ALL_GUI_HEADERS)
     </set>
 
+    <set var="ALL_BASE_SOURCES" make_var="1" hints="files">
+        $(BASE_CMN_SRC)
+        $(BASE_UNIX_SRC) $(BASE_WIN32_SRC) $(BASE_MAC_SRC) $(BASE_DARWIN_SRC)
+        $(BASE_OS2_SRC)
+        $(BASE_AND_GUI_CMN_SRC)
+        $(BASE_AND_GUI_UNIX_SRC)
+        $(BASE_AND_GUI_MAC_SRC)
+        $(BASE_AND_GUI_DARWIN_SRC)
+        $(BASE_AND_GUI_WIN32_SRC)
+        $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC)
+        $(XML_SRC) $(ODBC_SRC)
+    </set>
+    
+    
+    
+    <!-- ================================================================ -->
+    <!--        Define where plugins sources go if USE_PLUGINS=0          -->
+    <!-- ================================================================ -->
+
+    <!-- wxAdv sources -->
+    <set var="PLUGIN_ADV_SRC">
+        <if cond="FORMAT=='autoconf' and PLATFORM_UNIX=='1' and USE_PLUGINS=='0'">
+            $(UNIX_SOUND_SRC_SDL)
+        </if>
+    </set>
+    
+    <set var="PLUGIN_MONOLIB_SRC">$(PLUGIN_ADV_SRC)</set>
+    
 </makefile>