inside <wx-data> we need to use instead of /

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

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 4c0fb1e63ea19e9e614009f8a05f018400b4edff..a42a93fe19e9efa2cb466b6820802d4b35c7f8ae 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -82,6 +82,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/unix/pipe.h
     wx/unix/stdpaths.h
     wx/unix/stackwalk.h
     wx/unix/pipe.h
     wx/unix/stdpaths.h
     wx/unix/stackwalk.h

+    wx/unix/tls.h

 </set>
 
 <!--
 </set>
 
 <!--


@@ -193,41 +194,37 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/osx/core/cfref.h
     wx/osx/core/cfstring.h
     wx/osx/core/hid.h
     wx/osx/core/cfref.h
     wx/osx/core/cfstring.h
     wx/osx/core/hid.h

+    wx/osx/core/private.h

     wx/osx/core/stdpaths.h
     wx/osx/core/private/strconv_cf.h
 </set>
 
     wx/osx/core/stdpaths.h
     wx/osx/core/private/strconv_cf.h
 </set>
 

-<!-- Base files used by wxMac on OS X -->
-<!-- FIXME: Maybe this ought to be named BASE_MAC_CARBON_SRC  -->
-<set var="BASE_MAC_SRC" hints="files">
-    src/osx/carbon/mimetmac.cpp
+<!-- Base files used by OS X ports (not Carbon) -->
+<set var="BASE_OSX_SHARED_SRC" hints="files">
+    src/osx/core/mimetype.cpp

     $(BASE_COREFOUNDATION_SRC)
     $(BASE_COREFOUNDATION_SRC)

+    $(BASE_UNIX_AND_DARWIN_SRC)

 </set>
 </set>

-<set var="BASE_MAC_HDR" hints="files">
+<set var="BASE_OSX_SHARED_HDR" hints="files">

     $(BASE_COREFOUNDATION_HDR)
     $(BASE_COREFOUNDATION_HDR)

+    $(BASE_UNIX_AND_DARWIN_HDR)

 </set>
 <!-- Base and GUI files used by OS X -->
 </set>
 <!-- Base and GUI files used by OS X -->

-<set var="BASE_AND_GUI_MAC_SRC" hints="files">
+<set var="BASE_AND_GUI_OSX_CARBON_SRC" hints="files">

     src/osx/carbon/utils.cpp
     src/osx/carbon/uma.cpp
 </set>
 
     src/osx/carbon/utils.cpp
     src/osx/carbon/uma.cpp
 </set>
 

-<!-- Base files used only by OS X builds -->
-<set var="BASE_MACOSX_WXMAC_SRC" hints="files">
-    $(BASE_MAC_SRC)
-    $(BASE_UNIX_AND_DARWIN_SRC)
-</set>
-<set var="BASE_MACOSX_WXMAC_HDR" hints="files">
-    $(BASE_MAC_HDR)
-    $(BASE_UNIX_AND_DARWIN_HDR)
+<set var="BASE_AND_GUI_OSX_COCOA_SRC" hints="files">
+    src/osx/cocoa/utils.mm

 </set>
 
 <!-- Base files used by non-wxMac OS X builds -->
 </set>
 
 <!-- Base files used by non-wxMac OS X builds -->

-<set var="BASE_MACOSX_NOTWXMAC_SRC" hints="files">
+<set var="BASE_OSX_NOTWXMAC_SRC" hints="files">

     $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)
     $(BASE_COREFOUNDATION_SRC)
 </set>
     $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)
     $(BASE_COREFOUNDATION_SRC)
 </set>

-<set var="BASE_MACOSX_NOTWXMAC_HDR" hints="files">
+<set var="BASE_OSX_NOTWXMAC_HDR" hints="files">

     $(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR)
     $(BASE_COREFOUNDATION_HDR)
 </set>
     $(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR)
     $(BASE_COREFOUNDATION_HDR)
 </set>


@@ -429,6 +426,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/defs.h
     wx/dir.h
     wx/dlimpexp.h
     wx/defs.h
     wx/dir.h
     wx/dlimpexp.h

+    wx/dlist.h

     wx/dynarray.h
     wx/dynlib.h
     wx/dynload.h
     wx/dynarray.h
     wx/dynlib.h
     wx/dynload.h


@@ -460,6 +458,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/ioswrap.h
     wx/ipc.h
     wx/ipcbase.h
     wx/ioswrap.h
     wx/ipc.h
     wx/ipcbase.h

+    wx/kbdstate.h

     wx/link.h
     wx/list.h
     wx/listimpl.cpp
     wx/link.h
     wx/list.h
     wx/listimpl.cpp


@@ -471,6 +470,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/memtext.h
     wx/mimetype.h
     wx/module.h
     wx/memtext.h
     wx/mimetype.h
     wx/module.h

+    wx/mousestate.h

     wx/msgout.h
     wx/mstream.h
     wx/object.h
     wx/msgout.h
     wx/mstream.h
     wx/object.h


@@ -829,6 +829,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/textctrl.h
     wx/textdlg.h
     wx/textentry.h
     wx/textctrl.h
     wx/textdlg.h
     wx/textentry.h

