]> git.saurik.com Git - wxWidgets.git/blobdiff - build/bakefiles/files.bkl
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
-1, TRUE/true, FALSE/false and tabs replacements.
[wxWidgets.git] / build / bakefiles / files.bkl
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 410bf5cb770bc73bfd42100737f49dacdfc8ba8d..137e033651b6aacd2bff08e4a6955b17718dbbaf 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -78,6 +78,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/mslu.cpp
     src/msw/volume.cpp
 </set>
     src/msw/mslu.cpp
     src/msw/volume.cpp
 </set>
+<set var="BASE_WINCE_SRC" hints="files">
+    <if cond="TOOLKIT=='WINCE'">src/msw/wince/time.cpp</if>
+</set>
 <set var="BASE_WIN32_HDR" hints="files">
     wx/msw/apptrait.h
     wx/msw/apptbase.h
 <set var="BASE_WIN32_HDR" hints="files">
     wx/msw/apptrait.h
     wx/msw/apptbase.h
@@ -90,6 +93,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/wrapcctl.h
     wx/msw/wrapwin.h
 </set>
     wx/msw/wrapcctl.h
     wx/msw/wrapwin.h
 </set>
+<set var="BASE_WINCE_HDR" hints="files">
+    <if cond="TOOLKIT=='WINCE'">wx/msw/wince/time.h</if>
+</set>
 
 <set var="BASE_DARWIN_SRC" hints="files">
     src/unix/baseunix.cpp
 
 <set var="BASE_DARWIN_SRC" hints="files">
     src/unix/baseunix.cpp
@@ -105,14 +111,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="BASE_MAC_SRC" hints="files">
 </set>
 
 <set var="BASE_MAC_SRC" hints="files">
-    src/mac/dirmac.cpp
-    src/mac/mimetmac.cpp
+    src/mac/carbon/dirmac.cpp
+    src/mac/carbon/mimetmac.cpp
     src/unix/baseunix.cpp
     src/unix/baseunix.cpp
-    src/mac/utilsexc.cpp
+    src/mac/carbon/utilsexc.cpp
+    src/mac/carbon/thread.cpp
+    src/mac/carbon/macnotfy.cpp
+    src/mac/carbon/morefilex/MoreFilesX.c
 </set>
 
 <set var="BASE_AND_GUI_MAC_SRC" hints="files">
 </set>
 
 <set var="BASE_AND_GUI_MAC_SRC" hints="files">
-    src/mac/utils.cpp
+    src/mac/carbon/utils.cpp
+    src/mac/carbon/uma.cpp
 </set>
 
 <set var="BASE_MAC_HDR" hints="files">
 </set>
 
 <set var="BASE_MAC_HDR" hints="files">
@@ -120,6 +130,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="BASE_OS2_SRC" hints="files">
     src/os2/dir.cpp
 
 <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>
     src/os2/utils.cpp
     src/os2/utilsexc.cpp
 </set>
@@ -130,7 +142,6 @@ 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/clntdata.cpp
     src/common/cmdline.cpp
     src/common/config.cpp
     src/common/datetime.cpp
     src/common/cmdline.cpp
     src/common/config.cpp
     src/common/datetime.cpp
@@ -177,6 +188,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/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>
     src/common/zipstrm.cpp
     src/common/zstream.cpp
 </set>
@@ -196,7 +209,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/buffer.h
     wx/build.h
     wx/chkconf.h
     wx/buffer.h
     wx/build.h
     wx/chkconf.h
-    wx/clntdata.h
     wx/cmdline.h
     wx/confbase.h
     wx/config.h
     wx/cmdline.h
     wx/confbase.h
     wx/config.h
@@ -208,11 +220,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/debug.h
     wx/defs.h
     wx/dir.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/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
     wx/features.h
     wx/ffile.h
     wx/file.h
@@ -256,6 +270,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/regex.h
     wx/scopeguard.h
     wx/snglinst.h
     wx/regex.h
     wx/scopeguard.h
     wx/snglinst.h
+    wx/stack.h
     wx/stopwatch.h
     wx/strconv.h
     wx/stream.h
     wx/stopwatch.h
     wx/strconv.h
     wx/stream.h
@@ -278,6 +293,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/wx.h
     wx/wxchar.h
     wx/wxprec.h
     wx/wx.h
     wx/wxchar.h
     wx/wxprec.h
+    wx/xti.h
+    wx/xtistrm.h
     wx/zipstrm.h
     wx/zstream.h
 </set>
     wx/zipstrm.h
     wx/zstream.h
 </set>
@@ -296,11 +313,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="NET_WIN32_SRC" hints="files">
     src/msw/gsocket.c
 
 <set var="NET_WIN32_SRC" hints="files">
     src/msw/gsocket.c
+    src/msw/urlmsw.cpp
 </set>
 <set var="NET_WIN32_HDR" hints="files">
     wx/msw/gsockmsw.h
 </set>
 
 </set>
 <set var="NET_WIN32_HDR" hints="files">
     wx/msw/gsockmsw.h
 </set>
 
+<set var="NET_WINCE_SRC" hints="files">
+    <if cond="TOOLKIT=='WINCE'">src/msw/wince/net.cpp</if>
+</set>
+<set var="NET_WINCE_HDR" hints="files">
+    <if cond="TOOLKIT=='WINCE'">wx/msw/wince/net.h</if>
+</set>
+
 <set var="NET_DARWIN_SRC" hints="files">
     src/unix/gsocket.c
 </set>
 <set var="NET_DARWIN_SRC" hints="files">
     src/unix/gsocket.c
 </set>
@@ -308,16 +333,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/unix/gsockunx.h
 </set>
 
     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">
 <set var="NET_OS2_SRC" hints="files">
+    src/unix/gsocket.c
 </set>
 <set var="NET_OS2_HDR" hints="files">
 </set>
 <set var="NET_OS2_HDR" hints="files">
+    wx/unix/gsockunx.h
 </set>
 
 <set var="NET_CMN_SRC" hints="files">
 </set>
 
 <set var="NET_CMN_SRC" hints="files">
@@ -358,8 +378,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/artprov.cpp
     src/common/artstd.cpp
     src/common/bmpbase.cpp
