]> 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
Further AFM removal
[wxWidgets.git] / build / bakefiles / files.bkl
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index a54d6e654c2991da6ea022955a67a334a7ea033b..4cee3f736debccf417a096217ab656444e27a821 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -31,6 +31,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
                                      ports (wxGTK, wxMotif, wxX11)
 
        HTML                          wxHTML files
                                      ports (wxGTK, wxMotif, wxX11)
 
        HTML                          wxHTML files
+       XRC                           wxXRC files
 
      * one file may be listed in several groups
 
 
      * one file may be listed in several groups
 
@@ -42,11 +43,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!--                               wxBase                                   -->
 <!-- ====================================================================== -->
 
 <!--                               wxBase                                   -->
 <!-- ====================================================================== -->
 
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+<!--                               UNIX                                     -->
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 <set var="BASE_UNIX_SRC" hints="files">
     src/unix/baseunix.cpp
     src/unix/dir.cpp
     src/unix/mimetype.cpp
     src/unix/snglinst.cpp
 <set var="BASE_UNIX_SRC" hints="files">
     src/unix/baseunix.cpp
     src/unix/dir.cpp
     src/unix/mimetype.cpp
     src/unix/snglinst.cpp
+    src/unix/stdpaths.cpp
     src/unix/threadpsx.cpp
 </set>
 <set var="BASE_AND_GUI_UNIX_SRC" hints="files">
     src/unix/threadpsx.cpp
 </set>
 <set var="BASE_AND_GUI_UNIX_SRC" hints="files">
@@ -58,8 +63,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/unix/execute.h
     wx/unix/mimetype.h
     wx/unix/pipe.h
     wx/unix/execute.h
     wx/unix/mimetype.h
     wx/unix/pipe.h
+    wx/unix/stdpaths.h
 </set>
 
 </set>
 
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+<!--                             Windows                                    -->
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 <set var="BASE_WIN32_SRC" hints="files">
     src/msw/basemsw.cpp
     src/msw/crashrpt.cpp
 <set var="BASE_WIN32_SRC" hints="files">
     src/msw/basemsw.cpp
     src/msw/crashrpt.cpp
@@ -69,6 +78,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/regconf.cpp
     src/msw/registry.cpp
     src/msw/snglinst.cpp
     src/msw/regconf.cpp
     src/msw/registry.cpp
     src/msw/snglinst.cpp
+    src/msw/stdpaths.cpp
     src/msw/thread.cpp
     src/msw/utils.cpp
     src/msw/utilsexc.cpp
     src/msw/thread.cpp
     src/msw/utils.cpp
     src/msw/utilsexc.cpp
@@ -97,40 +107,89 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <if cond="TOOLKIT=='WINCE'">wx/msw/wince/time.h</if>
 </set>
 
     <if cond="TOOLKIT=='WINCE'">wx/msw/wince/time.h</if>
 </set>
 
-<set var="BASE_DARWIN_SRC" hints="files">
-    src/unix/baseunix.cpp
-    src/unix/dir.cpp
-    src/unix/mimetype.cpp
-    src/unix/snglinst.cpp
-    src/unix/threadpsx.cpp
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+<!--                                Mac                                     -->
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+
+<!-- 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/stdpaths_cf.cpp
 </set>
 </set>
-<set var="BASE_AND_GUI_DARWIN_SRC" hints="files">
-    src/unix/utilsunx.cpp
-</set>
-<set var="BASE_DARWIN_HDR" hints="files">
+<set var="BASE_COREFOUNDATION_HDR" hints="files">
+    wx/mac/corefoundation/cfstring.h
+    wx/mac/corefoundation/stdpaths.h
 </set>
 
 </set>
 
+<!-- Base files used by Carbon on OS X and CarbonLib (not true Classic) -->
+<!-- FIXME: Maybe this ought to be named BASE_MAC_CARBON_SRC  -->
 <set var="BASE_MAC_SRC" hints="files">
     src/mac/carbon/dirmac.cpp
     src/mac/carbon/mimetmac.cpp
 <set var="BASE_MAC_SRC" hints="files">
     src/mac/carbon/dirmac.cpp
     src/mac/carbon/mimetmac.cpp
-    src/unix/baseunix.cpp
     src/mac/carbon/utilsexc.cpp
     src/mac/carbon/thread.cpp
     src/mac/carbon/macnotfy.cpp
     src/mac/carbon/utilsexc.cpp
     src/mac/carbon/thread.cpp
     src/mac/carbon/macnotfy.cpp
+    <!-- One would think MoreFilesX is only for OS X but it seems to
+         apply to CarbonLib as well (FSRefMakeFSSpec) -->
     src/mac/carbon/morefilex/MoreFilesX.c
     src/mac/carbon/morefilex/MoreFilesX.c
+    $(BASE_COREFOUNDATION_SRC)
 </set>
 </set>
-
+<set var="BASE_MAC_HDR" hints="files">
+    $(BASE_COREFOUNDATION_HDR)
+</set>
+<!-- Base and GUI files used by both OS X and CarbonLib -->
 <set var="BASE_AND_GUI_MAC_SRC" hints="files">
     src/mac/carbon/utils.cpp
     src/mac/carbon/uma.cpp
 </set>
 
 <set var="BASE_AND_GUI_MAC_SRC" hints="files">
     src/mac/carbon/utils.cpp
     src/mac/carbon/uma.cpp
 </set>
 