+    wx/tls.h

     wx/toolbar.h
     wx/validate.h
     wx/valtext.h
     wx/toolbar.h
     wx/validate.h
     wx/valtext.h


@@ -997,6 +998,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/minifram.cpp
     src/gtk/pen.cpp
     src/gtk/popupwin.cpp
     src/gtk/minifram.cpp
     src/gtk/pen.cpp
     src/gtk/popupwin.cpp

+    src/gtk/private.cpp

     src/gtk/region.cpp
     src/gtk/renderer.cpp
     src/gtk/settings.cpp
     src/gtk/region.cpp
     src/gtk/renderer.cpp
     src/gtk/settings.cpp


@@ -2151,114 +2153,147 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!--                                wxMac                                   -->
 <!-- ====================================================================== -->
 
 <!--                                wxMac                                   -->
 <!-- ====================================================================== -->
 

-<set var="MAC_OSX_LOWLEVEL_SRC" hints="files">
+<set var="OSX_LOWLEVEL_SRC" hints="files">

     <!-- Shared wxMac and wxCocoa files -->
     <!-- Shared wxMac and wxCocoa files -->

+    <if cond="PLATFORM_MACOSX=='1'">
+    src/osx/accel.cpp
+    src/osx/artmac.cpp
+    src/osx/bmpbuttn_osx.cpp
+    src/osx/brush.cpp
+    src/osx/button_osx.cpp
+    src/osx/checkbox_osx.cpp
+    src/osx/checklst_osx.cpp
+    src/osx/choice_osx.cpp
+    src/osx/dialog_osx.cpp
+    src/osx/fontutil.cpp
+    src/osx/gauge_osx.cpp
+    src/osx/imaglist.cpp
+    src/osx/listbox_osx.cpp
+    src/osx/menu_osx.cpp
+    src/osx/menuitem_osx.cpp
+    src/osx/minifram.cpp
+    src/osx/nonownedwnd_osx.cpp
+    src/osx/notebook_osx.cpp
+    src/osx/palette.cpp
+    src/osx/pen.cpp
+    src/osx/radiobox_osx.cpp
+    src/osx/radiobut_osx.cpp
+    src/osx/scrolbar_osx.cpp
+    src/osx/slider_osx.cpp
+    src/osx/spinbutt_osx.cpp
+    src/osx/spinctrl_osx.cpp
+    src/osx/srchctrl_osx.cpp
+    src/osx/statbox_osx.cpp
+    src/osx/statline_osx.cpp
+    src/osx/stattext_osx.cpp
+    src/osx/tabctrl_osx.cpp
+    src/osx/textctrl_osx.cpp
+    src/osx/tglbtn_osx.cpp
+    src/osx/toolbar_osx.cpp
+    src/osx/toplevel_osx.cpp
+    src/osx/utils_osx.cpp
+    <!-- src/osx/treectrl.cpp -->
+    src/osx/window_osx.cpp
+
+    src/osx/core/bitmap.cpp
+    src/osx/core/colour.cpp
+    src/osx/core/dcmemory.cpp
+    src/osx/core/display.cpp
+    src/osx/core/fontenum.cpp

     src/osx/core/hid.cpp
     src/osx/core/hid.cpp

+    src/osx/core/printmac.cpp
+    src/osx/core/timer.cpp

     src/osx/core/utilsexc_cf.cpp
     src/osx/core/utilsexc_cf.cpp

+    </if>

 </set>
 
 </set>
 

-<set var="MAC_OSX_LOWLEVEL_HDR" hints="files">
+<set var="OSX_LOWLEVEL_HDR" hints="files">

 </set>
 
 </set>
 

-<set var="MAC_LOWLEVEL_SRC" hints="files">
-    <if cond="PLATFORM_MACOSX=='1'">$(MAC_OSX_LOWLEVEL_SRC)</if>
+<!--
+<set var="OSX_LOWLEVEL_SRC" hints="files">
+    <if cond="PLATFORM_MACOSX=='1'">$(OSX_LOWLEVEL_SRC)</if>

 </set>
 </set>

-<set var="MAC_LOWLEVEL_HDR" hints="files">
-    <if cond="PLATFORM_MACOSX=='1'">$(MAC_OSX_LOWLEVEL_HDR)</if>
+<set var="OSX_LOWLEVEL_HDR" hints="files">
+    <if cond="PLATFORM_MACOSX=='1'">$(OSX_LOWLEVEL_HDR)</if>

 </set>
 </set>

+-->

 
 

-<set var="MAC_OSX_SRC" hints="files">
+<set var="OSX_CARBON_COCOA_SRC" hints="files">

 <if cond="PLATFORM_MACOSX=='1'">
     <!-- wxWebKit files -->
 <if cond="PLATFORM_MACOSX=='1'">
     <!-- wxWebKit files -->

-    src/html/htmlctrl/webkit/webkit.mm
+    <!-- (TODO Move one level up) -->

     <!-- Native color/font dialogs -->
     <!-- Native color/font dialogs -->

-    src/osx/carbon/fontdlgosx.mm

     src/osx/carbon/colordlgosx.mm
     src/osx/carbon/colordlgosx.mm

