X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62f988852e065d5185a19b159c57514bdaa58f5f..cb751f46a0db6efd12b1e8f9d1074e71b6249253:/build/bakefiles/files.bkl

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 93ae093520..662c1f5590 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -53,39 +53,67 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 <!--                               UNIX                                     -->
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
-<set var="BASE_UNIX_SRC" hints="files">
+
+<!-- Files used on all Unix systems, including Darwin -->
+<set var="BASE_UNIX_AND_DARWIN_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/epolldispatcher.cpp
+    src/unix/appunix.cpp
     src/unix/evtloopunix.cpp
-    src/unix/mimetype.cpp
+    src/unix/dlunix.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/stackwalk.cpp
     src/unix/utilsunx.cpp
 </set>
-<set var="BASE_UNIX_HDR" hints="files">
+
+<set var="BASE_UNIX_AND_DARWIN_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/chkconf.h
-    wx/unix/execute.h
     wx/unix/evtloop.h
-    wx/unix/mimetype.h
     wx/unix/pipe.h
-    wx/unix/private.h
-    wx/unix/stackwalk.h
     wx/unix/stdpaths.h
+    wx/unix/stackwalk.h
+</set>
+
+<!--
+    Files used on all Unix systems, including Darwin with any port but wxMac
+    (this is really an aberration, we should also use these files for wxMac,
+     it's not done because of some OS 9 support leftovers only now)
+ -->
+<set var="BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC" hints="files">
+    $(BASE_UNIX_AND_DARWIN_SRC)
+    src/unix/dir.cpp
+    src/unix/mimetype.cpp
+    src/unix/threadpsx.cpp
+</set>
+
+<set var="BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR" hints="files">
+    $(BASE_UNIX_AND_DARWIN_HDR)
+    wx/unix/execute.h
+    wx/unix/mimetype.h
+    wx/unix/private.h
+</set>
+
+<!--
+    Files used on all non-Darwin Unix systems (because Darwin provides other,
+    better, native equivalents of the functionality they implement (e.g.
+    CFSocket instead of BSD sockets) or doesn't provide it at all (epoll,
+    backtrace())
+ -->
+<set var="BASE_UNIX_SRC" hints="files">
+    $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)
+    src/common/gsocketiohandler.cpp
+</set>
+<set var="BASE_UNIX_HDR" hints="files">
+    $(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR)
+    wx/private/gsocketiohandler.h
 </set>
 
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
@@ -155,6 +183,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- Used on Mac OS CarbonLib, Mac OS X wxMac base, and Mac OS X darwin base -->
 <set var="BASE_COREFOUNDATION_SRC" hints="files">
     src/mac/corefoundation/cfstring.cpp
+    src/mac/corefoundation/gsockosx.cpp
     src/mac/corefoundation/stdpaths_cf.cpp
     src/mac/corefoundation/strconv_cf.cpp
     src/mac/corefoundation/utilsexc_base.cpp
@@ -213,36 +242,20 @@ 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)
-    src/common/fdiodispatcher.cpp
-    src/common/selectdispatcher.cpp
-    src/unix/appunix.cpp
-    src/unix/baseunix.cpp
-    src/unix/evtloopunix.cpp
-    src/unix/dlunix.cpp
-    src/unix/snglinst.cpp
-    src/unix/stdpaths.cpp
-    src/unix/timerunx.cpp
+    $(BASE_UNIX_AND_DARWIN_SRC)
 </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/chkconf.h
-    wx/unix/evtloop.h
-    wx/unix/pipe.h
-    wx/unix/stdpaths.h
+    $(BASE_UNIX_AND_DARWIN_HDR)
 </set>
 
 <!-- Base files used by non-wxMac OS X builds -->
 <set var="BASE_MACOSX_NOTWXMAC_SRC" hints="files">
-    $(BASE_UNIX_SRC)
+    $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)
     $(BASE_COREFOUNDATION_SRC)
 </set>
 <set var="BASE_MACOSX_NOTWXMAC_HDR" hints="files">
-    $(BASE_UNIX_HDR)
+    $(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR)
     $(BASE_COREFOUNDATION_HDR)
 </set>
 
@@ -253,6 +266,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="BASE_OS2_SRC" hints="files">
     src/common/fdiodispatcher.cpp
     src/common/selectdispatcher.cpp
+    src/common/gsocketiohandler.cpp
     src/unix/appunix.cpp
     src/unix/evtloopunix.cpp
     src/unix/timerunx.cpp
