Update OS X Cocoa build files after recent changes and rebake.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

build/bakefiles/files.bkl

@@ -2160,6 +2160,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <!-- 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
@@ -2261,7 +2262,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="OSX_CARBON_SRC" hints="files">
     <!-- carbon files -->
     $(OSX_CARBON_COCOA_SRC)
-    src/osx/artmac.cpp
     src/osx/carbon/bmpbuttn.cpp
     src/osx/carbon/button.cpp
     src/osx/carbon/checkbox.cpp
@@ -2927,17 +2927,17 @@ src/osx/iphone/window.mm
     wx/osx/dataview.h
     wx/osx/joystick.h
     wx/osx/sound.h
+    wx/osx/taskbarosx.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_OSX_COCOA_SRC" hints="files">
     src/common/taskbarcmn.cpp
     src/generic/animateg.cpp
+    src/osx/carbon/sound.cpp
     src/osx/cocoa/aboutdlg.mm
     src/osx/cocoa/taskbar.mm
     src/osx/core/hidjoystick.cpp
@@ -3347,6 +3347,7 @@ src/osx/iphone/window.mm
 
 <set var="OPENGL_HDR_PLATFORM" hints="files">
     <if cond="TOOLKIT=='OSX_CARBON'">wx/osx/glcanvas.h wx/osx/carbon/glcanvas.h</if>
+    <if cond="TOOLKIT=='OSX_COCOA'">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