X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/424e6a96d1b27bebf7990d91ae4f2907d6546704..84e0e5265dc876c4a6f541211ab2a80d36704201:/build/bakefiles/files.bkl

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 6fcc9760e5..e43ccb2fa5 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -58,22 +58,21 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="BASE_UNIX_AND_DARWIN_SRC" hints="files">
     src/common/fdiodispatcher.cpp
     src/common/selectdispatcher.cpp
-    src/unix/epolldispatcher.cpp
     src/unix/appunix.cpp
-    src/unix/evtloopunix.cpp
     src/unix/dir.cpp
     src/unix/dlunix.cpp
+    src/unix/epolldispatcher.cpp
+    src/unix/evtloopunix.cpp
+    src/unix/fdiounix.cpp
     src/unix/snglinst.cpp
+    src/unix/stackwalk.cpp
     src/unix/stdpaths.cpp
     src/unix/timerunx.cpp
     src/unix/threadpsx.cpp
-    src/unix/stackwalk.cpp
     src/unix/utilsunx.cpp
 </set>
 
 <set var="BASE_UNIX_AND_DARWIN_HDR" hints="files">
-    wx/private/fdiodispatcher.h
-    wx/private/selectdispatcher.h
     wx/unix/app.h
     wx/unix/apptbase.h
     wx/unix/apptrait.h
@@ -237,6 +236,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/unix/timerunx.cpp
     src/os2/dir.cpp
     src/os2/mimetype.cpp
+    src/os2/snglinst.cpp
     src/os2/stdpaths.cpp
     src/os2/thread.cpp
     src/os2/utils.cpp
@@ -315,6 +315,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/config.cpp
     src/common/convauto.cpp
     src/common/datetime.cpp
+    src/common/datetimefmt.cpp
     src/common/datstrm.cpp
     src/common/dircmn.cpp
     src/common/dynarray.cpp
@@ -354,6 +355,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/regex.cpp
     src/common/stdpbase.cpp
     src/common/sstream.cpp
+    src/common/stdstream.cpp
     src/common/stopwatch.cpp
     src/common/strconv.cpp
     src/common/stream.cpp
@@ -390,6 +392,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="BASE_CMN_HDR" hints="files">
     wx/afterstd.h
+    wx/anystr.h
     wx/app.h
     wx/apptrait.h
     wx/archive.h
@@ -401,6 +404,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/buffer.h
     wx/build.h
     wx/chartype.h
+    wx/checkeddelete.h
     wx/chkconf.h
     wx/clntdata.h
     wx/cmdargs.h
@@ -474,12 +478,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/ptr_shrd.h
     wx/recguard.h
     wx/regex.h
+    wx/scopedarray.h
+    wx/scopedptr.h
     wx/scopeguard.h
+    wx/sharedptr.h
     wx/snglinst.h
     wx/sstream.h
     wx/stack.h
     wx/stackwalk.h
     wx/stdpaths.h
+    wx/stdstream.h
     wx/stockitem.h
     wx/stopwatch.h
     wx/strconv.h
@@ -577,6 +585,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/protocol/file.h
     wx/protocol/ftp.h
     wx/protocol/http.h
+    wx/protocol/log.h
     wx/protocol/protocol.h
     wx/sckaddr.h
     wx/sckipc.h
@@ -675,9 +684,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/listctrlcmn.cpp
     src/common/matrix.cpp
     src/common/menucmn.cpp
+    src/common/mousemanager.cpp
     src/common/nbkbase.cpp
     src/common/overlaycmn.cpp
     src/common/paper.cpp
+    src/common/persist.cpp
     src/common/pickerbase.cpp
     src/common/popupcmn.cpp
     src/common/prntbase.cpp
@@ -804,6 +815,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/listbox.h
     wx/mdi.h
     wx/menu.h
+    wx/mousemanager.h
     wx/msgdlg.h
     wx/nativewin.h
     wx/numdlg.h
@@ -830,6 +842,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/textctrl.h
     wx/textdlg.h
     wx/textentry.h
