X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c4293cb91327247ad69e6ec8d589bfaa299db28..fe6b1b853aaa900356d12f69e8e3d84467221f4c:/build/bakefiles/files.bkl?ds=sidebyside

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index f7f5ccc49f..a42a93fe19 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -426,6 +426,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/defs.h
     wx/dir.h
     wx/dlimpexp.h
+    wx/dlist.h
     wx/dynarray.h
     wx/dynlib.h
     wx/dynload.h
@@ -457,6 +458,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/ioswrap.h
     wx/ipc.h
     wx/ipcbase.h
+    wx/kbdstate.h
     wx/link.h
     wx/list.h
     wx/listimpl.cpp
@@ -468,6 +470,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/memtext.h
     wx/mimetype.h
     wx/module.h
+    wx/mousestate.h
     wx/msgout.h
     wx/mstream.h
     wx/object.h
@@ -2240,6 +2243,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -2248,7 +2252,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/osx/carbon/settings.cpp
     src/osx/carbon/statbrma.cpp
     src/osx/carbon/tabctrl.cpp
-    src/osx/carbon/tooltip.cpp
     <!-- cocoa bridge -->
     src/osx/carbon/utilscocoa.mm
 </if>
@@ -2269,7 +2272,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/osx/carbon/gauge.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/msgdlg.cpp
@@ -2288,6 +2290,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/osx/carbon/textctrl.cpp
     src/osx/carbon/tglbtn.cpp
     src/osx/carbon/toolbar.cpp
+    src/osx/carbon/tooltip.cpp
     src/osx/carbon/window.cpp
     
     src/html/htmlctrl/webkit/webkit.mm
@@ -2498,7 +2501,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/osx/cocoa/evtloop.mm
     src/osx/cocoa/filedlg.mm
     src/osx/cocoa/gauge.mm
-    src/osx/cocoa/glcanvas.mm
     src/osx/cocoa/listbox.mm
     src/osx/cocoa/menu.mm
     src/osx/cocoa/menuitem.mm
@@ -2516,6 +2518,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -2531,7 +2534,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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>
 
 <!-- ====================================================================== -->
@@ -3001,11 +3007,7 @@ src/osx/iphone/window.mm
     src/common/taskbarcmn.cpp
     src/generic/animateg.cpp
     src/osx/cocoa/aboutdlg.mm
-    <!-- src/osx/carbon/drawer.cpp -->
-    <!-- src/osx/carbon/dataview.cpp -->
-    <!-- src/osx/carbon/databrow.cpp -->
-    <!-- src/osx/carbon/sound.cpp -->
-    src/osx/carbon/taskbar.cpp
+    src/osx/cocoa/taskbar.mm
     src/osx/core/hidjoystick.cpp
 </set>
 
@@ -3140,6 +3142,12 @@ src/osx/iphone/window.mm
 <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">
     src/cocoa/mediactrl.mm
 </set>
@@ -3382,6 +3390,7 @@ src/osx/iphone/window.mm
 
 <set var="OPENGL_SRC_PLATFORM" hints="files">
     <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
@@ -3739,6 +3748,7 @@ src/osx/iphone/window.mm
         <if cond="TOOLKIT=='MSW'">$(MEDIA_MSW_SRC) $(MEDIA_MSW_DESKTOP_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(MEDIA_MSW_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>