@@ -268,6 +282,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="BASE_OS2_HDR" hints="files">
     wx/private/fdiodispatcher.h
     wx/private/selectdispatcher.h
+    wx/private/gsocketiohandler.h
     wx/unix/app.h
     wx/os2/apptbase.h
     wx/os2/apptrait.h
@@ -288,6 +303,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/palmos/dir.cpp
     src/palmos/prefconf.cpp
     src/palmos/snglinst.cpp
+    src/palmos/stdall.c
     src/palmos/thread.cpp
     src/palmos/utils.cpp
     src/palmos/utilsexc.cpp
@@ -303,6 +319,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/palmos/apptrait.h
     wx/palmos/chkconf.h
     wx/palmos/mimetype.h
+    wx/palmos/missing.h
     wx/palmos/stdpaths.h
 </set>
 
@@ -396,6 +413,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/wfstream.cpp
     src/common/wxcrt.cpp
     src/common/wxprintf.cpp
+    src/common/xlocale.cpp
     src/common/xti.cpp
     src/common/xtistrm.cpp
     src/common/zipstrm.cpp
@@ -487,6 +505,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/power.h
     wx/process.h
     wx/ptr_scpd.h
+    wx/ptr_shrd.h
     wx/recguard.h
     wx/regex.h
     wx/scopeguard.h
@@ -511,6 +530,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/thrimpl.cpp
     wx/timer.h
     wx/tokenzr.h
+    wx/tracker.h
     wx/txtstrm.h
     wx/types.h
     wx/unichar.h
@@ -520,6 +540,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/vector.h
     wx/version.h
     wx/volume.h
+    wx/weakref.h
     wx/wfstream.h
     wx/wx.h
     wx/wxchar.h
@@ -527,10 +548,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/wxcrtbase.h
     wx/wxcrtvararg.h
     wx/wxprec.h
+    wx/xlocale.h
     wx/xti.h
     wx/xtistrm.h
     wx/zipstrm.h
     wx/zstream.h
+    wx/meta/convertible.h
+    wx/meta/if.h
+    wx/meta/int2type.h
+    wx/meta/movable.h
 </set>
 
 
@@ -547,6 +573,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="NET_WIN32_SRC" hints="files">
     src/msw/gsocket.cpp
+    src/msw/gsockmsw.cpp
     src/msw/urlmsw.cpp
 </set>
 <set var="NET_WIN32_HDR" hints="files">
@@ -713,6 +740,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/validate.cpp
     src/common/valtext.cpp
     src/common/wincmn.cpp
+    src/common/windowid.cpp
     src/common/xpmdecod.cpp
     src/generic/busyinfo.cpp
     src/generic/buttonbar.cpp
@@ -806,6 +834,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mdi.h
     wx/menu.h
     wx/msgdlg.h
+    wx/nativewin.h
     wx/numdlg.h
     wx/overlay.h
     wx/palette.h
@@ -833,11 +862,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/validate.h
     wx/valtext.h
     wx/window.h
+    wx/windowid.h
     wx/wupdlock.h
 
     wx/accel.h
     wx/access.h
     wx/anidecod.h
+    wx/animdecod.h
     wx/artprov.h
     wx/bitmap.h
     wx/bookctrl.h
@@ -908,7 +939,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/printdlg.h
     wx/prntbase.h
     wx/progdlg.h
-    wx/ptr_scpd.h
     wx/quantize.h
     wx/rawbmp.h
     wx/region.h
@@ -938,6 +968,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/xpmhand.h
 </set>
 
+<!-- ====================================================================== -->
+<!--                            Common Unix files:                          -->
+<!-- ====================================================================== -->
+
+<set var="UNIX_SRC" hints="files">
+    src/unix/apptraits.cpp
+</set>
 
 <!-- ====================================================================== -->
 <!--                            Common X11 code:                            -->
@@ -1021,10 +1058,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/minifram.h
     wx/gtk/pen.h
     wx/gtk/popupwin.h
+    wx/gtk/private/win_gtk.h
     wx/gtk/region.h
     wx/gtk/tooltip.h
     wx/gtk/toplevel.h
-    wx/gtk/win_gtk.h
     wx/gtk/window.h
 </set>
 <set var="GTK_SRC" hints="files">
@@ -1069,6 +1106,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/menu.cpp
     src/gtk/mnemonics.cpp
     src/gtk/msgdlg.cpp
+    src/gtk/nativewin.cpp
     src/gtk/notebook.cpp
     src/gtk/radiobox.cpp
     src/gtk/radiobut.cpp