+    src/osx/carbon/fontdlgosx.mm
+    <!-- other shared files -->
+    src/osx/carbon/clipbrd.cpp
+    src/osx/carbon/cursor.cpp
+    src/osx/carbon/fontdlg.cpp
+    src/osx/carbon/gdiobj.cpp
+    src/osx/carbon/icon.cpp
+    src/osx/carbon/app.cpp
+    src/osx/carbon/combobox.cpp
+    src/osx/carbon/control.cpp
+    src/osx/carbon/dataobj.cpp
+    src/osx/carbon/dcclient.cpp
+    src/osx/carbon/dcprint.cpp
+    src/osx/carbon/dcscreen.cpp
+    src/osx/carbon/graphics.cpp
+    src/osx/carbon/dnd.cpp
+    src/osx/carbon/font.cpp
+    src/osx/carbon/frame.cpp
+    src/osx/carbon/mdi.cpp
+    src/osx/carbon/metafile.cpp
+    src/osx/carbon/overlay.cpp
+    src/osx/carbon/popupwin.cpp
+    src/osx/carbon/printdlg.cpp
+    src/osx/carbon/renderer.cpp
+    src/osx/carbon/settings.cpp
+    src/osx/carbon/statbrma.cpp
+    src/osx/carbon/tabctrl.cpp

     <!-- cocoa bridge -->
     src/osx/carbon/utilscocoa.mm
 </if>
 </set>
 
     <!-- cocoa bridge -->
     src/osx/carbon/utilscocoa.mm
 </if>
 </set>
 

-<set var="MAC_SRC" hints="files">
-    <!-- osx common files -->
-    src/osx/brush.cpp
-    src/osx/pen.cpp
-    <!-- core files -->
-    src/osx/core/colour.cpp
-    src/osx/core/timer.cpp
+<set var="OSX_CARBON_SRC" hints="files">

     <!-- carbon files -->
     <!-- carbon files -->

-    src/osx/carbon/accel.cpp
-    src/osx/carbon/app.cpp
-    src/osx/carbon/artmac.cpp
-    src/osx/carbon/bitmap.cpp
+    $(OSX_CARBON_COCOA_SRC)

     src/osx/carbon/bmpbuttn.cpp
     src/osx/carbon/button.cpp
     src/osx/carbon/checkbox.cpp
     src/osx/carbon/bmpbuttn.cpp
     src/osx/carbon/button.cpp
     src/osx/carbon/checkbox.cpp

-    src/osx/carbon/checklst.cpp

     src/osx/carbon/choice.cpp
     src/osx/carbon/choice.cpp

-    src/osx/carbon/clipbrd.cpp

     src/osx/carbon/colordlg.cpp
     src/osx/carbon/colordlg.cpp

-    src/osx/carbon/combobox.cpp
-    src/osx/carbon/control.cpp
-    src/osx/carbon/cursor.cpp
-    src/osx/carbon/dataobj.cpp
-    src/osx/carbon/dcclient.cpp
-    src/osx/carbon/dcmemory.cpp
-    src/osx/carbon/dcprint.cpp
-    src/osx/carbon/dcscreen.cpp

     src/osx/carbon/dialog.cpp
     src/osx/carbon/dirdlg.cpp
     src/osx/carbon/dialog.cpp
     src/osx/carbon/dirdlg.cpp

-    src/osx/carbon/display.cpp
-    src/osx/carbon/dnd.cpp

     src/osx/carbon/evtloop.cpp
     src/osx/carbon/filedlg.cpp
     src/osx/carbon/evtloop.cpp
     src/osx/carbon/filedlg.cpp

-    src/osx/carbon/font.cpp
-    src/osx/carbon/fontdlg.cpp
-    src/osx/carbon/fontenum.cpp
-    src/osx/carbon/fontutil.cpp
-    src/osx/carbon/frame.cpp

     src/osx/carbon/gauge.cpp
     src/osx/carbon/gauge.cpp

-    src/osx/carbon/gdiobj.cpp
-    src/osx/carbon/graphics.cpp
-    src/osx/carbon/icon.cpp
-    src/osx/carbon/imaglist.cpp

     src/osx/carbon/listbox.cpp
     src/osx/carbon/listctrl_mac.cpp
     src/osx/carbon/listbox.cpp
     src/osx/carbon/listctrl_mac.cpp

-    src/osx/carbon/mdi.cpp

     src/osx/carbon/menu.cpp
     src/osx/carbon/menuitem.cpp
     src/osx/carbon/menu.cpp
     src/osx/carbon/menuitem.cpp

-    src/osx/carbon/metafile.cpp
-    src/osx/carbon/minifram.cpp

     src/osx/carbon/msgdlg.cpp
     src/osx/carbon/nonownedwnd.cpp
     src/osx/carbon/notebmac.cpp
     src/osx/carbon/msgdlg.cpp
     src/osx/carbon/nonownedwnd.cpp
     src/osx/carbon/notebmac.cpp