-<set var="BASE_MAC_HDR" hints="files">
+<!-- Base files used by Classic (not CarbonLib or OS X builds) -->
+<!-- set var="BASE_MAC_CLASSIC_SRC">
+</set -->
+<!-- set var="BASE_MAC_CLASSIC_HDR">
+</set -->
+
+<!-- Base files used only by CarbonLib builds (not Classic or OS X) -->
+<set var="BASE_MAC_CARBONLIB_SRC" hints="files">
+    src/mac/carbon/morefile/DirectoryCopy.c
+    src/mac/carbon/morefile/FSpCompat.c
+    src/mac/carbon/morefile/FileCopy.c
+    src/mac/carbon/morefile/FullPath.c
+    src/mac/carbon/morefile/IterateDirectory.c
+    src/mac/carbon/morefile/MoreDesktopMgr.c
+    src/mac/carbon/morefile/MoreFiles.c
+    src/mac/carbon/morefile/MoreFilesExtras.c
+    src/mac/carbon/morefile/Search.c
+</set>
+<!-- set var="BASE_MAC_CARBONLIB_HDR" hints="files">
+</set -->
+
+<!-- Base files used only by OS X builds (not CarbonLib or Classic)  -->
+<set var="BASE_MAC_OSX_SRC" hints="files">
+    src/unix/baseunix.cpp
+    src/unix/stdpaths.cpp
+</set>
+<set var="BASE_MAC_OSX_HDR" hints="files">
+    wx/unix/stdpaths.h
+</set>
+
+<!-- Base files used by non-wxMac OS X builds -->
+<set var="BASE_DARWIN_SRC" hints="files">
+    $(BASE_UNIX_SRC)
+    $(BASE_COREFOUNDATION_SRC)
+</set>
+<set var="BASE_DARWIN_HDR" hints="files">
+    $(BASE_UNIX_HDR)
+    $(BASE_COREFOUNDATION_HDR)
 </set>
 
 </set>
 
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+<!--                               OS/2                                     -->
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 <set var="BASE_OS2_SRC" hints="files">
     src/os2/dir.cpp
     src/os2/mimetype.cpp
 <set var="BASE_OS2_SRC" hints="files">
     src/os2/dir.cpp
     src/os2/mimetype.cpp
+    src/os2/stdpaths.cpp
     src/os2/thread.cpp
     src/os2/utils.cpp
     src/os2/utilsexc.cpp
     src/os2/thread.cpp
     src/os2/utils.cpp
     src/os2/utilsexc.cpp
@@ -138,10 +197,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="BASE_AND_GUI_OS2_SRC" hints="files">
 </set>
 <set var="BASE_OS2_HDR" hints="files">
 <set var="BASE_AND_GUI_OS2_SRC" hints="files">
 </set>
 <set var="BASE_OS2_HDR" hints="files">
+    wx/os2/apptbase.h
+    wx/os2/apptrait.h
+    wx/os2/mimetype.h
+    wx/os2/stdpaths.h
 </set>
 
 </set>
 
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+<!--                              Common                                    -->
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 <set var="BASE_CMN_SRC" hints="files">
     src/common/appbase.cpp
 <set var="BASE_CMN_SRC" hints="files">
     src/common/appbase.cpp
+    src/common/archive.cpp
     src/common/clntdata.cpp
     src/common/cmdline.cpp
     src/common/config.cpp
     src/common/clntdata.cpp
     src/common/cmdline.cpp
     src/common/config.cpp
@@ -176,6 +243,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/object.cpp
     src/common/process.cpp
     src/common/regex.cpp
     src/common/object.cpp
     src/common/process.cpp
     src/common/regex.cpp
+    src/common/stdpbase.cpp
     src/common/sstream.cpp
     src/common/stopwatch.cpp
     src/common/strconv.cpp
     src/common/sstream.cpp
     src/common/stopwatch.cpp
     src/common/strconv.cpp
@@ -186,7 +254,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/textfile.cpp
     src/common/tokenzr.cpp
     src/common/txtstrm.cpp
     src/common/textfile.cpp
     src/common/tokenzr.cpp
     src/common/txtstrm.cpp
-    src/common/unzip.c
+    src/common/uri.cpp
     src/common/variant.cpp
     src/common/wfstream.cpp
     src/common/wxchar.cpp
     src/common/variant.cpp
     src/common/wfstream.cpp
     src/common/wxchar.cpp
@@ -205,6 +273,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/afterstd.h
     wx/app.h
     wx/apptrait.h
     wx/afterstd.h
     wx/app.h
     wx/apptrait.h
+    wx/archive.h
     wx/arrimpl.cpp
     wx/arrstr.h
     wx/beforestd.h
     wx/arrimpl.cpp
     wx/arrstr.h
     wx/beforestd.h
@@ -275,6 +344,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/snglinst.h
     wx/sstream.h
     wx/stack.h
     wx/snglinst.h
     wx/sstream.h
     wx/stack.h
+    wx/stdpaths.h
     wx/stockitem.h
     wx/stopwatch.h
     wx/strconv.h
     wx/stockitem.h
     wx/stopwatch.h
     wx/strconv.h