+    wx/textwrapper.h
     wx/toolbar.h
     wx/validate.h
     wx/valtext.h
@@ -906,6 +919,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/notebook.h
     wx/ownerdrw.h
     wx/paper.h
+    wx/persist.h
+    wx/persist/bookctrl.h
+    wx/persist/toplevel.h
+    wx/persist/treebook.h
+    wx/persist/window.h
     wx/pickerbase.h
     wx/popupwin.h
     wx/print.h
@@ -1555,6 +1573,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <set var="MSW_LOWLEVEL_SRC" hints="files">
+    src/msw/ole/activex.cpp
     src/msw/app.cpp
     src/msw/bitmap.cpp
     src/msw/brush.cpp
@@ -1601,6 +1620,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/window.cpp
 </set>
 <set var="MSW_LOWLEVEL_HDR" hints="files">
+    wx/msw/ole/activex.h
     wx/msw/popupwin.h
     wx/msw/uxtheme.h
     wx/msw/uxthemep.h
@@ -1655,7 +1675,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/nativewin.cpp
     src/msw/notebook.cpp
     src/msw/ole/access.cpp
-    src/msw/ole/activex.cpp
     src/msw/ownerdrw.cpp
     src/msw/radiobox.cpp
     src/msw/radiobut.cpp
@@ -1728,7 +1747,6 @@ 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/ole/activex.h
     wx/msw/ole/dataform.h
     wx/msw/ole/dataobj.h
     wx/msw/ole/dataobj2.h
@@ -1916,7 +1934,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/icon.cpp
     src/generic/imaglist.cpp
     src/generic/mask.cpp
-    src/generic/timer.cpp
     src/dfb/app.cpp
     src/dfb/bitmap.cpp
     src/dfb/brush.cpp
@@ -2152,39 +2169,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="OSX_LOWLEVEL_SRC" hints="files">
     <!-- Shared wxMac and wxCocoa files -->
     <if cond="PLATFORM_MACOSX=='1'">
-    src/osx/accel.cpp
-    src/osx/bmpbuttn_osx.cpp
+    src/osx/artmac.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/printdlg_osx.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/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 -->
@@ -2216,12 +2209,38 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="OSX_CARBON_COCOA_SRC" hints="files">
 <if cond="PLATFORM_MACOSX=='1'">
+    <!-- Common controls implementation -->
+    src/osx/bmpbuttn_osx.cpp
+    src/osx/button_osx.cpp
+    src/osx/checkbox_osx.cpp
+    src/osx/checklst_osx.cpp
+    src/osx/choice_osx.cpp
+    src/osx/gauge_osx.cpp
+    src/osx/listbox_osx.cpp
+    src/osx/menu_osx.cpp
+    src/osx/menuitem_osx.cpp
+    src/osx/notebook_osx.cpp
+    src/osx/printdlg_osx.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/textctrl_osx.cpp
+    src/osx/tglbtn_osx.cpp
+    src/osx/toolbar_osx.cpp
     <!-- wxWebKit files -->
-    <!-- (TODO Move one level up) -->
+    src/html/htmlctrl/webkit/webkit.mm
     <!-- Native color/font dialogs -->
     src/osx/carbon/colordlgosx.mm
     src/osx/carbon/fontdlgosx.mm
     <!-- other shared files -->
+    src/osx/accel.cpp
     src/osx/carbon/clipbrd.cpp
     src/osx/carbon/cursor.cpp
     src/osx/carbon/fontdlg.cpp
@@ -2246,15 +2265,29 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/osx/carbon/renderer.cpp
     src/osx/carbon/settings.cpp
     src/osx/carbon/statbrma.cpp
+    src/osx/carbon/region.cpp
     <!-- cocoa bridge -->
     src/osx/carbon/utilscocoa.mm