-    src/osx/carbon/overlay.cpp
-    src/osx/carbon/palette.cpp
-    src/osx/carbon/popupwin.cpp
-    src/osx/carbon/printdlg.cpp
-    src/osx/carbon/printmac.cpp
-    src/osx/carbon/radiobox.cpp

     src/osx/carbon/radiobut.cpp
     src/osx/carbon/region.cpp
     src/osx/carbon/radiobut.cpp
     src/osx/carbon/region.cpp

-    src/osx/carbon/renderer.cpp

     src/osx/carbon/scrolbar.cpp
     src/osx/carbon/scrolbar.cpp

-    src/osx/carbon/settings.cpp

     src/osx/carbon/slider.cpp
     src/osx/carbon/spinbutt.cpp
     src/osx/carbon/slider.cpp
     src/osx/carbon/spinbutt.cpp

-    src/osx/carbon/spinctrl.cpp

     src/osx/carbon/srchctrl.cpp
     src/osx/carbon/statbmp.cpp
     src/osx/carbon/statbox.cpp
     src/osx/carbon/srchctrl.cpp
     src/osx/carbon/statbmp.cpp
     src/osx/carbon/statbox.cpp

-    src/osx/carbon/statbrma.cpp

     src/osx/carbon/statlmac.cpp
     src/osx/carbon/stattext.cpp
     src/osx/carbon/statlmac.cpp
     src/osx/carbon/stattext.cpp

-    src/osx/carbon/tabctrl.cpp

     src/osx/carbon/textctrl.cpp
     src/osx/carbon/tglbtn.cpp
     src/osx/carbon/toolbar.cpp
     src/osx/carbon/tooltip.cpp
     src/osx/carbon/textctrl.cpp
     src/osx/carbon/tglbtn.cpp
     src/osx/carbon/toolbar.cpp
     src/osx/carbon/tooltip.cpp

-    src/osx/carbon/toplevel.cpp

     src/osx/carbon/window.cpp
     src/osx/carbon/window.cpp

+    
+    src/html/htmlctrl/webkit/webkit.mm

     <!-- Generic implementations used by wxMac: -->
     src/generic/caret.cpp
     src/generic/clrpickerg.cpp
     <!-- Generic implementations used by wxMac: -->
     src/generic/caret.cpp
     src/generic/clrpickerg.cpp


@@ -2274,7 +2309,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <!-- Header files like wx/osx/foo.h which include wx/osx/carbon/foo.h -->
 </set>
 
 <!-- Header files like wx/osx/foo.h which include wx/osx/carbon/foo.h -->

-<set var="MAC_CMN_HDR" hints="files">
+<set var="OSX_SHARED_HDR" hints="files">

     wx/osx/accel.h
     wx/osx/app.h
     wx/osx/bitmap.h
     wx/osx/accel.h
     wx/osx/app.h
     wx/osx/bitmap.h


@@ -2355,7 +2390,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/osx/window.h
 </set>
 <!-- wxMac Carbon header files -->
     wx/osx/window.h
 </set>
 <!-- wxMac Carbon header files -->

-<set var="MAC_HDR" hints="files">
+<set var="OSX_CARBON_HDR" hints="files">

     <!-- core files -->
     wx/osx/core/colour.h
     <!-- carbon files -->
     <!-- core files -->
     wx/osx/core/colour.h
     <!-- carbon files -->


@@ -2451,6 +2486,69 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/html/webkit.h
 </set>
 
     wx/html/webkit.h
 </set>
 

+<!-- ====================================================================== -->
+<!--                              wxMac/Cocoa                               -->
+<!-- ====================================================================== -->
+
+<set var="OSX_COCOA_SRC" hints="files">
+    $(OSX_CARBON_COCOA_SRC)
+    src/osx/cocoa/bmpbuttn.mm
+    src/osx/cocoa/button.mm
+    src/osx/cocoa/checkbox.mm
+    src/osx/cocoa/choice.mm
+    src/osx/cocoa/dialog.mm
+    src/osx/cocoa/dirdlg.mm
+    src/osx/cocoa/evtloop.mm
+    src/osx/cocoa/filedlg.mm
+    src/osx/cocoa/gauge.mm
+    src/osx/cocoa/listbox.mm
+    src/osx/cocoa/menu.mm
+    src/osx/cocoa/menuitem.mm
+    src/osx/cocoa/msgdlg.mm
+    src/osx/cocoa/nonownedwnd.mm
+    src/osx/cocoa/notebook.mm
+    src/osx/cocoa/radiobut.mm
+    src/osx/cocoa/scrolbar.mm
+    src/osx/cocoa/slider.mm
+    src/osx/cocoa/spinbutt.mm
+    src/osx/cocoa/srchctrl.mm
+    src/osx/cocoa/statbox.mm
+    src/osx/cocoa/statline.mm
+    src/osx/cocoa/stattext.mm
+    src/osx/cocoa/textctrl.mm
+    src/osx/cocoa/tglbtn.mm
+    src/osx/cocoa/toolbar.mm
+    src/osx/cocoa/tooltip.mm
+    src/osx/cocoa/window.mm
+    src/generic/caret.cpp
+    src/generic/clrpickerg.cpp
+    src/generic/collpaneg.cpp
+    src/generic/fdrepdlg.cpp
+    src/generic/filepickerg.cpp
+    src/generic/fontdlgg.cpp
+    src/generic/fontpickerg.cpp
+    src/generic/listctrl.cpp
+    src/generic/prntdlgg.cpp
+    src/generic/regiong.cpp
+    src/generic/statusbr.cpp
+    src/generic/tabg.cpp
+</set>
+<set var="OSX_COCOA_HDR" hints="files">
+    wx/osx/cocoa/chkconf.h
+    wx/osx/cocoa/private.h
+    $(OSX_CARBON_HDR) <!-- FIXME: these headers need moved somewhere shared... -->
+    wx/generic/region.h
+</set>
+
+<!-- ====================================================================== -->
+<!--                              wxMac/iPhone                              -->
+<!-- ====================================================================== -->
+
+<set var="OSX_IPHONE_SRC" hints="files">
+src/osx/iphone/nonownedwnd.mm
+src/osx/iphone/utils.mm
+src/osx/iphone/window.mm
+</set>

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