@@ -289,6 +359,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/tokenzr.h
     wx/txtstrm.h
     wx/types.h
     wx/tokenzr.h
     wx/txtstrm.h
     wx/types.h
+    wx/uri.h
     wx/utils.h
     wx/variant.h
     wx/vector.h
     wx/utils.h
     wx/variant.h
     wx/vector.h
@@ -331,19 +402,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <if cond="TOOLKIT=='WINCE'">wx/msw/wince/net.h</if>
 </set>
 
     <if cond="TOOLKIT=='WINCE'">wx/msw/wince/net.h</if>
 </set>
 
-<set var="NET_DARWIN_SRC" hints="files">
-    src/unix/gsocket.cpp
-</set>
-<set var="NET_DARWIN_HDR" hints="files">
-    wx/unix/gsockunx.h
-</set>
-
 <set var="NET_OS2_SRC" hints="files">
     src/unix/gsocket.cpp
 </set>
 <set var="NET_OS2_HDR" hints="files">
     wx/unix/gsockunx.h
 </set>
 <set var="NET_OS2_SRC" hints="files">
     src/unix/gsocket.cpp
 </set>
 <set var="NET_OS2_HDR" hints="files">
     wx/unix/gsockunx.h
 </set>
+<!-- Net files used only by CarbonLib (not Classic or OS X) -->
+<set var="NET_MAC_CARBONLIB_SRC" hints="files">
+    src/mac/carbon/gsocket.cpp
+</set>
+<set var="NET_MAC_CARBONLIB_HDR" hints="files">
+    wx/mac/carbon/gsockmac.h
+</set>
 
 <set var="NET_CMN_SRC" hints="files">
     src/common/fs_inet.cpp
 
 <set var="NET_CMN_SRC" hints="files">
     src/common/fs_inet.cpp
@@ -764,6 +835,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/combobox.cpp
     src/gtk/control.cpp
     src/gtk/dialog.cpp
     src/gtk/combobox.cpp
     src/gtk/control.cpp
     src/gtk/dialog.cpp
+    src/gtk/filedlg.cpp
     src/gtk/fontdlg.cpp
     src/gtk/frame.cpp
     src/gtk/gauge.cpp
     src/gtk/fontdlg.cpp
     src/gtk/frame.cpp
     src/gtk/gauge.cpp
@@ -1327,6 +1399,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/wince/choicece.cpp
     src/msw/wince/crt.cpp
     src/msw/wince/filedlgwce.cpp
     src/msw/wince/choicece.cpp
     src/msw/wince/crt.cpp
     src/msw/wince/filedlgwce.cpp
+    src/msw/wince/filefnwce.cpp
     src/msw/wince/helpwce.cpp
     src/msw/wince/menuce.cpp
     src/msw/wince/tbarwce.cpp
     src/msw/wince/helpwce.cpp
     src/msw/wince/menuce.cpp
     src/msw/wince/tbarwce.cpp
@@ -1579,10 +1652,30 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!--                                wxMac                                   -->
 <!-- ====================================================================== -->
 
 <!--                                wxMac                                   -->
 <!-- ====================================================================== -->
 
+<set var="MAC_OSX_LOWLEVEL_SRC" hints="files">
+    <!-- Shared wxMac and wxCocoa files -->
+    src/mac/corefoundation/gsockosx.cpp
+    src/mac/corefoundation/utilsexc_cf.cpp
+</set>
+
 <set var="MAC_LOWLEVEL_SRC" hints="files">
 <set var="MAC_LOWLEVEL_SRC" hints="files">
+    <if cond="PLATFORM_MACOSX=='1'">$(MAC_OSX_LOWLEVEL_SRC)</if>
 </set>
 <set var="MAC_LOWLEVEL_HDR" hints="files">
 </set>
 </set>
 <set var="MAC_LOWLEVEL_HDR" hints="files">
 </set>
+
+<set var="MAC_OSX_SRC" hints="files">
+<if cond="PLATFORM_MACOSX=='1'">
+    <!-- Unix files used by wxMac: -->
+    src/unix/snglinst.cpp
+    <!-- wxWebKit files -->
+    src/html/htmlctrl/webkit/webkit.mm
+    <!-- Native color/font dialogs -->
+    src/mac/carbon/fontdlgosx.mm
+    src/mac/carbon/colordlgosx.mm
+</if>
+</set>
+
 <set var="MAC_SRC" hints="files">
     src/mac/carbon/accel.cpp
     src/mac/carbon/aga.cpp
 <set var="MAC_SRC" hints="files">
     src/mac/carbon/accel.cpp
     src/mac/carbon/aga.cpp
@@ -1619,7 +1712,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/carbon/frame.cpp
     src/mac/carbon/gauge.cpp
     src/mac/carbon/gdiobj.cpp
     src/mac/carbon/frame.cpp
     src/mac/carbon/gauge.cpp
     src/mac/carbon/gdiobj.cpp
-    src/mac/carbon/gsockosx.cpp
+    src/mac/carbon/hid.cpp
     src/mac/carbon/icon.cpp
     src/mac/carbon/listbox.cpp
     src/mac/carbon/mdi.cpp
     src/mac/carbon/icon.cpp
     src/mac/carbon/listbox.cpp
     src/mac/carbon/mdi.cpp