@@ -1317,6 +1355,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     $(XWIN_LOWLEVEL_SRC)
     src/x11/bitmap.cpp
     src/x11/brush.cpp
+    src/x11/palette.cpp
     src/x11/pen.cpp
     src/x11/region.cpp
     src/x11/utilsx.cpp
@@ -1325,6 +1364,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     $(XWIN_LOWLEVEL_HDR)
     wx/x11/bitmap.h
     wx/x11/brush.h
+    wx/x11/palette.h
     wx/x11/pen.h
     wx/x11/region.h
 </set>
@@ -1364,7 +1404,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/motif/menuitem.cpp
     src/motif/minifram.cpp
     src/motif/msgdlg.cpp
-    src/motif/palette.cpp
     src/motif/popupwin.cpp
     src/motif/radiobox.cpp
     src/motif/radiobut.cpp
@@ -1451,7 +1490,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/motif/menuitem.h
     wx/motif/minifram.h
     wx/motif/msgdlg.h
-    wx/motif/palette.h
     wx/motif/popupwin.h
     wx/motif/print.h
     wx/motif/private.h
@@ -1479,7 +1517,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <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
@@ -1574,7 +1611,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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/minifram.cpp
@@ -1636,7 +1672,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/dragimag.cpp
     src/msw/filedlg.cpp
     src/msw/frame.cpp
-    src/msw/gauge95.cpp
+    src/msw/gauge.cpp
     src/msw/iniconf.cpp
     src/msw/listbox.cpp
     src/msw/listctrl.cpp
@@ -1646,22 +1682,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/metafile.cpp
     src/msw/msgdlg.cpp
     src/msw/nativdlg.cpp
+    src/msw/nativewin.cpp
     src/msw/notebook.cpp
     src/msw/ole/access.cpp
     src/msw/ownerdrw.cpp
     src/msw/radiobox.cpp
     src/msw/radiobut.cpp
     src/msw/scrolbar.cpp
-    src/msw/slider95.cpp
+    src/msw/slider.cpp
     src/msw/spinbutt.cpp
     src/msw/spinctrl.cpp
     src/msw/statbmp.cpp
     src/msw/statbox.cpp
-    src/msw/statbr95.cpp
+    src/msw/statusbar.cpp
     src/msw/statline.cpp
     src/msw/stattext.cpp
     src/msw/tabctrl.cpp
-    src/msw/tbar95.cpp
+    src/msw/toolbar.cpp
     src/msw/textctrl.cpp
     src/msw/textentry.cpp
     src/msw/tglbtn.cpp
@@ -1703,7 +1740,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/filedlg.h
     wx/msw/font.h
     wx/msw/frame.h
-    wx/msw/gauge95.h
+    wx/msw/gauge.h
     wx/msw/gdiimage.h
     wx/msw/icon.h
     wx/msw/imaglist.h
@@ -1736,16 +1773,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/rcdefs.h
     wx/msw/scrolbar.h
     wx/msw/setup0.h
-    wx/msw/slider95.h
+    wx/msw/slider.h
     wx/msw/spinbutt.h
     wx/msw/spinctrl.h
     wx/msw/statbmp.h
     wx/msw/statbox.h
-    wx/msw/statbr95.h
+    wx/msw/statusbar.h
     wx/msw/statline.h
     wx/msw/stattext.h
     wx/msw/tabctrl.h
-    wx/msw/tbar95.h
+    wx/msw/toolbar.h
     wx/msw/textctrl.h
     wx/msw/textentry.h
     wx/msw/tglbtn.h
@@ -1903,7 +1940,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <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
@@ -2028,6 +2064,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/os2/menu.cpp
     src/os2/menuitem.cpp
     src/os2/metafile.cpp
+    src/os2/minifram.cpp
     src/os2/msgdlg.cpp
     src/os2/nativdlg.cpp
     src/os2/notebook.cpp
@@ -2145,7 +2182,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="MAC_OSX_LOWLEVEL_SRC" hints="files">
     <!-- Shared wxMac and wxCocoa files -->
-    src/mac/corefoundation/gsockosx.cpp
     src/mac/corefoundation/hid.cpp
     src/mac/corefoundation/utilsexc_cf.cpp
 </set>
@@ -2222,10 +2258,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/carbon/metafile.cpp
     src/mac/carbon/minifram.cpp
     src/mac/carbon/msgdlg.cpp
+    src/mac/carbon/nonownedwnd.cpp
     src/mac/carbon/notebmac.cpp
     src/mac/carbon/overlay.cpp
     src/mac/carbon/palette.cpp
     src/mac/carbon/pen.cpp