@@ -2880,7 +2978,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/joystick.h
 </set>
 
     wx/msw/joystick.h
 </set>
 

-<set var="ADVANCED_MAC_SRC" hints="files">
+<set var="ADVANCED_OSX_CARBON_SRC" hints="files">

     src/common/taskbarcmn.cpp
     src/generic/animateg.cpp
     src/osx/carbon/aboutdlg.cpp
     src/common/taskbarcmn.cpp
     src/generic/animateg.cpp
     src/osx/carbon/aboutdlg.cpp


@@ -2891,7 +2989,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/osx/carbon/taskbar.cpp
     src/osx/core/hidjoystick.cpp
 </set>
     src/osx/carbon/taskbar.cpp
     src/osx/core/hidjoystick.cpp
 </set>

-<set var="ADVANCED_MAC_HDR" hints="files">
+
+<set var="ADVANCED_OSX_CARBON_HDR" hints="files">

     wx/generic/animate.h
     wx/osx/dataview.h
     wx/osx/joystick.h
     wx/generic/animate.h
     wx/osx/dataview.h
     wx/osx/joystick.h


@@ -2904,12 +3003,34 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/osx/core/joystick.h
 </set>
 
     wx/osx/core/joystick.h
 </set>
 

+<set var="ADVANCED_OSX_COCOA_SRC" hints="files">
+    src/common/taskbarcmn.cpp
+    src/generic/animateg.cpp
+    src/osx/cocoa/aboutdlg.mm
+    src/osx/cocoa/taskbar.mm
+    src/osx/core/hidjoystick.cpp
+</set>
+
+<set var="ADVANCED_OSX_COCOA_HDR" hints="files">
+    wx/generic/animate.h
+    wx/osx/dataview.h
+    wx/osx/joystick.h
+    wx/osx/sound.h
+    <!--wx/osx/carbon/drawer.h -->
+    <!--wx/osx/carbon/dataview.h -->
+    <!--wx/osx/carbon/databrow.h -->
+    wx/osx/carbon/sound.h
+    wx/osx/carbon/taskbarosx.h
+    wx/osx/core/joystick.h
+</set>
+

 <set var="ADVANCED_COCOA_SRC" hints="files">
     src/cocoa/taskbar.mm
     src/common/taskbarcmn.cpp
     src/generic/animateg.cpp
     src/osx/core/hidjoystick.cpp
 </set>
 <set var="ADVANCED_COCOA_SRC" hints="files">
     src/cocoa/taskbar.mm
     src/common/taskbarcmn.cpp
     src/generic/animateg.cpp
     src/osx/core/hidjoystick.cpp
 </set>

+

 <set var="ADVANCED_COCOA_HDR" hints="files">
     wx/cocoa/taskbar.h
     wx/generic/animate.h
 <set var="ADVANCED_COCOA_HDR" hints="files">
     wx/cocoa/taskbar.h
     wx/generic/animate.h


@@ -3015,10 +3136,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="MEDIA_MSW_DESKTOP_HDR" hints="files">
 </set>
 
 <set var="MEDIA_MSW_DESKTOP_HDR" hints="files">
 </set>
 

-<set var="MEDIA_MAC_SRC" hints="files">
+<set var="MEDIA_OSX_CARBON_SRC" hints="files">

     src/osx/carbon/mediactrl.cpp
 </set>
     src/osx/carbon/mediactrl.cpp
 </set>

-<set var="MEDIA_MAC_HDR" hints="files">
+<set var="MEDIA_OSX_CARBON_HDR" hints="files">
+</set>
+
+<set var="MEDIA_OSX_COCOA_SRC" hints="files">
+    <!-- src/osx/cocoa/mediactrl.mm -->
+</set>
+<set var="MEDIA_OSX_COCOA_HDR" hints="files">

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


@@ -3262,7 +3389,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <set var="OPENGL_SRC_PLATFORM" hints="files">
 <!-- ====================================================================== -->
 
 <set var="OPENGL_SRC_PLATFORM" hints="files">