+    src/common/bookctrl.cpp
     src/common/choiccmn.cpp
     src/common/clipcmn.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
     src/common/cmdproc.cpp
     src/common/cmndata.cpp
     src/common/containr.cpp
@@ -382,6 +404,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/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
     src/common/gdicmn.cpp
     src/common/geometry.cpp
     src/common/gifdecod.cpp
@@ -429,6 +452,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/dcpsg.cpp
     src/generic/dirctrlg.cpp
     src/generic/dragimgg.cpp
     src/generic/dcpsg.cpp
     src/generic/dirctrlg.cpp
     src/generic/dragimgg.cpp
+    src/generic/listbkg.cpp
     src/generic/logg.cpp
     src/generic/numdlgg.cpp
     src/generic/panelg.cpp
     src/generic/logg.cpp
     src/generic/numdlgg.cpp
     src/generic/panelg.cpp
@@ -453,6 +477,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/checklst.h
     wx/choicdlg.h
     wx/choice.h
     wx/checklst.h
     wx/choicdlg.h
     wx/choice.h
+    wx/clntdata.h
     wx/cmndata.h
     wx/combobox.h
     wx/control.h
     wx/cmndata.h
     wx/combobox.h
     wx/control.h
@@ -466,9 +491,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/dialog.h
     wx/dirdlg.h
     wx/dragimag.h
     wx/dialog.h
     wx/dirdlg.h
     wx/dragimag.h
+    wx/encinfo.h
     wx/filedlg.h
     wx/frame.h
     wx/gauge.h
     wx/filedlg.h
     wx/frame.h
     wx/gauge.h
+    wx/gbsizer.h
     wx/gdicmn.h
     wx/generic/accel.h
     wx/generic/choicdgg.h
     wx/gdicmn.h
     wx/generic/accel.h
     wx/generic/choicdgg.h
@@ -481,6 +508,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/imaglist.h
     wx/generic/logg.h
     wx/generic/msgdlgg.h
     wx/generic/imaglist.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/notebook.h
     wx/generic/panelg.h
     wx/generic/prntdlgg.h
@@ -499,6 +527,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mdi.h
     wx/menu.h
     wx/msgdlg.h
     wx/mdi.h
     wx/menu.h
     wx/msgdlg.h
+    wx/numdlg.h
     wx/palette.h
     wx/panel.h
     wx/pen.h
     wx/palette.h
     wx/panel.h
     wx/pen.h
@@ -527,6 +556,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/access.h
     wx/artprov.h
     wx/bitmap.h
     wx/access.h
     wx/artprov.h
     wx/bitmap.h
+    wx/bookctrl.h
     wx/busyinfo.h
     wx/caret.h
     wx/clipbrd.h
     wx/busyinfo.h
     wx/caret.h
     wx/clipbrd.h
@@ -571,6 +601,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/imagtiff.h
     wx/imagxpm.h
     wx/listbase.h
     wx/imagtiff.h
     wx/imagxpm.h
     wx/listbase.h
+    wx/listbook.h
     wx/listctrl.h
     wx/matrix.h
     wx/menuitem.h
     wx/listctrl.h
     wx/matrix.h
     wx/menuitem.h
@@ -592,7 +623,6 @@ 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/stack.h
     wx/statline.h
     wx/tab.h
     wx/tabctrl.h
     wx/statline.h
     wx/tab.h
     wx/tabctrl.h
@@ -604,6 +634,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/treebase.h
     wx/treectrl.h
     wx/valgen.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/vlbox.h
     wx/vms_x_fix.h
     wx/vscroll.h
@@ -622,11 +653,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/unix/fontenum.cpp
     src/unix/fontutil.cpp
     src/unix/utilsx11.cpp
     src/unix/fontenum.cpp
     src/unix/fontutil.cpp
     src/unix/utilsx11.cpp
+    src/unix/displayx11.cpp
 </set>
 <set var="XWIN_LOWLEVEL_HDR" hints="files">
     wx/generic/caret.h
     wx/unix/fontutil.h
     wx/unix/utilsx11.h
 </set>
 <set var="XWIN_LOWLEVEL_HDR" hints="files">
     wx/generic/caret.h
     wx/unix/fontutil.h
     wx/unix/utilsx11.h
+    wx/unix/displayx11.h
 </set>
 
 
 </set>
 
 
@@ -656,6 +689,7 @@ 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/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/pen.cpp
     src/gtk/popupwin.cpp
     src/gtk/region.cpp
@@ -685,12 +719,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
     src/generic/tabg.cpp
     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
     src/gtk/checkbox.cpp
     src/gtk/checklst.cpp
     src/gtk/choice.cpp
     <!-- GTK+ specific files: -->
     src/gtk/bmpbuttn.cpp
     src/gtk/button.cpp
     src/gtk/checkbox.cpp
     src/gtk/checklst.cpp
     src/gtk/choice.cpp
+    src/gtk/colordlg.cpp
     src/gtk/combobox.cpp
     src/gtk/control.cpp
     src/gtk/dialog.cpp
     src/gtk/combobox.cpp
     src/gtk/control.cpp
     src/gtk/dialog.cpp
@@ -700,7 +737,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/listbox.cpp
     src/gtk/mdi.cpp
     src/gtk/menu.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/msgdlg.cpp
     src/gtk/notebook.cpp
     src/gtk/radiobox.cpp
@@ -720,6 +756,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/utilsres.cpp
 </set>
 <set var="GTK_HDR" hints="files">
     src/gtk/utilsres.cpp
 </set>
 <set var="GTK_HDR" hints="files">
+    wx/generic/colrdlgg.h
     wx/generic/dirdlgg.h
     wx/generic/fdrepdlg.h
     wx/generic/listctrl.h
     wx/generic/dirdlgg.h
     wx/generic/fdrepdlg.h
     wx/generic/listctrl.h
@@ -733,6 +770,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/colordlg.h
     wx/gtk/choice.h
     wx/gtk/clipbrd.h
     wx/gtk/colour.h
     wx/gtk/choice.h
     wx/gtk/clipbrd.h
     wx/gtk/colour.h