@@ -1665,11 +1758,8 @@ 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
-    <!-- Unix files used by wxMac: -->
-    src/unix/snglinst.cpp
-    <!-- wxWebKit files -->
-    src/html/htmlctrl/webkit/webkit.mm
 </set>
 </set>
+
 <!-- 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
 <!-- 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
@@ -1712,6 +1802,7 @@ 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/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
     wx/mac/listbox.h
     wx/mac/listctrl.h
     wx/mac/macnotfy.h
@@ -1745,6 +1836,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/stattext.h
     wx/mac/statusbr.h
     wx/mac/tabctrl.h
     wx/mac/stattext.h
     wx/mac/statusbr.h
     wx/mac/tabctrl.h
+    wx/mac/taskbarosx.h
     wx/mac/textctrl.h
     wx/mac/timer.h
     wx/mac/tglbtn.h
     wx/mac/textctrl.h
     wx/mac/timer.h
     wx/mac/tglbtn.h
@@ -1855,6 +1947,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <set var="COCOA_LOWLEVEL_SRC" hints="files">
 <!-- ====================================================================== -->
 
 <set var="COCOA_LOWLEVEL_SRC" hints="files">
+    <!-- Shared wxMac and wxCocoa files -->
+    src/mac/corefoundation/gsockosx.cpp
+    src/mac/corefoundation/utilsexc_cf.cpp
 </set>
 <set var="COCOA_LOWLEVEL_HDR" hints="files">
 </set>
 </set>
 <set var="COCOA_LOWLEVEL_HDR" hints="files">
 </set>
@@ -1880,6 +1975,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/checklst.mm
     src/cocoa/choice.mm
     src/cocoa/clipbrd.mm
     src/cocoa/checklst.mm
     src/cocoa/choice.mm
     src/cocoa/clipbrd.mm
+    src/cocoa/colordlg.mm
     src/cocoa/colour.mm
     src/cocoa/combobox.mm
     src/cocoa/control.mm
     src/cocoa/colour.mm
     src/cocoa/combobox.mm
     src/cocoa/control.mm
@@ -1891,8 +1987,12 @@ 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/display.mm
+    src/cocoa/drawer.mm
     src/cocoa/evtloop.mm
     src/cocoa/evtloop.mm
+    src/cocoa/filedlg.mm
     src/cocoa/font.cpp
     src/cocoa/font.cpp
+    src/cocoa/fontdlg.mm
     src/cocoa/fontenum.mm
     src/cocoa/fontutil.cpp
     src/cocoa/frame.mm
     src/cocoa/fontenum.mm
     src/cocoa/fontutil.cpp
     src/cocoa/frame.mm
@@ -1905,6 +2005,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/mdi.mm
     src/cocoa/menu.mm
     src/cocoa/menuitem.mm
     src/cocoa/mdi.mm
     src/cocoa/menu.mm
     src/cocoa/menuitem.mm
+    src/cocoa/msgdlg.mm
     src/cocoa/notebook.mm
     src/cocoa/pen.mm
     src/cocoa/radiobox.mm
     src/cocoa/notebook.mm
     src/cocoa/pen.mm
     src/cocoa/radiobox.mm
@@ -1913,6 +2014,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/scrolbar.mm
     src/cocoa/settings.cpp
     src/cocoa/slider.mm
     src/cocoa/scrolbar.mm
     src/cocoa/settings.cpp
     src/cocoa/slider.mm
+    src/cocoa/sound.mm
     src/cocoa/spinbutt.mm
     src/cocoa/statbmp.mm
     src/cocoa/statbox.mm
     src/cocoa/spinbutt.mm
     src/cocoa/statbmp.mm
     src/cocoa/statbox.mm
@@ -1920,9 +2022,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/cocoa/stattext.mm
     src/cocoa/textctrl.mm
     src/cocoa/toolbar.mm
     src/cocoa/stattext.mm
     src/cocoa/textctrl.mm
     src/cocoa/toolbar.mm
+    src/cocoa/tooltip.mm
     src/cocoa/toplevel.mm
     src/cocoa/utils.cpp
     src/cocoa/toplevel.mm
     src/cocoa/utils.cpp
-    src/cocoa/utilsexc.cpp
+    src/cocoa/utilsexc.mm
     src/cocoa/window.mm
     <!-- Generic implementations used by wxCocoa: -->
     src/generic/accel.cpp
     src/cocoa/window.mm
     <!-- Generic implementations used by wxCocoa: -->
     src/generic/accel.cpp
@@ -1930,7 +2033,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/colrdlgg.cpp
     src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp
     src/generic/colrdlgg.cpp
     src/generic/dirdlgg.cpp
     src/generic/fdrepdlg.cpp
-    src/generic/filedlgg.cpp
     src/generic/fontdlgg.cpp
     src/generic/imaglist.cpp
     src/generic/listctrl.cpp
     src/generic/fontdlgg.cpp
     src/generic/imaglist.cpp
     src/generic/listctrl.cpp
@@ -1940,8 +2042,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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.cpp
 </set>
 <set var="COCOA_HDR" hints="files">
     wx/cocoa/NSApplication.h
 </set>
 <set var="COCOA_HDR" hints="files">
     wx/cocoa/NSApplication.h