+    src/mac/carbon/popupwin.cpp
     src/mac/carbon/printdlg.cpp
     src/mac/carbon/printmac.cpp
     src/mac/carbon/radiobox.cpp
@@ -2305,7 +2343,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
@@ -2317,9 +2354,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/mimetype.h
     wx/mac/minifram.h
     wx/mac/msgdlg.h
+    wx/mac/nonownedwnd.h
     wx/mac/notebook.h
     wx/mac/palette.h
     wx/mac/pen.h
+    wx/mac/popupwin.h
     wx/mac/pnghand.h
     wx/mac/pngread.h
     wx/mac/printdlg.h
@@ -2330,7 +2369,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/region.h
     wx/mac/scrolbar.h
     wx/mac/slider.h
-    wx/mac/sound.h
     wx/mac/spinbutt.h
     wx/mac/spinctrl.h
     wx/mac/srchctrl.h
@@ -2401,9 +2439,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/carbon/mimetype.h
     wx/mac/carbon/minifram.h
     wx/mac/carbon/msgdlg.h
+    wx/mac/carbon/nonownedwnd.h
     wx/mac/carbon/notebook.h
     wx/mac/carbon/palette.h
     wx/mac/carbon/pen.h
+    wx/mac/carbon/popupwin.h
     wx/mac/carbon/pnghand.h
     wx/mac/carbon/pngread.h
     wx/mac/carbon/printdlg.h
@@ -2439,6 +2479,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/clrpickerg.h
     wx/generic/collpaneg.h
     wx/generic/fdrepdlg.h
+    wx/generic/filepickerg.h
     wx/generic/fontdlgg.h
     wx/generic/fontpickerg.h
     wx/generic/listctrl.h
@@ -2455,7 +2496,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="COCOA_LOWLEVEL_SRC" hints="files">
     <!-- Shared wxMac and wxCocoa files -->
-    src/mac/corefoundation/gsockosx.cpp
     src/mac/corefoundation/hid.cpp
     src/mac/corefoundation/utilsexc_cf.cpp
 </set>
@@ -2775,11 +2815,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="ADVANCED_CMN_SRC" hints="files">
     src/common/animatecmn.cpp
+    src/common/calctrlcmn.cpp
     src/common/datavcmn.cpp
     src/common/hyperlnkcmn.cpp
     src/generic/aboutdlgg.cpp
     src/generic/bmpcboxg.cpp
-    src/generic/calctrl.cpp
+    src/generic/calctrlg.cpp
     src/generic/datavgen.cpp
     src/generic/datectlg.cpp
     src/generic/editlbox.cpp
@@ -2789,6 +2830,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/helpext.cpp
     src/generic/hyperlinkg.cpp
     src/generic/laywin.cpp
+    src/generic/notifmsgg.cpp
     src/generic/odcombo.cpp
     src/generic/propdlg.cpp
     src/generic/sashwin.cpp
@@ -2800,16 +2842,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <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/datectrl.h
     wx/dateevt.h
     wx/dcbuffer.h
     wx/editlbox.h
     wx/generic/aboutdlgg.h
     wx/generic/bmpcbox.h
-    wx/generic/calctrl.h
+    wx/generic/calctrlg.h
     wx/generic/datectrl.h
     wx/generic/dataview.h
     wx/generic/grid.h
@@ -2818,6 +2860,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/helpext.h
     wx/generic/hyperlink.h
     wx/generic/laywin.h
+    wx/generic/notifmsg.h
     wx/generic/propdlg.h
     wx/generic/sashwin.h
     wx/generic/splash.h
@@ -2826,6 +2869,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/hyperlink.h
     wx/joystick.h
     wx/laywin.h
+    wx/notifmsg.h
     wx/odcombo.h
     wx/propdlg.h
     wx/sashwin.h
@@ -2836,29 +2880,30 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/wizard.h
 </set>
 
-<set var="ADVANCED_CMN_NATIVE_HDR" hints="files">
-    wx/datectrl.h
-    wx/dataview.h
-</set>
-
 <set var="ADVANCED_MSW_SRC" hints="files">
     src/common/taskbarcmn.cpp
     src/generic/animateg.cpp
     src/msw/aboutdlg.cpp
+    src/msw/notifmsg.cpp
     src/msw/sound.cpp
     src/msw/taskbar.cpp
 </set>
 <set var="ADVANCED_MSW_HDR" hints="files">
     wx/generic/animate.h