@@ -802,6 +840,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="MOTIF_LOWLEVEL_HDR" hints="files">
     $(XWIN_LOWLEVEL_HDR)
 </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
 </set>
 <set var="MOTIF_SRC" hints="files">
     src/motif/accel.cpp
@@ -841,6 +883,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/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
     src/motif/radiobox.cpp
     src/motif/radiobut.cpp
     src/motif/scrolbar.cpp
@@ -856,6 +899,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/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
     <!-- Generic files used by wxMotif: -->
     src/generic/colrdlgg.cpp
     src/generic/dirdlgg.cpp
@@ -896,6 +940,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/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
     wx/motif/dc.h
     wx/motif/dcclient.h
     wx/motif/dcmemory.h
@@ -916,13 +961,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/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/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
     wx/motif/slider.h
     wx/motif/spinbutt.h
     wx/motif/statbmp.h
@@ -999,6 +1044,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/x11/minifram.h
     wx/x11/palette.h
     wx/x11/pen.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
     wx/x11/print.h
     wx/x11/private.h
     wx/x11/privx.h
@@ -1031,7 +1077,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/dcscreen.cpp
     src/msw/dialup.cpp
     src/msw/dib.cpp
     src/msw/dcscreen.cpp
     src/msw/dialup.cpp
     src/msw/dib.cpp
-    src/msw/dirdlg.cpp
     src/msw/display.cpp
     src/msw/enhmeta.cpp
     src/msw/evtloop.cpp
     src/msw/display.cpp
     src/msw/enhmeta.cpp
     src/msw/evtloop.cpp
@@ -1041,16 +1086,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/gdiimage.cpp
     src/msw/gdiobj.cpp
     src/msw/gsockmsw.c
     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/minifram.cpp
     src/msw/icon.cpp
     src/msw/minifram.cpp
-    src/msw/ole/automtn.cpp
     src/msw/ole/dataobj.cpp
     src/msw/ole/dropsrc.cpp
     src/msw/ole/droptgt.cpp
     src/msw/ole/oleutils.cpp
     src/msw/ole/dataobj.cpp
     src/msw/ole/dropsrc.cpp
     src/msw/ole/droptgt.cpp
     src/msw/ole/oleutils.cpp
-    src/msw/ole/uuid.cpp
     src/msw/palette.cpp
     src/msw/pen.cpp
     src/msw/popupwin.cpp
     src/msw/palette.cpp
     src/msw/pen.cpp
     src/msw/popupwin.cpp
@@ -1068,8 +1109,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="MSW_LOWLEVEL_HDR" hints="files">
 </set>
 </set>
 <set var="MSW_LOWLEVEL_HDR" hints="files">
 </set>
+
+<set var="MSW_ONLY_LOWLEVEL_SRC" hints="files">
+    src/msw/ole/automtn.cpp
+    src/msw/ole/uuid.cpp
+    src/msw/dirdlg.cpp
+</set>
+
 <set var="MSW_SRC" hints="files">
     src/generic/statusbr.cpp
 <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
     src/msw/accel.cpp
     src/msw/bmpbuttn.cpp
     src/msw/button.cpp
@@ -1081,9 +1130,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/control.cpp
     src/msw/dialog.cpp
     src/msw/dragimag.cpp
     src/msw/control.cpp
     src/msw/dialog.cpp
     src/msw/dragimag.cpp
-    src/msw/fdrepdlg.cpp
     src/msw/filedlg.cpp
     src/msw/filedlg.cpp
-    src/msw/fontdlg.cpp
     src/msw/frame.cpp
     src/msw/gauge95.cpp
     src/msw/imaglist.cpp
     src/msw/frame.cpp
     src/msw/gauge95.cpp
     src/msw/imaglist.cpp
@@ -1143,17 +1190,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/dirdlg.h
     wx/msw/dragimag.h
     wx/msw/enhmeta.h
     wx/msw/dirdlg.h
     wx/msw/dragimag.h
     wx/msw/enhmeta.h
-    wx/msw/fdrepdlg.h
     wx/msw/filedlg.h
     wx/msw/font.h
     wx/msw/filedlg.h
     wx/msw/font.h
-    wx/msw/fontdlg.h
     wx/msw/frame.h
     wx/msw/gauge95.h
     wx/msw/gdiimage.h
     wx/msw/gdiobj.h
     wx/msw/frame.h
     wx/msw/gauge95.h
     wx/msw/gdiimage.h
     wx/msw/gdiobj.h
-    wx/msw/helpbest.h
-    wx/msw/helpchm.h
-    wx/msw/helpwin.h
     wx/msw/icon.h
     wx/msw/imaglist.h
     wx/msw/iniconf.h
     wx/msw/icon.h
     wx/msw/imaglist.h
     wx/msw/iniconf.h
@@ -1170,14 +1212,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/msvcrt.h
     wx/msw/notebook.h
     wx/msw/ole/access.h
     wx/msw/msvcrt.h
     wx/msw/notebook.h
     wx/msw/ole/access.h
-    wx/msw/ole/automtn.h
     wx/msw/ole/dataform.h
     wx/msw/ole/dataobj.h
     wx/msw/ole/dataobj2.h
     wx/msw/ole/dropsrc.h
     wx/msw/ole/droptgt.h
     wx/msw/ole/oleutils.h
     wx/msw/ole/dataform.h
     wx/msw/ole/dataobj.h
     wx/msw/ole/dataobj2.h
     wx/msw/ole/dropsrc.h
     wx/msw/ole/droptgt.h
     wx/msw/ole/oleutils.h
-    wx/msw/ole/uuid.h
     wx/msw/palette.h
     wx/msw/pen.h
     wx/msw/printdlg.h
     wx/msw/palette.h
     wx/msw/pen.h
     wx/msw/printdlg.h
@@ -1253,6 +1293,44 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/warning.ico
 </set>
 
     wx/msw/warning.ico
 </set>
 