@@ -1968,6 +2068,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cocoa/checklst.h
     wx/cocoa/choice.h
     wx/cocoa/clipbrd.h
     wx/cocoa/checklst.h
     wx/cocoa/choice.h
     wx/cocoa/clipbrd.h
+    wx/cocoa/colordlg.h
     wx/cocoa/colour.h
     wx/cocoa/combobox.h
     wx/cocoa/control.h
     wx/cocoa/colour.h
     wx/cocoa/combobox.h
     wx/cocoa/control.h
@@ -1980,7 +2081,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cocoa/dcmemory.h
     wx/cocoa/dcscreen.h
     wx/cocoa/dialog.h
     wx/cocoa/dcmemory.h
     wx/cocoa/dcscreen.h
     wx/cocoa/dialog.h
+    wx/cocoa/display.h
+    wx/cocoa/drawer.h
+    wx/cocoa/filedlg.h
     wx/cocoa/font.h
     wx/cocoa/font.h
+    wx/cocoa/fontdlg.h
     wx/cocoa/frame.h
     wx/cocoa/gauge.h
     wx/cocoa/gdiobj.h
     wx/cocoa/frame.h
     wx/cocoa/gauge.h
     wx/cocoa/gdiobj.h
@@ -1991,6 +2096,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cocoa/mdi.h
     wx/cocoa/menu.h
     wx/cocoa/menuitem.h
     wx/cocoa/mdi.h
     wx/cocoa/menu.h
     wx/cocoa/menuitem.h
+    wx/cocoa/msgdlg.h
     wx/cocoa/notebook.h
     wx/cocoa/pen.h
     wx/cocoa/radiobox.h
     wx/cocoa/notebook.h
     wx/cocoa/pen.h
     wx/cocoa/radiobox.h
@@ -1998,6 +2104,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/cocoa/region.h
     wx/cocoa/scrolbar.h
     wx/cocoa/slider.h
     wx/cocoa/region.h
     wx/cocoa/scrolbar.h
     wx/cocoa/slider.h
+    wx/cocoa/sound.h
     wx/cocoa/spinbutt.h
     wx/cocoa/statbmp.h
     wx/cocoa/statbox.h
     wx/cocoa/spinbutt.h
     wx/cocoa/statbmp.h
     wx/cocoa/statbox.h
@@ -2189,12 +2296,25 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="ADVANCED_MAC_SRC" hints="files">
 </set>
 
 <set var="ADVANCED_MAC_SRC" hints="files">
+    src/common/taskbarcmn.cpp
+    src/mac/carbon/drawer.cpp
     src/mac/carbon/joystick.cpp
     src/mac/carbon/sound.cpp
     src/mac/carbon/joystick.cpp
     src/mac/carbon/sound.cpp
+    src/mac/carbon/taskbar.cpp
 </set>
 <set var="ADVANCED_MAC_HDR" hints="files">
 </set>
 <set var="ADVANCED_MAC_HDR" hints="files">
+    wx/mac/carbon/drawer.h
     wx/mac/carbon/joystick.h
     wx/mac/carbon/sound.h
     wx/mac/carbon/joystick.h
     wx/mac/carbon/sound.h
+    wx/mac/carbon/taskbarosx.h
+</set>
+
+<set var="ADVANCED_COCOA_SRC" hints="files">
+    src/cocoa/taskbar.mm
+    src/common/taskbarcmn.cpp
+</set>
+<set var="ADVANCED_COCOA_HDR" hints="files">
+    wx/cocoa/taskbar.h
 </set>
 
 <set var="ADVANCED_OS2_SRC" hints="files">
 </set>
 
 <set var="ADVANCED_OS2_SRC" hints="files">
@@ -2223,6 +2343,52 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/eggtrayicon.c
 </set>
 
     src/gtk/eggtrayicon.c
 </set>
 
+<!-- ====================================================================== -->
+<!--                               wxMedia                                  -->
+<!-- ====================================================================== -->
+
+<set var="MEDIA_CMN_SRC" hints="files">
+    src/common/mediactrlcmn.cpp
+</set>
+
+<set var="MEDIA_CMN_HDR" hints="files">
+    wx/mediactrl.h
+</set>
+
+<set var="MEDIA_MSW_SRC" hints="files">
+    src/msw/mediactrl.cpp
+</set>
+<set var="MEDIA_MSW_HDR" hints="files">
+</set>
+<!-- not built on WindowsCE: -->
+<set var="MEDIA_MSW_ONLY_SRC" hints="files">
+</set>
+<set var="MEDIA_MSW_ONLY_HDR" hints="files">
+</set>
+
+<set var="MEDIA_MAC_SRC" hints="files">
+    src/mac/carbon/mediactrl.cpp
+</set>
+<set var="MEDIA_MAC_HDR" hints="files">
+</set>
+
+<set var="MEDIA_COCOA_SRC" hints="files">
+</set>
+<set var="MEDIA_COCOA_HDR" hints="files">
+</set>
+
+<set var="MEDIA_OS2_SRC" hints="files">
+</set>
+<set var="MEDIA_OS2_HDR" hints="files">
+</set>
+
+<set var="MEDIA_UNIX_SRC" hints="files">
+</set>
+<set var="MEDIA_UNIX_HDR" hints="files">
+</set>
+
+<set var="MEDIA_GTK_SRC" hints="files">
+</set>
 
 <!-- ====================================================================== -->
 <!--                               wxHTML                                   -->
 
 <!-- ====================================================================== -->
 <!--                               wxHTML                                   -->