-    <if cond="TOOLKIT=='MAC'">src/osx/carbon/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='OSX_CARBON'">src/osx/carbon/glcanvas.cpp src/osx/glcanvas_osx.cpp</if>
+    <if cond="TOOLKIT=='OSX_COCOA'">src/osx/cocoa/glcanvas.mm src/osx/glcanvas_osx.cpp</if>

     <if cond="TOOLKIT=='COCOA'">src/cocoa/glcanvas.mm</if>
     <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
         src/gtk/glcanvas.cpp
     <if cond="TOOLKIT=='COCOA'">src/cocoa/glcanvas.mm</if>
     <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
         src/gtk/glcanvas.cpp


@@ -3285,7 +3413,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="OPENGL_HDR_PLATFORM" hints="files">
 </set>
 
 <set var="OPENGL_HDR_PLATFORM" hints="files">

-    <if cond="TOOLKIT=='MAC'">wx/osx/glcanvas.h wx/osx/carbon/glcanvas.h</if>
+    <if cond="TOOLKIT=='OSX_CARBON'">wx/osx/glcanvas.h wx/osx/carbon/glcanvas.h</if>

     <if cond="TOOLKIT=='COCOA'">wx/cocoa/glcanvas.h</if>
     <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
         wx/gtk/glcanvas.h
     <if cond="TOOLKIT=='COCOA'">wx/cocoa/glcanvas.h</if>
     <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
         wx/gtk/glcanvas.h


@@ -3324,6 +3452,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/aui/dockart.cpp
     src/aui/floatpane.cpp
     src/aui/auibook.cpp
     src/aui/dockart.cpp
     src/aui/floatpane.cpp
     src/aui/auibook.cpp

+    src/aui/auibar.cpp

     src/aui/tabmdi.cpp
 </set>
 <set var="AUI_HDR" hints="files">
     src/aui/tabmdi.cpp
 </set>
 <set var="AUI_HDR" hints="files">


@@ -3331,10 +3460,37 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/aui/dockart.h
     wx/aui/floatpane.h
     wx/aui/auibook.h
     wx/aui/dockart.h
     wx/aui/floatpane.h
     wx/aui/auibook.h

+    wx/aui/auibar.h

     wx/aui/tabmdi.h
     wx/aui/aui.h
 </set>
 
     wx/aui/tabmdi.h
     wx/aui/aui.h
 </set>
 

+<!-- ====================================================================== -->
+<!--                                  wxPropertyGrid                        -->
+<!-- ====================================================================== -->
+
+<set var="PROPGRID_SRC" hints="files">
+    src/propgrid/advprops.cpp
+    src/propgrid/editors.cpp
+    src/propgrid/manager.cpp
+    src/propgrid/property.cpp
+    src/propgrid/propgrid.cpp
+    src/propgrid/propgridiface.cpp
+    src/propgrid/propgridpagestate.cpp
+    src/propgrid/props.cpp
+</set>
+<set var="PROPGRID_HDR" hints="files">
+    wx/propgrid/advprops.h
+    wx/propgrid/editors.h
+    wx/propgrid/manager.h
+    wx/propgrid/property.h
+    wx/propgrid/propgrid.h
+    wx/propgrid/propgriddefs.h
+    wx/propgrid/propgridiface.h
+    wx/propgrid/propgridpagestate.h
+    wx/propgrid/props.h
+</set>
+

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


@@ -3385,28 +3541,30 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
     <!-- Nested if would be nicer, but this works -->
     <!-- These are the files for PLATFORM_MACOSX -->
 
     <!-- Nested if would be nicer, but this works -->
     <!-- These are the files for PLATFORM_MACOSX -->

-    <set var="BASE_MACOSX_SRC" hints="files">
-        <if cond="TOOLKIT=='MAC'">$(BASE_MACOSX_WXMAC_SRC)</if>
-        <if cond="TOOLKIT=='COCOA'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
-        <if cond="TOOLKIT=='GTK'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
-        <if cond="TOOLKIT=='X11'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
-        <if cond="TOOLKIT=='MOTIF'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
+    <set var="BASE_OSX_SRC" hints="files">
+        <if cond="TOOLKIT=='OSX_CARBON'">$(BASE_OSX_SHARED_SRC)</if>
+        <if cond="TOOLKIT=='OSX_COCOA'">$(BASE_OSX_SHARED_SRC)</if>
+        <if cond="TOOLKIT=='COCOA'">$(BASE_OSX_NOTWXMAC_SRC)</if>
+        <if cond="TOOLKIT=='GTK'">$(BASE_OSX_NOTWXMAC_SRC)</if>
+        <if cond="TOOLKIT=='X11'">$(BASE_OSX_NOTWXMAC_SRC)</if>
+        <if cond="TOOLKIT=='MOTIF'">$(BASE_OSX_NOTWXMAC_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 -->
         <!-- 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_MACOSX_NOTWXMAC_SRC)</if>
+        <if cond="TOOLKIT==''">$(BASE_OSX_NOTWXMAC_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>
     </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_MACOSX=='1'">$(BASE_OSX_SHARED_SRC)</if>

         <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_SRC)</if>
         <if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_SRC)</if>
         <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_SRC)</if>
     </set>
     <set var="BASE_AND_GUI_TOOLKIT_SRC" hints="files">
         <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_SRC)</if>
         <if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_SRC)</if>
         <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_SRC)</if>
     </set>
     <set var="BASE_AND_GUI_TOOLKIT_SRC" hints="files">