+<!-- Files used only by desktop MSW port, but *not* WindowsCE one: -->
+<set var="MSW_ONLY_SRC" hints="files">
+    src/msw/fdrepdlg.cpp
+    src/msw/fontdlg.cpp
+    src/msw/helpchm.cpp
+    src/msw/helpwin.cpp
+</set>
+<set var="MSW_ONLY_HDR" hints="files">
+    wx/msw/fdrepdlg.h
+    wx/msw/fontdlg.h
+    wx/msw/helpbest.h
+    wx/msw/helpchm.h
+    wx/msw/helpwin.h
+    wx/msw/ole/automtn.h
+    wx/msw/ole/uuid.h
+</set>
+
+<!-- Files used by WindowsCE port but not by desktop MSW port: -->
+<set var="WINCE_SRC" hints="files">
+    src/generic/dirdlgg.cpp
+    src/generic/fdrepdlg.cpp
+    src/generic/fontdlgg.cpp
+    src/msw/wince/crt.cpp
+    src/msw/wince/filedlgwce.cpp
+    src/msw/wince/helpwce.cpp
+    src/msw/wince/tbarwce.cpp
+    src/msw/wince/menuce.cpp
+</set>
+<set var="WINCE_HDR" hints="files">
+    wx/generic/fdrepdlg.h
+    wx/generic/fontdlgg.h
+    wx/msw/wince/helpwce.h
+    wx/msw/wince/libraries.h
+    wx/msw/wince/missing.h
+    wx/msw/wince/tbarwce.h
+    wx/msw/wince/resources.h
+</set>
+
 
 <!-- ====================================================================== -->
 <!--                                wxMGL                                   -->
 
 <!-- ====================================================================== -->
 <!--                                wxMGL                                   -->
@@ -1323,7 +1401,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">
 <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/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
     src/os2/accel.cpp
     src/os2/app.cpp
     src/os2/bitmap.cpp
@@ -1347,6 +1436,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/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
     src/os2/filedlg.cpp
     src/os2/font.cpp
     src/os2/fontdlg.cpp
@@ -1356,7 +1446,6 @@ 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/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/gsockpm.c
     src/os2/helpwin.cpp
     src/os2/icon.cpp
@@ -1366,7 +1455,6 @@ 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/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
     src/os2/msgdlg.cpp
     src/os2/nativdlg.cpp
     src/os2/notebook.cpp
@@ -1388,15 +1476,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/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/timer.cpp
     src/os2/toolbar.cpp
     src/os2/tooltip.cpp
     src/os2/toplevel.cpp
+    src/os2/utilsgui.cpp
     src/os2/window.cpp
 </set>
 <set var="OS2_HDR" hints="files">
     wx/generic/caret.h
     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
     wx/os2/accel.h
     wx/os2/app.h
     wx/os2/bitmap.h
@@ -1428,7 +1522,6 @@ 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/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/helpwin.h
     wx/os2/icon.h
     wx/os2/iniconf.h
@@ -1478,78 +1571,78 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="MAC_LOWLEVEL_HDR" hints="files">
 </set>
 <set var="MAC_SRC" hints="files">
 <set var="MAC_LOWLEVEL_HDR" hints="files">
 </set>
 <set var="MAC_SRC" hints="files">
-    src/mac/accel.cpp
-    src/mac/aga.cpp
-    src/mac/app.cpp
-    src/mac/bitmap.cpp
-    src/mac/bmpbuttn.cpp
-    src/mac/brush.cpp
-    src/mac/button.cpp
-    src/mac/checkbox.cpp
-    src/mac/checklst.cpp
-    src/mac/choice.cpp
-    src/mac/clipbrd.cpp
-    src/mac/colordlg.cpp
-    src/mac/colour.cpp
-    src/mac/combobox.cpp
-    src/mac/control.cpp
-    src/mac/cursor.cpp
-    src/mac/data.cpp
-    src/mac/dataobj.cpp
-    src/mac/dc.cpp
-    src/mac/dcclient.cpp
-    src/mac/dcmemory.cpp
-    src/mac/dcprint.cpp
-    src/mac/dcscreen.cpp
-    src/mac/dialog.cpp
-    src/mac/dirdlg.cpp
-    src/mac/dnd.cpp
-    src/mac/filedlg.cpp
-    src/mac/font.cpp
-    src/mac/fontdlg.cpp
-    src/mac/fontenum.cpp
-    src/mac/fontutil.cpp
-    src/mac/frame.cpp
-    src/mac/gauge.cpp
-    src/mac/gdiobj.cpp
-    src/mac/icon.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
-    src/mac/pen.cpp
-    src/mac/pnghand.cpp
-    src/mac/printdlg.cpp
-    src/mac/printmac.cpp
-    src/mac/radiobox.cpp
-    src/mac/radiobut.cpp
-    src/mac/region.cpp
-    src/mac/renderer.cpp
-    src/mac/scrolbar.cpp
-    src/mac/settings.cpp
-    src/mac/slider.cpp
-    src/mac/spinbutt.cpp
-    src/mac/statbmp.cpp
-    src/mac/statbox.cpp
-    src/mac/statbrma.cpp
-    src/mac/statlmac.cpp
-    src/mac/stattext.cpp
-    src/mac/tabctrl.cpp
-    src/mac/textctrl.cpp
-    src/mac/thread.cpp
-    src/mac/timer.cpp
-    src/mac/toolbar.cpp
-    src/mac/tooltip.cpp
-    src/mac/toplevel.cpp
-    src/mac/uma.cpp
-    src/mac/window.cpp
+    src/mac/carbon/accel.cpp
+    src/mac/carbon/aga.cpp
+    src/mac/carbon/app.cpp
+    src/mac/carbon/bitmap.cpp
+    src/mac/carbon/bmpbuttn.cpp
+    src/mac/carbon/brush.cpp
+    src/mac/carbon/button.cpp
+    src/mac/carbon/checkbox.cpp
+    src/mac/carbon/checklst.cpp
+    src/mac/carbon/choice.cpp
+    src/mac/carbon/clipbrd.cpp
+    src/mac/carbon/colordlg.cpp
+    src/mac/carbon/colour.cpp
+    src/mac/carbon/combobox.cpp
+    src/mac/carbon/control.cpp
+    src/mac/carbon/cursor.cpp
+    src/mac/carbon/data.cpp
+    src/mac/carbon/dataobj.cpp
+    src/mac/carbon/dc.cpp
+    src/mac/carbon/dcclient.cpp
+    src/mac/carbon/dcmemory.cpp
+    src/mac/carbon/dcprint.cpp
+    src/mac/carbon/dcscreen.cpp
+    src/mac/carbon/dialog.cpp
+    src/mac/carbon/dirdlg.cpp
+    src/mac/carbon/display.cpp
+    src/mac/carbon/dnd.cpp
+    src/mac/carbon/filedlg.cpp
+    src/mac/carbon/font.cpp
+    src/mac/carbon/fontdlg.cpp
+    src/mac/carbon/fontenum.cpp
+    src/mac/carbon/fontutil.cpp
+    src/mac/carbon/frame.cpp
+    src/mac/carbon/gauge.cpp
+    src/mac/carbon/gdiobj.cpp
+    src/mac/carbon/gsockosx.c
+    src/mac/carbon/icon.cpp
+    src/mac/carbon/listbox.cpp
+    src/mac/carbon/mdi.cpp
+    src/mac/carbon/menu.cpp
+    src/mac/carbon/menuitem.cpp
+    src/mac/carbon/metafile.cpp
+    src/mac/carbon/minifram.cpp
+    src/mac/carbon/msgdlg.cpp
+    src/mac/carbon/notebmac.cpp
+    src/mac/carbon/palette.cpp
+    src/mac/carbon/pen.cpp
+    src/mac/carbon/pnghand.cpp
+    src/mac/carbon/printdlg.cpp
+    src/mac/carbon/printmac.cpp
+    src/mac/carbon/radiobox.cpp
+    src/mac/carbon/radiobut.cpp
+    src/mac/carbon/region.cpp
+    src/mac/carbon/renderer.cpp
+    src/mac/carbon/scrolbar.cpp
+    src/mac/carbon/settings.cpp
+    src/mac/carbon/slider.cpp
+    src/mac/carbon/spinbutt.cpp
+    src/mac/carbon/spinctrl.cpp
+    src/mac/carbon/statbmp.cpp
+    src/mac/carbon/statbox.cpp
+    src/mac/carbon/statbrma.cpp
+    src/mac/carbon/statlmac.cpp
+    src/mac/carbon/stattext.cpp
+    src/mac/carbon/tabctrl.cpp
+    src/mac/carbon/textctrl.cpp
+    src/mac/carbon/timer.cpp
+    src/mac/carbon/tglbtn.cpp
+    src/mac/carbon/toolbar.cpp
+    src/mac/carbon/tooltip.cpp
+    src/mac/carbon/toplevel.cpp
+    src/mac/carbon/window.cpp
     <!-- Generic implementations used by wxMac: -->
     src/generic/caret.cpp
     src/generic/fdrepdlg.cpp
     <!-- Generic implementations used by wxMac: -->
     src/generic/caret.cpp
     src/generic/fdrepdlg.cpp