@@ -2286,6 +2452,96 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 
 
 
 
 
+<!-- ====================================================================== -->
+<!--                                wxXRC                                   -->
+<!-- ====================================================================== -->
+
+<set var="XRC_SRC" hints="files">
+    src/xrc/xh_bmpbt.cpp
+    src/xrc/xh_bmp.cpp
+    src/xrc/xh_bttn.cpp
+    src/xrc/xh_cald.cpp
+    src/xrc/xh_chckb.cpp
+    src/xrc/xh_chckl.cpp
+    src/xrc/xh_choic.cpp
+    src/xrc/xh_combo.cpp
+    src/xrc/xh_dlg.cpp
+    src/xrc/xh_frame.cpp
+    src/xrc/xh_gauge.cpp
+    src/xrc/xh_gdctl.cpp
+    src/xrc/xh_html.cpp
+    src/xrc/xh_listb.cpp
+    src/xrc/xh_listc.cpp
+    src/xrc/xh_menu.cpp
+    src/xrc/xh_notbk.cpp
+    src/xrc/xh_panel.cpp
+    src/xrc/xh_radbt.cpp
+    src/xrc/xh_radbx.cpp
+    src/xrc/xh_scrol.cpp
+    src/xrc/xh_scwin.cpp
+    src/xrc/xh_sizer.cpp
+    src/xrc/xh_slidr.cpp
+    src/xrc/xh_spin.cpp
+    src/xrc/xh_split.cpp
+    src/xrc/xh_statbar.cpp
+    src/xrc/xh_stbmp.cpp
+    src/xrc/xh_stbox.cpp
+    src/xrc/xh_stlin.cpp
+    src/xrc/xh_sttxt.cpp
+    src/xrc/xh_text.cpp
+    src/xrc/xh_tglbtn.cpp
+    src/xrc/xh_toolb.cpp
+    src/xrc/xh_tree.cpp
+    src/xrc/xh_unkwn.cpp
+    src/xrc/xh_wizrd.cpp
+    src/xrc/xmlres.cpp
+    src/xrc/xmlrsall.cpp
+</set>
+<set var="XRC_HDR" hints="files">
+    wx/xrc/xh_all.h
+    wx/xrc/xh_bmpbt.h
+    wx/xrc/xh_bmp.h
+    wx/xrc/xh_bttn.h
+    wx/xrc/xh_cald.h
+    wx/xrc/xh_chckb.h
+    wx/xrc/xh_chckl.h
+    wx/xrc/xh_choic.h
+    wx/xrc/xh_combo.h
+    wx/xrc/xh_dlg.h
+    wx/xrc/xh_frame.h
+    wx/xrc/xh_gauge.h
+    wx/xrc/xh_gdctl.h
+    wx/xrc/xh_html.h
+    wx/xrc/xh_listb.h
+    wx/xrc/xh_listc.h
+    wx/xrc/xh_menu.h
+    wx/xrc/xh_notbk.h
+    wx/xrc/xh_panel.h
+    wx/xrc/xh_radbt.h
+    wx/xrc/xh_radbx.h
+    wx/xrc/xh_scrol.h
+    wx/xrc/xh_scwin.h
+    wx/xrc/xh_sizer.h
+    wx/xrc/xh_slidr.h
+    wx/xrc/xh_spin.h
+    wx/xrc/xh_split.h
+    wx/xrc/xh_statbar.h
+    wx/xrc/xh_stbmp.h
+    wx/xrc/xh_stbox.h
+    wx/xrc/xh_stlin.h
+    wx/xrc/xh_sttxt.h
+    wx/xrc/xh_text.h
+    wx/xrc/xh_tglbtn.h
+    wx/xrc/xh_toolb.h
+    wx/xrc/xh_tree.h
+    wx/xrc/xh_unkwn.h
+    wx/xrc/xh_wizrd.h
+    wx/xrc/xmlres.h
+</set>
+
+
+
+
 <!-- ====================================================================== -->
 <!--                               XML classes                              -->
 <!-- ====================================================================== -->
 <!-- ====================================================================== -->
 <!--                               XML classes                              -->
 <!-- ====================================================================== -->
@@ -2306,6 +2562,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="OPENGL_SRC" hints="files">
     <if cond="TOOLKIT=='MAC'">src/mac/carbon/glcanvas.cpp</if>
 
 <set var="OPENGL_SRC" hints="files">
     <if cond="TOOLKIT=='MAC'">src/mac/carbon/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='COCOA'">src/cocoa/glcanvas.mm</if>
     <if cond="TOOLKIT=='GTK'">src/gtk/glcanvas.cpp</if>
     <if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>
     <if cond="TOOLKIT=='WINCE'">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=='WINCE'">src/msw/glcanvas.cpp</if>
@@ -2316,6 +2573,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="OPENGL_HDR" hints="files">
     <if cond="TOOLKIT=='MAC'">wx/mac/carbon/glcanvas.h</if>
 
 <set var="OPENGL_HDR" hints="files">
     <if cond="TOOLKIT=='MAC'">wx/mac/carbon/glcanvas.h</if>