-        <if cond="TOOLKIT=='MAC'">$(BASE_AND_GUI_MAC_SRC)</if>
+        <if cond="TOOLKIT=='OSX_CARBON'">$(BASE_AND_GUI_OSX_CARBON_SRC)</if>
+        <if cond="TOOLKIT=='OSX_COCOA'">$(BASE_AND_GUI_OSX_COCOA_SRC)</if>

     </set>
     <set var="BASE_AND_GUI_PLATFORM_SRC" hints="files">
         <if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
     </set>
     <set var="BASE_AND_GUI_PLATFORM_SRC" hints="files">
         <if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>


@@ -3418,22 +3576,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
     <!-- Nested if would be nicer, but this works -->
     <!-- These are the files for PLATFORM_MACOSX -->
 
     <!-- Nested if would be nicer, but this works -->
     <!-- These are the files for PLATFORM_MACOSX -->

-    <set var="BASE_MACOSX_HDR" hints="files">
-        <if cond="TOOLKIT=='MAC'">$(BASE_MACOSX_WXMAC_HDR)</if>
-        <if cond="TOOLKIT=='COCOA'">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
-        <if cond="TOOLKIT=='GTK'">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
-        <if cond="TOOLKIT=='X11'">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
-        <if cond="TOOLKIT=='MOTIF'">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
+    <set var="BASE_OSX_HDR" hints="files">
+        <if cond="TOOLKIT=='OSX_CARBON'">$(BASE_OSX_SHARED_HDR)</if>
+        <if cond="TOOLKIT=='OSX_COCOA'">$(BASE_OSX_SHARED_HDR)</if>
+        <if cond="TOOLKIT=='COCOA'">$(BASE_OSX_NOTWXMAC_HDR)</if>
+        <if cond="TOOLKIT=='GTK'">$(BASE_OSX_NOTWXMAC_HDR)</if>
+        <if cond="TOOLKIT=='X11'">$(BASE_OSX_NOTWXMAC_HDR)</if>
+        <if cond="TOOLKIT=='MOTIF'">$(BASE_OSX_NOTWXMAC_HDR)</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 -->
         <!-- 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_MACOSX_NOTWXMAC_HDR)</if>
+        <if cond="TOOLKIT==''">$(BASE_OSX_NOTWXMAC_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>
     </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="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_HDR)</if>
+        <if cond="PLATFORM_MACOSX=='1'">$(BASE_OSX_HDR)</if>

         <if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_HDR)</if>
         <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_HDR)</if>
         <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_HDR)</if>
         <if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_HDR)</if>
         <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_HDR)</if>
         <if cond="PLATFORM_OS2=='1'">$(BASE_OS2_HDR)</if>


@@ -3475,7 +3634,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_DESKTOP_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_DESKTOP_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_SRC)</if>

-        <if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_SRC)</if>
+        <if cond="TOOLKIT=='OSX_CARBON'">$(OSX_LOWLEVEL_SRC)</if>
+        <if cond="TOOLKIT=='OSX_COCOA'">$(OSX_LOWLEVEL_SRC)</if>

         <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_SRC)</if>


@@ -3488,7 +3648,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR) $(MSW_DESKTOP_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR) $(MSW_DESKTOP_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_HDR)</if>

-        <if cond="TOOLKIT=='MAC'">$(MAC_LOWLEVEL_HDR)</if>
+        <if cond="TOOLKIT=='OSX_CARBON'">$(OSX_LOWLEVEL_HDR)</if>
+        <if cond="TOOLKIT=='OSX_COCOA'">$(OSX_LOWLEVEL_HDR)</if>

         <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='PM'">$(OS2_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_HDR)</if>


@@ -3507,7 +3668,8 @@ 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_DESKTOP_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_DESKTOP_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(MSW_SRC) $(WINCE_SRC)</if>

-        <if cond="TOOLKIT=='MAC'">$(MAC_SRC) $(MAC_OSX_SRC)</if>
+        <if cond="TOOLKIT=='OSX_CARBON'">$(OSX_CARBON_SRC)</if>
+        <if cond="TOOLKIT=='OSX_COCOA'">$(OSX_COCOA_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>


@@ -3517,7 +3679,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_DESKTOP_HDR)</if>
         <if cond="TOOLKIT=='WINCE'">$(MSW_HDR) $(WINCE_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_DESKTOP_HDR)</if>
         <if cond="TOOLKIT=='WINCE'">$(MSW_HDR) $(WINCE_HDR)</if>

-        <if cond="TOOLKIT=='MAC'">$(MAC_CMN_HDR) $(MAC_HDR)</if>
+        <if cond="TOOLKIT=='OSX_CARBON'">$(OSX_SHARED_HDR) $(OSX_CARBON_HDR)</if>
+        <if cond="TOOLKIT=='OSX_COCOA'">$(OSX_SHARED_HDR) $(OSX_COCOA_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>


@@ -3535,7 +3698,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="ADVANCED_PLATFORM_SRC" hints="files">
         <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC) $(ADVANCED_MSW_DESKTOP_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_SRC)</if>
     <set var="ADVANCED_PLATFORM_SRC" hints="files">
         <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC) $(ADVANCED_MSW_DESKTOP_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_SRC)</if>