@@ -1561,8 +1654,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/tabg.cpp
     <!-- Unix files used by wxMac: -->
     src/unix/snglinst.cpp
     src/generic/tabg.cpp
     <!-- Unix files used by wxMac: -->
     src/unix/snglinst.cpp
+    <!-- wxWebKit files -->
+    src/html/htmlctrl/webkit/webkit.mm
 </set>
 </set>
-<set var="MAC_HDR" hints="files">
+<!-- Header files like wx/mac/foo.h which include wx/mac/carbon/foo.h -->
+<set var="MAC_CMN_HDR" hints="files">
     wx/mac/accel.h
     wx/mac/aga.h
     wx/mac/app.h
     wx/mac/accel.h
     wx/mac/aga.h
     wx/mac/app.h
@@ -1590,6 +1686,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/dcscreen.h
     wx/mac/dialog.h
     wx/mac/dirdlg.h
     wx/mac/dcscreen.h
     wx/mac/dialog.h
     wx/mac/dirdlg.h
+    wx/mac/display.h
     wx/mac/dnd.h
     wx/mac/filedlg.h
     wx/mac/font.h
     wx/mac/dnd.h
     wx/mac/filedlg.h
     wx/mac/font.h
@@ -1597,6 +1694,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/frame.h
     wx/mac/gauge.h
     wx/mac/gdiobj.h
     wx/mac/frame.h
     wx/mac/gauge.h
     wx/mac/gdiobj.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
@@ -1625,6 +1723,7 @@ 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/region.h
     wx/mac/scrolbar.h
     wx/mac/slider.h
+    wx/mac/sound.h
     wx/mac/spinbutt.h
     wx/mac/spinctrl.h
     wx/mac/statbmp.h
     wx/mac/spinbutt.h
     wx/mac/spinctrl.h
     wx/mac/statbmp.h
@@ -1635,12 +1734,96 @@ 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/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/window.h
     wx/mac/toolbar.h
     wx/mac/tooltip.h
     wx/mac/toplevel.h
     wx/mac/treectrl.h
     wx/mac/uma.h
     wx/mac/window.h