+    <if cond="TOOLKIT=='COCOA'">wx/cocoa/glcanvas.h</if>
     <if cond="TOOLKIT=='GTK'">wx/gtk/glcanvas.h</if>
     <if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
     <if cond="TOOLKIT=='WINCE'">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=='WINCE'">wx/msw/glcanvas.h</if>
@@ -2356,6 +2614,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/unix/sound_sdl.cpp
 </set>
 
     src/unix/sound_sdl.cpp
 </set>
 
+<set var="GTK_PRINT_SRC_GNOME" hints="files">
+    src/gtk/gnome/gprint.cpp
+</set>
+
 <!-- ====================================================================== -->
 <!--                    Define sources for specific libraries:              -->
 <!-- ====================================================================== -->
 <!-- ====================================================================== -->
 <!--                    Define sources for specific libraries:              -->
 <!-- ====================================================================== -->
@@ -2363,18 +2625,24 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <!-- wxBase files: -->
 
     <!-- Nested if would be nicer, but this works -->
     <!-- wxBase files: -->
 
     <!-- Nested if would be nicer, but this works -->
+    <!-- These are the files for PLATFORM_MACOSX -->
     <set var="BASE_MACOSX_SRC" hints="files">
     <set var="BASE_MACOSX_SRC" hints="files">
-        <if cond="TOOLKIT=='MAC'">$(BASE_MAC_SRC)</if>
+        <if cond="TOOLKIT=='MAC'">$(BASE_MAC_SRC) $(BASE_MAC_OSX_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_SRC)</if>
         <if cond="TOOLKIT=='GTK'">$(BASE_DARWIN_SRC)</if>
         <if cond="TOOLKIT=='X11'">$(BASE_DARWIN_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(BASE_DARWIN_SRC)</if>
         <!-- FIXME: TOOLKIT!='MAC' is what we really want -->
         <if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_SRC)</if>
         <if cond="TOOLKIT=='GTK'">$(BASE_DARWIN_SRC)</if>
         <if cond="TOOLKIT=='X11'">$(BASE_DARWIN_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(BASE_DARWIN_SRC)</if>
         <!-- FIXME: TOOLKIT!='MAC' is what we really want -->
+        
+        <!-- FIXME: a hack because there are two wxBase versions on
+                    Mac; once fixed, this would no longer be needed -->
+        <if cond="TOOLKIT==''">$(BASE_DARWIN_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) $(BASE_WINCE_SRC)</if>
         <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_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) $(BASE_WINCE_SRC)</if>
         <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_SRC)</if>
+        <if cond="PLATFORM_MACOS=='1'">$(BASE_MAC_SRC) $(BASE_MAC_CARBONLIB_SRC)</if>
         <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_SRC)</if>
     </set>
     <set var="BASE_AND_GUI_TOOLKIT_SRC" hints="files">
         <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_SRC)</if>
     </set>
     <set var="BASE_AND_GUI_TOOLKIT_SRC" hints="files">
@@ -2383,13 +2651,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <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>
     <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_DARWIN_SRC)</if>
+        <if cond="PLATFORM_MACOSX=='1'">$(BASE_AND_GUI_UNIX_SRC)</if>
+        <!-- At the moment, BASE_AND_GUI_TOOLKIT_SRC handles this -->
+        <!-- if cond="PLATFORM_MACOS=='1'">$(BASE_AND_GUI_MAC_SRC)</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) $(BASE_WINCE_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) $(BASE_WINCE_HDR)</if>
-        <if cond="TOOLKIT=='MAC'">$(BASE_MAC_HDR)</if>
-        <if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_HDR)</if>
+        <if cond="TOOLKIT=='MAC'">$(BASE_MAC_HDR) $(BASE_MAC_OSX_HDR)</if>
+        <if cond="TOOLKIT=='COCOA'">$(BASE_UNIX_HDR)</if>
     </set>
 
     <set var="BASE_SRC" hints="files">
     </set>
 
     <set var="BASE_SRC" hints="files">
@@ -2405,14 +2675,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="NET_PLATFORM_SRC" hints="files">
         <if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_SRC)</if>
         <if cond="PLATFORM_WIN32=='1'">$(NET_WIN32_SRC) $(NET_WINCE_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) $(NET_WINCE_SRC)</if>
-        <if cond="PLATFORM_MACOSX=='1'">$(NET_DARWIN_SRC)</if>
+        <if cond="PLATFORM_MACOSX=='1'">$(NET_UNIX_SRC)</if>
+        <if cond="PLATFORM_MACOS=='1'">$(NET_MAC_CARBONLIB_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) $(NET_WINCE_HDR)</if>
         <if cond="PLATFORM_OS2=='1'">$(NET_OS2_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) $(NET_WINCE_HDR)</if>
         <if cond="PLATFORM_OS2=='1'">$(NET_OS2_HDR)</if>
-        <if cond="PLATFORM_MACOSX=='1'">$(NET_DARWIN_HDR)</if>
+        <if cond="PLATFORM_MACOSX=='1'">$(NET_UNIX_HDR)</if>
+        <if cond="PLATFORM_MACOS=='1'">$(NET_MAC_CARBONLIB_HDR)</if>
     </set>
 
     <set var="NET_SRC" hints="files">
     </set>
 
     <set var="NET_SRC" hints="files">