-        <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_SRC)</if>
+        <if cond="TOOLKIT=='OSX_CARBON'">$(ADVANCED_OSX_CARBON_SRC)</if>
+        <if cond="TOOLKIT=='OSX_COCOA'">$(ADVANCED_OSX_COCOA_SRC)</if>

         <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC) $(ADVANCED_MOTIF_SRC)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC) $(ADVANCED_MOTIF_SRC)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>


@@ -3547,7 +3711,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="ADVANCED_PLATFORM_HDR" hints="files">
         <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR) $(ADVANCED_MSW_DESKTOP_HDR)</if>
         <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_HDR)</if>
     <set var="ADVANCED_PLATFORM_HDR" hints="files">
         <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_HDR) $(ADVANCED_MSW_DESKTOP_HDR)</if>
         <if cond="TOOLKIT=='WINCE'">$(ADVANCED_MSW_HDR)</if>

-        <if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_HDR)</if>
+        <if cond="TOOLKIT=='OSX_CARBON'">$(ADVANCED_OSX_CARBON_HDR)</if>
+        <if cond="TOOLKIT=='OSX_COCOA'">$(ADVANCED_OSX_COCOA_HDR)</if>

         <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR) $(ADVANCED_MOTIF_HDR)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR) $(ADVANCED_MOTIF_HDR)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK_HDR)</if>


@@ -3582,7 +3747,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="MEDIA_PLATFORM_SRC" hints="files">
         <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_SRC) $(MEDIA_MSW_DESKTOP_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_SRC)</if>
     <set var="MEDIA_PLATFORM_SRC" hints="files">
         <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_SRC) $(MEDIA_MSW_DESKTOP_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_SRC)</if>

-        <if cond="TOOLKIT=='MAC'">$(MEDIA_MAC_SRC)</if>
+        <if cond="TOOLKIT=='OSX_CARBON'">$(MEDIA_OSX_CARBON_SRC)</if>
+        <if cond="TOOLKIT=='OSX_COCOA'">$(MEDIA_OSX_COCOA_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=='COCOA'">$(MEDIA_COCOA_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_SRC)</if>
         <if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_SRC) $(MEDIA_GTK_SRC)</if>


@@ -3592,7 +3758,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="MEDIA_PLATFORM_HDR" hints="files">
         <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_HDR) $(MEDIA_MSW_DESKTOP_HDR)</if>
         <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_HDR)</if>
     <set var="MEDIA_PLATFORM_HDR" hints="files">
         <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_HDR) $(MEDIA_MSW_DESKTOP_HDR)</if>
         <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_HDR)</if>

-        <if cond="TOOLKIT=='MAC'">$(MEDIA_MAC_HDR)</if>
+        <if cond="TOOLKIT=='OSX_CARBON'">$(MEDIA_OSX_CARBON_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=='COCOA'">$(MEDIA_COCOA_HDR)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_HDR)</if>
         <if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_HDR)</if>


@@ -3614,8 +3780,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
             $(LOWLEVEL_HDR)
             $(GUI_CORE_HEADERS)
             $(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
             $(LOWLEVEL_HDR)
             $(GUI_CORE_HEADERS)
             $(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)

-            $(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(RICHTEXT_HDR)
-            $(STC_HDR)
+            $(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(PROPGRID_HDR)
+            $(RICHTEXT_HDR) $(STC_HDR)

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


@@ -3635,7 +3801,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(BASE_CMN_HDR)
         $(BASE_UNIX_HDR)
         $(BASE_WIN32_HDR) $(BASE_WINCE_HDR)
         $(BASE_CMN_HDR)
         $(BASE_UNIX_HDR)
         $(BASE_WIN32_HDR) $(BASE_WINCE_HDR)

-        $(BASE_MACOSX_HDR)
+        $(BASE_OSX_HDR)

         $(BASE_PALMOS_HDR)
         $(BASE_MSDOS_HDR)
         $(NET_CMN_HDR)
         $(BASE_PALMOS_HDR)
         $(BASE_MSDOS_HDR)
         $(NET_CMN_HDR)


@@ -3650,12 +3816,13 @@ 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_OSX_SRC)

         $(BASE_OS2_SRC)
         $(BASE_MSDOS_SRC)
         $(BASE_PALMOS_SRC)
         $(BASE_AND_GUI_CMN_SRC)
         $(BASE_OS2_SRC)
         $(BASE_MSDOS_SRC)
         $(BASE_PALMOS_SRC)
         $(BASE_AND_GUI_CMN_SRC)

-        $(BASE_AND_GUI_MAC_SRC)
+        $(BASE_AND_GUI_OSX_CARBON_SRC)
+        $(BASE_AND_GUI_OSX_COCOA_SRC)

         $(BASE_AND_GUI_WIN32_SRC)
         $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_WINCE_SRC)
         $(XML_SRC)
         $(BASE_AND_GUI_WIN32_SRC)
         $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_WINCE_SRC)
         $(XML_SRC)