+    <!-- Generic implementations used by wxOSX: -->
+    src/generic/caret.cpp
+    src/generic/clrpickerg.cpp
+    src/generic/collpaneg.cpp
+    src/generic/colrdlgg.cpp
+    src/generic/dirdlgg.cpp
+    src/generic/fdrepdlg.cpp
+    src/generic/filedlgg.cpp
+    src/generic/filepickerg.cpp
+    src/generic/fontdlgg.cpp
+    src/generic/fontpickerg.cpp
+    src/generic/listctrl.cpp
+    src/generic/prntdlgg.cpp
+    src/generic/statusbr.cpp
 </if>
 </set>
 
 <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
@@ -2274,7 +2307,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/osx/carbon/notebmac.cpp
     src/osx/carbon/printdlg.cpp
     src/osx/carbon/radiobut.cpp
-    src/osx/carbon/region.cpp
     src/osx/carbon/scrolbar.cpp
     src/osx/carbon/slider.cpp
     src/osx/carbon/spinbutt.cpp
@@ -2288,23 +2320,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/osx/carbon/toolbar.cpp
     src/osx/carbon/tooltip.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
-    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/statusbr.cpp
 </set>
 
 <!-- Header files like wx/osx/foo.h which include wx/osx/carbon/foo.h -->
 <set var="OSX_SHARED_HDR" hints="files">
+    <!-- wxWebKit headers -->
+    wx/html/webkit.h
+    <!-- other shared headers -->
     wx/osx/accel.h
     wx/osx/app.h
     wx/osx/bitmap.h
@@ -2382,6 +2404,20 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/osx/treectrl.h
     wx/osx/uma.h
     wx/osx/window.h
+    <!-- Generic implementations used by wxOSX: -->
+    wx/generic/caret.h
+    wx/generic/clrpickerg.h
+    wx/generic/collpaneg.h
+    wx/generic/colrdlgg.h
+    wx/generic/dirdlgg.h
+    wx/generic/fdrepdlg.h
+    wx/generic/filedlgg.h
+    wx/generic/filepickerg.h
+    wx/generic/fontdlgg.h
+    wx/generic/fontpickerg.h
+    wx/generic/listctrl.h
+    wx/generic/prntdlgg.h
+    wx/generic/statusbr.h
 </set>
 <!-- wxMac Carbon header files -->
 <set var="OSX_CARBON_HDR" hints="files">
@@ -2397,18 +2433,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/osx/carbon/region.h
     wx/osx/carbon/statbmp.h
     wx/osx/carbon/uma.h
-    <!-- Generic implementations used by wxMac: -->
-    wx/generic/caret.h
-    wx/generic/clrpickerg.h
-    wx/generic/collpaneg.h
-    wx/generic/fdrepdlg.h
-    wx/generic/filepickerg.h
-    wx/generic/fontdlgg.h
-    wx/generic/fontpickerg.h
-    wx/generic/listctrl.h
-    wx/generic/statusbr.h
-    <!-- wxWebKit headers -->
-    wx/html/webkit.h
 </set>
 
 <!-- ====================================================================== -->
@@ -2446,17 +2470,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
 </set>
 <set var="OSX_COCOA_HDR" hints="files">
     wx/osx/cocoa/chkconf.h
@@ -2868,14 +2881,12 @@ src/osx/iphone/window.mm
 
 <set var="ADVANCED_MSW_SRC" hints="files">
     src/common/taskbarcmn.cpp
-    src/generic/animateg.cpp
     src/msw/aboutdlg.cpp
     src/msw/notifmsg.cpp
     src/msw/sound.cpp
     src/msw/taskbar.cpp
 </set>
 <set var="ADVANCED_MSW_HDR" hints="files">
-    wx/generic/animate.h
     wx/msw/notifmsg.h
     wx/msw/sound.h
     wx/msw/taskbar.h
@@ -2883,15 +2894,16 @@ src/osx/iphone/window.mm
 
 <!-- not used with wxUniv -->
 <set var="ADVANCED_MSW_NATIVE_SRC" hints="files">
+    src/generic/animateg.cpp
     src/msw/bmpcbox.cpp
     src/msw/calctrl.cpp
     src/msw/datecontrols.cpp
     src/msw/datectrl.cpp
 </set>
 <set var="ADVANCED_MSW_NATIVE_HDR" hints="files">