+    wx/msw/notifmsg.h
     wx/msw/sound.h
     wx/msw/taskbar.h
 </set>
 
 <!-- not used with wxUniv -->
 <set var="ADVANCED_MSW_NATIVE_SRC" hints="files">
+    src/msw/calctrl.cpp
+    src/msw/datecontrols.cpp
     src/msw/datectrl.cpp
 </set>
 <set var="ADVANCED_MSW_NATIVE_HDR" hints="files">
+    wx/msw/calctrl.h
+    wx/msw/datecontrols.h
     wx/msw/datectrl.h
 </set>
 
@@ -2883,6 +2928,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="ADVANCED_MAC_HDR" hints="files">
     wx/generic/animate.h
+    wx/mac/dataview.h
+    wx/mac/joystick.h
+    wx/mac/sound.h
     wx/mac/carbon/drawer.h
     wx/mac/carbon/dataview.h
     wx/mac/carbon/databrow.h
@@ -2937,18 +2985,22 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="ADVANCED_GTK_SRC" hints="files">
     src/gtk/taskbar.cpp
     src/gtk/eggtrayicon.c
+    src/gtk/hildon/notifmsg.cpp
 </set>
 <set var="ADVANCED_GTK_HDR" hints="files">
+    wx/gtk/hildon/notifmsg.h
 </set>
 
 <set var="ADVANCED_GTK_NATIVE_SRC" hints="files">
     src/gtk/aboutdlg.cpp
     src/gtk/animate.cpp
+    src/gtk/calctrl.cpp
     src/gtk/dataview.cpp
     src/gtk/hyperlink.cpp
 </set>
 <set var="ADVANCED_GTK_NATIVE_HDR" hints="files">
     wx/gtk/animate.h
+    wx/gtk/calctrl.h
     wx/gtk/dataview.h
     wx/gtk/hyperlink.h
 </set>
@@ -3391,9 +3443,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <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>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
-        <if cond="PLATFORM_MACOSX=='1'">$(BASE_AND_GUI_UNIX_SRC)</if>
         <if cond="PLATFORM_PALMOS=='1'">$(BASE_AND_GUI_PALMOS_SRC)</if>
         <if cond="PLATFORM_MSDOS=='1'">$(BASE_AND_GUI_MSDOS_SRC)</if>
         <!-- At the moment, BASE_AND_GUI_TOOLKIT_SRC handles this -->
@@ -3482,6 +3532,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_HDR)</if>
     </set>
 
+    <set var="PLATFORM_SRC" hints="files">
+        <if cond="PLATFORM_UNIX=='1'">$(UNIX_SRC)</if>
+        <if cond="PLATFORM_MACOSX=='1'">$(UNIX_SRC)</if>
+    </set>
+
     <set var="GUI_SRC" hints="files">
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_SRC)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_SRC)</if>
@@ -3505,10 +3560,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
     <set var="CORE_SRC" hints="files">
         <if cond="USE_GUI=='1' and WXUNIV=='0'">
-            $(LOWLEVEL_SRC) $(GUI_SRC) $(GUI_CMN_SRC)
+            $(LOWLEVEL_SRC) $(PLATFORM_SRC) $(GUI_SRC) $(GUI_CMN_SRC)
         </if>
         <if cond="USE_GUI=='1' and WXUNIV=='1'">
-            $(LOWLEVEL_SRC) $(UNIV_SRC) $(UNIV_THEMES_SRC) $(GUI_CMN_SRC)
+            $(LOWLEVEL_SRC) $(PLATFORM_SRC) $(UNIV_SRC) $(UNIV_THEMES_SRC) $(GUI_CMN_SRC)
         </if>
     </set>
 
@@ -3555,7 +3610,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="WXUNIV=='1'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC) $(ADVANCED_UNIV_SRC)</if>
     </set>
     <set var="ADVANCED_HDR" hints="files">
-        <if cond="WXUNIV=='0'">$(ADVANCED_CMN_HDR) $(ADVANCED_CMN_NATIVE_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_PLATFORM_NATIVE_HDR)</if>
+        <if cond="WXUNIV=='0'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_PLATFORM_NATIVE_HDR)</if>
         <if cond="WXUNIV=='1'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_UNIV_HDR)</if>
     </set>
 
@@ -3637,7 +3692,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(BASE_MSDOS_SRC)
         $(BASE_PALMOS_SRC)
         $(BASE_AND_GUI_CMN_SRC)
-        $(BASE_AND_GUI_UNIX_SRC)
         $(BASE_AND_GUI_MAC_SRC)
         $(BASE_AND_GUI_WIN32_SRC)
         $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_WINCE_SRC)