+</set>
+<!-- wxMac Carbon header files -->
+<set var="MAC_HDR" hints="files">
+    wx/mac/carbon/accel.h
+    wx/mac/carbon/aga.h
+    wx/mac/carbon/app.h
+    wx/mac/carbon/bitmap.h
+    wx/mac/carbon/bmpbuttn.h
+    wx/mac/carbon/brush.h
+    wx/mac/carbon/button.h
+    wx/mac/carbon/checkbox.h
+    wx/mac/carbon/checklst.h
+    wx/mac/carbon/chkconf.h
+    wx/mac/carbon/choice.h
+    wx/mac/carbon/clipbrd.h
+    wx/mac/carbon/colordlg.h
+    wx/mac/carbon/colour.h
+    wx/mac/carbon/combobox.h
+    wx/mac/carbon/control.h
+    wx/mac/carbon/cursor.h
+    wx/mac/carbon/dataform.h
+    wx/mac/carbon/dataobj.h
+    wx/mac/carbon/dataobj2.h
+    wx/mac/carbon/dc.h
+    wx/mac/carbon/dcclient.h
+    wx/mac/carbon/dcmemory.h
+    wx/mac/carbon/dcprint.h
+    wx/mac/carbon/dcscreen.h
+    wx/mac/carbon/dialog.h
+    wx/mac/carbon/dirdlg.h
+    wx/mac/carbon/display.h
+    wx/mac/carbon/dnd.h
+    wx/mac/carbon/filedlg.h
+    wx/mac/carbon/font.h
+    wx/mac/carbon/fontdlg.h
+    wx/mac/carbon/frame.h
+    wx/mac/carbon/gauge.h
+    wx/mac/carbon/gdiobj.h
+    wx/mac/carbon/gsockmac.h
+    wx/mac/carbon/helpxxxx.h
+    wx/mac/carbon/icon.h
+    wx/mac/carbon/imaglist.h
+    wx/mac/carbon/listbox.h
+    wx/mac/carbon/listctrl.h
+    wx/mac/carbon/macnotfy.h
+    wx/mac/carbon/macsock.h
+    wx/mac/carbon/mdi.h
+    wx/mac/carbon/menu.h
+    wx/mac/carbon/menuitem.h
+    wx/mac/carbon/metafile.h
+    wx/mac/carbon/mimetype.h
+    wx/mac/carbon/minifram.h
+    wx/mac/carbon/msgdlg.h
+    wx/mac/carbon/notebook.h
+    wx/mac/carbon/palette.h
+    wx/mac/carbon/pen.h
+    wx/mac/carbon/pnghand.h
+    wx/mac/carbon/pngread.h
+    wx/mac/carbon/printdlg.h
+    wx/mac/carbon/printmac.h
+    wx/mac/carbon/private.h
+    wx/mac/carbon/radiobox.h
+    wx/mac/carbon/radiobut.h
+    wx/mac/carbon/region.h
+    wx/mac/carbon/scrolbar.h
+    wx/mac/carbon/slider.h
+    wx/mac/carbon/spinbutt.h
+    wx/mac/carbon/spinctrl.h
+    wx/mac/carbon/statbmp.h
+    wx/mac/carbon/statbox.h
+    wx/mac/carbon/statline.h
+    wx/mac/carbon/stattext.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/toplevel.h
+    wx/mac/carbon/treectrl.h
+    wx/mac/carbon/uma.h
+    wx/mac/carbon/window.h
     <!-- Generic implementations used by wxMac: -->
     wx/generic/caret.h
     wx/generic/fdrepdlg.h
     <!-- Generic implementations used by wxMac: -->
     wx/generic/caret.h
     wx/generic/fdrepdlg.h
@@ -1649,6 +1832,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/listctrl.h
     wx/generic/statusbr.h
     wx/generic/tabg.h
     wx/generic/listctrl.h
     wx/generic/statusbr.h
     wx/generic/tabg.h
+    <!-- wxWebKit headers -->
+    wx/html/webkit.h
 </set>
 
 
 </set>
 
 
@@ -1666,10 +1851,12 @@ 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/NSControl.mm
     src/cocoa/NSMenu.mm
     src/cocoa/NSPanel.mm
+    src/cocoa/NSTabView.mm
     src/cocoa/NSTableView.mm
     src/cocoa/NSTextField.mm
     src/cocoa/NSView.mm
     src/cocoa/NSWindow.mm
     src/cocoa/NSTableView.mm
     src/cocoa/NSTextField.mm
     src/cocoa/NSView.mm
     src/cocoa/NSWindow.mm
+    src/cocoa/ObjcRef.mm
     src/cocoa/app.mm
     src/cocoa/bitmap.mm
     src/cocoa/bmpbuttn.mm
     src/cocoa/app.mm
     src/cocoa/bitmap.mm
     src/cocoa/bmpbuttn.mm
@@ -1690,21 +1877,25 @@ 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/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/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/listbox.mm
     src/cocoa/main.cpp
+    src/cocoa/mbarman.mm
+    src/cocoa/mdi.mm
     src/cocoa/menu.mm
     src/cocoa/menuitem.mm
     src/cocoa/menu.mm
     src/cocoa/menuitem.mm
+    src/cocoa/notebook.mm
     src/cocoa/pen.mm
     src/cocoa/radiobox.mm
     src/cocoa/radiobut.mm
     src/cocoa/pen.mm
     src/cocoa/radiobox.mm
     src/cocoa/radiobut.mm
-    src/cocoa/region.cpp
+    src/cocoa/region.mm
     src/cocoa/settings.cpp
     src/cocoa/slider.mm
     src/cocoa/spinbutt.mm
     src/cocoa/settings.cpp
     src/cocoa/slider.mm
     src/cocoa/spinbutt.mm
@@ -1713,6 +1904,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/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
     src/cocoa/toplevel.mm
     src/cocoa/utils.cpp
     src/cocoa/utilsexc.cpp
@@ -1727,26 +1919,30 @@ 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/fontdlgg.cpp
     src/generic/imaglist.cpp
     src/generic/listctrl.cpp
-    src/generic/mdig.cpp
     src/generic/msgdlgg.cpp
     src/generic/msgdlgg.cpp
-    src/generic/notebook.cpp
     src/generic/paletteg.cpp
     src/generic/paletteg.cpp
+    src/generic/regiong.cpp
     src/generic/statusbr.cpp
     src/generic/tabg.cpp
     src/generic/timer.cpp
     src/generic/statusbr.cpp
     src/generic/tabg.cpp
     src/generic/timer.cpp
+    <!-- wxMac stuff used by wxCocoa: -->
+    src/mac/carbon/gsockosx.c
 </set>
 <set var="COCOA_HDR" hints="files">
 </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/NSBox.h
     wx/cocoa/NSButton.h
     wx/cocoa/NSControl.h
     wx/cocoa/NSMenu.h
     wx/cocoa/NSPanel.h
+    wx/cocoa/NSTabView.h
     wx/cocoa/NSTableView.h
     wx/cocoa/NSTextField.h
     wx/cocoa/NSView.h
     wx/cocoa/NSWindow.h
     wx/cocoa/ObjcAssociate.h
     wx/cocoa/ObjcPose.h
     wx/cocoa/NSTableView.h
     wx/cocoa/NSTextField.h
     wx/cocoa/NSView.h
     wx/cocoa/NSWindow.h
     wx/cocoa/ObjcAssociate.h
     wx/cocoa/ObjcPose.h