@@ -2450,7 +2722,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_SRC) $(MSW_ONLY_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(MSW_SRC) $(WINCE_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_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=='MAC'">$(MAC_SRC) $(MAC_OSX_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
         <if cond="TOOLKIT=='PM'">$(OS2_SRC)</if>
     </set>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
         <if cond="TOOLKIT=='PM'">$(OS2_SRC)</if>
     </set>
@@ -2478,6 +2750,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <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=='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=='COCOA'">$(ADVANCED_COCOA_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(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=='MOTIF'">$(ADVANCED_UNIX_SRC)</if>
         <if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>
         <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
@@ -2487,6 +2760,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <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=='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=='COCOA'">$(ADVANCED_COCOA_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=='MOTIF'">$(ADVANCED_UNIX_HDR)</if>
         <if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_HDR)</if>
         <if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
@@ -2495,6 +2769,29 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="ADVANCED_SRC">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC)</set>
     <set var="ADVANCED_HDR">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR)</set>
 
     <set var="ADVANCED_SRC">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC)</set>
     <set var="ADVANCED_HDR">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR)</set>
 
+    <!-- wxMedia files: -->
+    <set var="MEDIA_PLATFORM_SRC" hints="files">
+        <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_SRC) $(MEDIA_MSW_ONLY_SRC)</if>
+        <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_SRC)</if>
+        <if cond="TOOLKIT=='MAC'">$(MEDIA_MAC_SRC)</if>
+        <if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_SRC)</if>
+        <if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_SRC)</if>
+        <if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_SRC) $(MEDIA_GTK_SRC)</if>
+        <if cond="TOOLKIT=='X11'">$(MEDIA_UNIX_SRC)</if>
+        <if cond="TOOLKIT=='PM'">$(MEDIA_OS2_SRC)</if>
+    </set>
+    <set var="MEDIA_PLATFORM_HDR" hints="files">
+        <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_HDR) $(MEDIA_MSW_ONLY_HDR)</if>
+        <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_HDR)</if>
+        <if cond="TOOLKIT=='MAC'">$(MEDIA_MAC_HDR)</if>
+        <if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_HDR)</if>
+        <if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_HDR)</if>
+        <if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_HDR)</if>
+        <if cond="TOOLKIT=='X11'">$(MEDIA_UNIX_HDR)</if>
+        <if cond="TOOLKIT=='PM'">$(MEDIA_OS2_HDR)</if>
+    </set>
+    <set var="MEDIA_SRC">$(MEDIA_CMN_SRC) $(MEDIA_PLATFORM_SRC)</set>
+    <set var="MEDIA_HDR">$(MEDIA_CMN_HDR) $(MEDIA_PLATFORM_HDR)</set>
 
 
     <set var="GUI_CORE_HEADERS" hints="files">
 
 
     <set var="GUI_CORE_HEADERS" hints="files">
@@ -2507,8 +2804,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
             $(GUI_CMN_HDR)
             $(LOWLEVEL_HDR)
             $(GUI_CORE_HEADERS)
             $(GUI_CMN_HDR)
             $(LOWLEVEL_HDR)
             $(GUI_CORE_HEADERS)
-            $(ADVANCED_HDR) $(HTML_HDR)
-            $(OPENGL_HDR) $(DBGRID_HDR)
+            $(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
+            $(OPENGL_HDR) $(DBGRID_HDR) $(XRC_HDR)
         </if>
     </set>
 
         </if>
     </set>
 
@@ -2526,12 +2823,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="ALL_BASE_SOURCES" make_var="1" hints="files">
         $(BASE_CMN_SRC)
         $(BASE_UNIX_SRC) $(BASE_WIN32_SRC) $(BASE_WINCE_SRC)
     <set var="ALL_BASE_SOURCES" make_var="1" hints="files">
         $(BASE_CMN_SRC)
         $(BASE_UNIX_SRC) $(BASE_WIN32_SRC) $(BASE_WINCE_SRC)
-        $(BASE_MAC_SRC) $(BASE_DARWIN_SRC)
+        $(BASE_MAC_SRC)
         $(BASE_OS2_SRC)
         $(BASE_AND_GUI_CMN_SRC)
         $(BASE_AND_GUI_UNIX_SRC)
         $(BASE_AND_GUI_MAC_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_WINCE_SRC)
         $(XML_SRC) $(ODBC_SRC)
         $(BASE_AND_GUI_WIN32_SRC)
         $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_WINCE_SRC)
         $(XML_SRC) $(ODBC_SRC)
@@ -2547,6 +2843,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="PLUGIN_ADV_SRC">
         <if cond="FORMAT=='autoconf' and PLATFORM_UNIX=='1' and USE_PLUGINS=='0'">
             $(UNIX_SOUND_SRC_SDL)
     <set var="PLUGIN_ADV_SRC">
         <if cond="FORMAT=='autoconf' and PLATFORM_UNIX=='1' and USE_PLUGINS=='0'">
             $(UNIX_SOUND_SRC_SDL)
+            $(GTK_PRINT_SRC_GNOME)
         </if>
     </set>
 
         </if>
     </set>
 
wxWidgets (Impactor)