+    wx/generic/animate.h
     wx/msw/bmpcbox.h
     wx/msw/calctrl.h
-    wx/msw/datecontrols.h
     wx/msw/datectrl.h
 </set>
 
@@ -2908,8 +2920,8 @@ src/osx/iphone/window.mm
     src/generic/animateg.cpp
     src/osx/carbon/aboutdlg.cpp
     src/osx/carbon/drawer.cpp
+    src/osx/dataview_osx.cpp
     src/osx/carbon/dataview.cpp
-    src/osx/carbon/databrow.cpp
     src/osx/carbon/sound.cpp
     src/osx/carbon/taskbar.cpp
     src/osx/core/hidjoystick.cpp
@@ -2920,18 +2932,19 @@ 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/dataview_osx.cpp
+    src/osx/cocoa/dataview.mm
     src/osx/cocoa/taskbar.mm
     src/osx/core/hidjoystick.cpp
 </set>
@@ -2941,12 +2954,9 @@ src/osx/iphone/window.mm
     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/taskbarosx.h
     wx/osx/core/joystick.h
+    wx/osx/cocoa/dataview.h
 </set>
 
 <set var="ADVANCED_COCOA_SRC" hints="files">
@@ -3000,6 +3010,7 @@ src/osx/iphone/window.mm
 </set>
 <set var="ADVANCED_GTK_HDR" hints="files">
     wx/gtk/hildon/notifmsg.h
+    wx/gtk/taskbar.h
 </set>
 
 <set var="ADVANCED_GTK_NATIVE_SRC" hints="files">
@@ -3181,13 +3192,15 @@ src/osx/iphone/window.mm
     src/xrc/xh_clrpicker.cpp
     src/xrc/xh_collpane.cpp
     src/xrc/xh_combo.cpp
+    src/xrc/xh_comboctrl.cpp
     src/xrc/xh_datectrl.cpp
     src/xrc/xh_dirpicker.cpp
     src/xrc/xh_dlg.cpp
-    src/xrc/xh_frame.cpp
-    src/xrc/xh_mdi.cpp
+    src/xrc/xh_editlbox.cpp
+    src/xrc/xh_filectrl.cpp
     src/xrc/xh_filepicker.cpp
     src/xrc/xh_fontpicker.cpp
+    src/xrc/xh_frame.cpp
     src/xrc/xh_gauge.cpp
     src/xrc/xh_gdctl.cpp
     src/xrc/xh_grid.cpp
@@ -3196,6 +3209,7 @@ src/osx/iphone/window.mm
     src/xrc/xh_listb.cpp
     src/xrc/xh_listbk.cpp
     src/xrc/xh_listc.cpp
+    src/xrc/xh_mdi.cpp
     src/xrc/xh_menu.cpp
     src/xrc/xh_notbk.cpp
     src/xrc/xh_odcombo.cpp
@@ -3244,9 +3258,12 @@ src/osx/iphone/window.mm
     wx/xrc/xh_clrpicker.h
     wx/xrc/xh_collpane.h
     wx/xrc/xh_combo.h
+    wx/xrc/xh_comboctrl.h
     wx/xrc/xh_datectrl.h
     wx/xrc/xh_dirpicker.h
     wx/xrc/xh_dlg.h
+    wx/xrc/xh_editlbox.h
+    wx/xrc/xh_filectrl.h
     wx/xrc/xh_filepicker.h
     wx/xrc/xh_fontpicker.h
     wx/xrc/xh_frame.h
@@ -3336,7 +3353,8 @@ src/osx/iphone/window.mm
 </set>
 
 <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_CARBON'">wx/osx/glcanvas.h</if>
+    <if cond="TOOLKIT=='OSX_COCOA'">wx/osx/glcanvas.h</if>
     <if cond="TOOLKIT=='COCOA'">wx/cocoa/glcanvas.h</if>
     <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
         wx/gtk/glcanvas.h