+    wx/cocoa/ObjcRef.h
     wx/cocoa/app.h
     wx/cocoa/bitmap.h
     wx/cocoa/bmpbuttn.h
     wx/cocoa/app.h
     wx/cocoa/bitmap.h
     wx/cocoa/bmpbuttn.h
@@ -1774,28 +1970,35 @@ 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/gdiobj.h
     wx/cocoa/icon.h
     wx/cocoa/listbox.h
+    wx/cocoa/log.h
+    wx/cocoa/mbarman.h
+    wx/cocoa/mdi.h
     wx/cocoa/menu.h
     wx/cocoa/menuitem.h
     wx/cocoa/menu.h
     wx/cocoa/menuitem.h
+    wx/cocoa/notebook.h
     wx/cocoa/pen.h
     wx/cocoa/radiobox.h
     wx/cocoa/radiobut.h
     wx/cocoa/region.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/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/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/fdrepdlg.h
     wx/generic/fontdlgg.h
     wx/generic/imaglist.h
     wx/generic/listctrl.h
-    wx/generic/mdig.h
     wx/generic/paletteg.h
     wx/generic/paletteg.h
+    wx/generic/region.h
     wx/generic/statusbr.h
     wx/generic/tabg.h
 </set>
     wx/generic/statusbr.h
     wx/generic/tabg.h
 </set>
@@ -1916,7 +2119,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="ADVANCED_CMN_SRC" hints="files">
     src/generic/calctrl.cpp
 
 <set var="ADVANCED_CMN_SRC" hints="files">
     src/generic/calctrl.cpp
-    src/generic/dcbuffer.cpp
     src/generic/grid.cpp
     src/generic/gridctrl.cpp
     src/generic/gridsel.cpp
     src/generic/grid.cpp
     src/generic/gridctrl.cpp
     src/generic/gridsel.cpp
@@ -1944,6 +2146,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/joystick.h
     wx/laywin.h
     wx/sashwin.h
     wx/joystick.h
     wx/laywin.h
     wx/sashwin.h
+    wx/sound.h
     wx/splash.h
     wx/taskbar.h
     wx/tipdlg.h
     wx/splash.h
     wx/taskbar.h
     wx/tipdlg.h
@@ -1953,44 +2156,54 @@ 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/joystick.cpp
+    src/msw/sound.cpp
     src/msw/taskbar.cpp
     src/msw/taskbar.cpp
-    src/msw/wave.cpp
 </set>
 <set var="ADVANCED_MSW_HDR" hints="files">
 </set>
 <set var="ADVANCED_MSW_HDR" hints="files">
-    wx/msw/joystick.h
+    wx/msw/sound.h
     wx/msw/taskbar.h
     wx/msw/taskbar.h
-    wx/msw/wave.h
+</set>
+<!-- not built on WindowsCE: -->
+<set var="ADVANCED_MSW_ONLY_SRC" hints="files">
+    src/msw/joystick.cpp
+</set>
+<set var="ADVANCED_MSW_ONLY_HDR" hints="files">
+    wx/msw/joystick.h
 </set>
 
 <set var="ADVANCED_MAC_SRC" hints="files">
 </set>
 
 <set var="ADVANCED_MAC_SRC" hints="files">
-    src/mac/joystick.cpp
-    src/mac/wave.cpp
+    src/mac/carbon/joystick.cpp
+    src/mac/carbon/sound.cpp
 </set>
 <set var="ADVANCED_MAC_HDR" hints="files">
 </set>
 <set var="ADVANCED_MAC_HDR" hints="files">
-    wx/mac/joystick.h
-    wx/mac/wave.h
+    wx/mac/carbon/joystick.h
+    wx/mac/carbon/sound.h
 </set>
 
 <set var="ADVANCED_OS2_SRC" hints="files">
     src/os2/joystick.cpp
 </set>
 
 <set var="ADVANCED_OS2_SRC" hints="files">
     src/os2/joystick.cpp
-    src/os2/wave.cpp
+    src/os2/sound.cpp
 </set>
 <set var="ADVANCED_OS2_HDR" hints="files">
     wx/os2/joystick.h
 </set>
 <set var="ADVANCED_OS2_HDR" hints="files">
     wx/os2/joystick.h
-    wx/os2/wave.h
+    wx/os2/sound.h
 </set>
 
 <set var="ADVANCED_UNIX_SRC" hints="files">
     src/common/taskbarcmn.cpp
     src/unix/joystick.cpp
 </set>
 
 <set var="ADVANCED_UNIX_SRC" hints="files">
     src/common/taskbarcmn.cpp
     src/unix/joystick.cpp
+    src/unix/sound.cpp
     src/unix/taskbarx11.cpp
     src/unix/taskbarx11.cpp
-    src/unix/wave.cpp
 </set>
 <set var="ADVANCED_UNIX_HDR" hints="files">
     wx/unix/joystick.h
 </set>
 <set var="ADVANCED_UNIX_HDR" hints="files">
     wx/unix/joystick.h
+    wx/unix/sound.h
     wx/unix/taskbarx11.h
     wx/unix/taskbarx11.h
-    wx/unix/wave.h
+</set>
+
+<set var="ADVANCED_GTK_SRC" hints="files">
+    src/gtk/taskbar.cpp
+    src/gtk/eggtrayicon.c
 </set>
 
 
 </set>
 
 
@@ -2002,6 +2215,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <if cond="TOOLKIT=='MSW'">
         src/msw/helpbest.cpp
     </if>
     <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)
 </set>
 <set var="HTML_SRC" hints="files">
     $(HTML_SRC_PLATFORM)
@@ -2056,9 +2275,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="XML_SRC" hints="files">
     src/xml/xml.cpp
 
 <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
 </set>
 <set var="XML_HDR" hints="files">
     wx/xml/xml.h
+    wx/xtixml.h <!-- FIXME - temporary solution -->
 </set>
 
 
 </set>
 
 
@@ -2067,19 +2288,21 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <set var="OPENGL_SRC" hints="files">
 <!-- ====================================================================== -->
 
 <set var="OPENGL_SRC" hints="files">
-    <if cond="TOOLKIT=='MAC'">src/mac/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='MAC'">src/mac/carbon/glcanvas.cpp</if>
     <if cond="TOOLKIT=='GTK'">src/gtk/glcanvas.cpp</if>
     <if cond="TOOLKIT=='MSW'">src/msw/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=='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=='PM'">src/os2/glcanvas.cpp</if>
 </set>
 
 <set var="OPENGL_HDR" hints="files">
     <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=='MAC'">wx/mac/carbon/glcanvas.h</if>
     <if cond="TOOLKIT=='GTK'">wx/gtk/glcanvas.h</if>
     <if cond="TOOLKIT=='MSW'">wx/msw/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=='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>
 </set>
     <if cond="TOOLKIT=='X11'">wx/x11/glcanvas.h</if>
     <if cond="TOOLKIT=='PM'">wx/os2/glcanvas.h</if>
 </set>
@@ -2087,7 +2310,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 
 <!-- ====================================================================== -->
 
 
 <!-- ====================================================================== -->
-<!--                              ODBD classes                              -->
+<!--                              ODBC classes                              -->
 <!-- ====================================================================== -->
 
 <set var="ODBC_SRC" hints="files">
 <!-- ====================================================================== -->
 
 <set var="ODBC_SRC" hints="files">
@@ -2108,6 +2331,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 
 </set>
 
 
+<!-- ====================================================================== -->
+<!--                             Misc plugin sources:                       -->
+<!-- ====================================================================== -->
+
+<set var="UNIX_SOUND_SRC_SDL" hints="files">
+    src/unix/sound_sdl.cpp
+</set>
 
 <!-- ====================================================================== -->
 <!--                    Define sources for specific libraries:              -->
 
 <!-- ====================================================================== -->
 <!--                    Define sources for specific libraries:              -->
@@ -2124,7 +2354,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     </set>
     <set var="BASE_PLATFORM_SRC" hints="files">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if>
     </set>
     <set var="BASE_PLATFORM_SRC" hints="files">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if>
-        <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC)</if>
+        <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC) $(BASE_WINCE_SRC)</if>
         <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_SRC)</if>
         <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_SRC)</if>
     </set>
         <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_SRC)</if>
         <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_SRC)</if>
     </set>
@@ -2138,7 +2368,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     </set>
     <set var="BASE_PLATFORM_HDR" hints="files">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>
     </set>
     <set var="BASE_PLATFORM_HDR" hints="files">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>
-        <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_HDR)</if>
+        <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)</if>
         <if cond="TOOLKIT=='MAC'">$(BASE_MAC_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_HDR)</if>
     </set>
         <if cond="TOOLKIT=='MAC'">$(BASE_MAC_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_HDR)</if>
     </set>
@@ -2153,24 +2383,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 
     <!-- wxNet files: -->
 
 
     <!-- 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>
     <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_WIN32=='1'">$(NET_WIN32_SRC) $(NET_WINCE_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_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="PLATFORM_WIN32=='1'">$(NET_WIN32_HDR) $(NET_WINCE_HDR)</if>
         <if cond="PLATFORM_OS2=='1'">$(NET_OS2_HDR)</if>
         <if cond="PLATFORM_OS2=='1'">$(NET_OS2_HDR)</if>
-        <if cond="TOOLKIT=='MAC'">$(NET_MAC_HDR)</if>
-        <if cond="TOOLKIT=='COCOA'">$(NET_DARWIN_HDR)</if>
+        <if cond="PLATFORM_MACOSX=='1'">$(NET_DARWIN_HDR)</if>
     </set>
 
     <set var="NET_SRC" hints="files">
     </set>
 
     <set var="NET_SRC" hints="files">
@@ -2183,7 +2406,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="LOWLEVEL_SRC" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
     <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=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_ONLY_LOWLEVEL_SRC)</if>
+        <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_SRC)</if>
@@ -2194,6 +2418,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR)</if>
+        <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_HDR)</if>
@@ -2204,7 +2429,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="GUI_SRC" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
     <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=='MSW'">$(MSW_SRC) $(MSW_ONLY_SRC)</if>
+        <if cond="TOOLKIT=='WINCE'">$(MSW_SRC) $(WINCE_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
         <if cond="TOOLKIT=='PM'">$(OS2_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(MAC_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
         <if cond="TOOLKIT=='PM'">$(OS2_SRC)</if>
@@ -2212,8 +2438,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="GUI_HDR" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
     <set var="GUI_HDR" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
-        <if cond="TOOLKIT=='MSW'">$(MSW_HDR)</if>
-        <if cond="TOOLKIT=='MAC'">$(MAC_HDR)</if>
+        <if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_ONLY_HDR)</if>
+        <if cond="TOOLKIT=='WINCE'">$(MSW_HDR) $(WINCE_HDR)</if>
+        <if cond="TOOLKIT=='MAC'">$(MAC_CMN_HDR) $(MAC_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_HDR)</if>
         <if cond="TOOLKIT=='PM'">$(OS2_HDR)</if>
     </set>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_HDR)</if>
         <if cond="TOOLKIT=='PM'">$(OS2_HDR)</if>
     </set>
@@ -2229,15 +2456,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
     <!-- wxAdvanced files: -->
     <set var="ADVANCED_PLATFORM_SRC" hints="files">
 
     <!-- wxAdvanced files: -->
     <set var="ADVANCED_PLATFORM_SRC" hints="files">
-        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC)</if>
+        <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC) $(ADVANCED_MSW_ONLY_SRC)</if>
+        <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_SRC)</if>
         <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_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=='GTK'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_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=='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=='MSW'">$(ADVANCED_MSW_HDR) $(ADVANCED_MSW_ONLY_HDR)</if>
+        <if cond="TOOLKIT=='WINCE'">$(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=='MAC'">$(ADVANCED_MAC_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR)</if>
         <if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_HDR)</if>
@@ -2277,15 +2506,31 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
     <set var="ALL_BASE_SOURCES" make_var="1" hints="files">
         $(BASE_CMN_SRC)
 
     <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_UNIX_SRC) $(BASE_WIN32_SRC) $(BASE_WINCE_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)
         $(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) $(NET_MAC_SRC)
+        $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_WINCE_SRC)
         $(XML_SRC) $(ODBC_SRC)
     </set>
         $(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>
 </makefile>
wxWidgets (Impactor)