X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a571037fe22221a1d46133c2c0889eed87e9194..84e0e5265dc876c4a6f541211ab2a80d36704201:/build/bakefiles/files.bkl?ds=sidebyside

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index a42a93fe19..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
@@ -99,7 +98,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     $(BASE_UNIX_AND_DARWIN_HDR)
     wx/unix/execute.h
     wx/unix/mimetype.h
-    wx/unix/private.h
 </set>
 
 <!--
@@ -110,11 +108,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
  -->
 <set var="BASE_UNIX_SRC" hints="files">
     $(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)
-    src/common/gsocketiohandler.cpp
 </set>
 <set var="BASE_UNIX_HDR" hints="files">
     $(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR)
-    wx/private/gsocketiohandler.h
 </set>
 
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
@@ -184,7 +180,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- Used on Mac OS X wxMac base, and Mac OS X darwin base -->
 <set var="BASE_COREFOUNDATION_SRC" hints="files">
     src/osx/core/cfstring.cpp
-    src/osx/core/gsockosx.cpp
     src/osx/core/stdpaths_cf.cpp
     src/osx/core/strconv_cf.cpp
     src/osx/core/utilsexc_base.cpp
@@ -236,12 +231,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="BASE_OS2_SRC" hints="files">
     src/common/fdiodispatcher.cpp
     src/common/selectdispatcher.cpp
-    src/common/gsocketiohandler.cpp
     src/unix/appunix.cpp
     src/unix/evtloopunix.cpp
     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
@@ -250,9 +245,6 @@ 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">
-    wx/private/fdiodispatcher.h
-    wx/private/selectdispatcher.h
-    wx/private/gsocketiohandler.h
     wx/unix/app.h
     wx/os2/apptbase.h
     wx/os2/apptrait.h
@@ -323,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
@@ -362,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
@@ -398,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
@@ -409,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
@@ -482,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
@@ -503,6 +503,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/thread.h
     wx/thrimpl.cpp
     wx/timer.h
+    wx/tls.h
     wx/tokenzr.h
     wx/tracker.h
     wx/txtstrm.h
@@ -540,19 +541,20 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <set var="NET_UNIX_SRC" hints="files">
-    src/unix/gsocket.cpp
+    src/common/socketiohandler.cpp
+    src/unix/sockunix.cpp
 </set>
-<set var="NET_UNIX_HDR" hints="files">
-    wx/unix/gsockunx.h
+
+<set var="NET_OSX_SRC" hints="files">
+    src/osx/core/sockosx.cpp
 </set>
 
 <set var="NET_WIN32_SRC" hints="files">
-    src/msw/gsocket.cpp
-    src/msw/gsockmsw.cpp
+    src/msw/sockmsw.cpp
     src/msw/urlmsw.cpp
 </set>
 <set var="NET_WIN32_HDR" hints="files">
-    wx/msw/gsockmsw.h
+    wx/msw/private/sockmsw.h
 </set>
 
 <set var="NET_WINCE_SRC" hints="files">
@@ -563,10 +565,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="NET_OS2_SRC" hints="files">
-    src/unix/gsocket.cpp
-</set>
-<set var="NET_OS2_HDR" hints="files">
-    wx/unix/gsockunx.h
+    src/unix/sockunix.cpp
 </set>
 
 <set var="NET_CMN_SRC" hints="files">
@@ -583,10 +582,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="NET_CMN_HDR" hints="files">
     wx/fs_inet.h
-    wx/gsocket.h
     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
@@ -663,6 +662,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/geometry.cpp
     src/common/gifdecod.cpp
     src/common/graphcmn.cpp
+    src/common/headercolcmn.cpp
+    src/common/headerctrlcmn.cpp
     src/common/helpbase.cpp
     src/common/iconbndl.cpp
     src/common/imagall.cpp
@@ -683,18 +684,22 @@ 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
     src/common/quantize.cpp
     src/common/radiocmn.cpp
+    src/common/rearrangectrl.cpp
     src/common/rendcmn.cpp
     src/common/rgncmn.cpp
     src/common/settcmn.cpp
     src/common/sizer.cpp
+    src/common/spinctrlcmn.cpp
     src/common/srchcmn.cpp
     src/common/statbar.cpp
     src/common/stattextcmn.cpp
@@ -720,6 +725,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/dirctrlg.cpp
     src/generic/dragimgg.cpp
     src/generic/filectrlg.cpp
+    src/generic/headerctrlg.cpp
     src/generic/listbkg.cpp
     src/generic/logg.cpp
     src/generic/numdlgg.cpp
@@ -733,6 +739,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/splitter.cpp
     src/generic/srchctlg.cpp
     src/generic/statbmpg.cpp
+    src/generic/stattextg.cpp
     src/generic/textdlgg.cpp
     src/generic/tipwin.cpp
     src/generic/toolbkg.cpp
@@ -782,6 +789,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/dirctrlg.h
     wx/generic/dragimgg.h
     wx/generic/filectrlg.h
+    wx/generic/headerctrlg.h
     wx/generic/logg.h
     wx/generic/msgdlgg.h
     wx/generic/numdlgg.h
@@ -795,15 +803,19 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/splitter.h
     wx/generic/srchctlg.h
     wx/generic/statbmpg.h
+    wx/generic/stattextg.h
     wx/generic/textdlgg.h
     wx/generic/treectlg.h
     wx/graphics.h
+    wx/headercol.h
+    wx/headerctrl.h
     wx/helphtml.h
     wx/icon.h
     wx/layout.h
     wx/listbox.h
     wx/mdi.h
     wx/menu.h
+    wx/mousemanager.h
     wx/msgdlg.h
     wx/nativewin.h
     wx/numdlg.h
@@ -814,6 +826,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/position.h
     wx/radiobox.h
     wx/radiobut.h
+    wx/rearrangectrl.h
     wx/renderer.h
     wx/scrolbar.h
     wx/scrolbar.h
@@ -829,7 +842,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/textctrl.h
     wx/textdlg.h
     wx/textentry.h
-    wx/tls.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
@@ -921,8 +939,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/splitter.h
     wx/srchctrl.h
     wx/statline.h
-    wx/tab.h
-    wx/tabctrl.h
     wx/tbarbase.h
     wx/tglbtn.h
     wx/tipwin.h
@@ -994,7 +1010,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/evtloop.cpp
     src/gtk/filectrl.cpp
     src/gtk/font.cpp
-    src/gtk/gsockgtk.cpp
+    src/gtk/sockgtk.cpp
     src/gtk/minifram.cpp
     src/gtk/pen.cpp
     src/gtk/popupwin.cpp
@@ -1028,6 +1044,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/dcmemory.h
     wx/gtk/dcscreen.h
     wx/gtk/dnd.h
+    wx/gtk/evtloop.h
     wx/gtk/font.h
     wx/gtk/minifram.h
     wx/gtk/pen.h
@@ -1048,7 +1065,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/listctrl.cpp
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
-    src/generic/tabg.cpp
     <!-- Generic implementations used by wxGPE: -->
     src/generic/fontdlgg.cpp
     src/generic/msgdlgg.cpp
@@ -1105,7 +1121,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/fontdlgg.h
     wx/generic/listctrl.h
     wx/generic/statusbr.h
-    wx/generic/tabg.h
     wx/gtk/accel.h
     wx/gtk/bmpbuttn.h
     wx/gtk/button.h
@@ -1178,7 +1193,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk1/dnd.cpp
     src/gtk1/evtloop.cpp
     src/gtk1/font.cpp
-    src/gtk1/gsockgtk.cpp
+    src/gtk1/sockgtk.cpp
     src/gtk1/main.cpp
     src/gtk1/minifram.cpp
     src/gtk1/pen.cpp
@@ -1237,7 +1252,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/msgdlgg.cpp
     src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
-    src/generic/tabg.cpp
     <!-- GTK1 specific files: -->
     src/gtk1/bmpbuttn.cpp
     src/gtk1/button.cpp
@@ -1282,7 +1296,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/fontpickerg.h
     wx/generic/listctrl.h
     wx/generic/statusbr.h
-    wx/generic/tabg.h
     wx/gtk1/accel.h
     wx/gtk1/bmpbuttn.h
     wx/gtk1/button.h
@@ -1368,11 +1381,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/motif/font.cpp
     src/motif/frame.cpp
     src/motif/gauge.cpp
-    src/motif/gsockmot.cpp
+    src/motif/sockmot.cpp
     src/motif/icon.cpp
     src/motif/listbox.cpp
     src/motif/main.cpp
-    src/motif/mdi.cpp
     src/motif/menu.cpp
     src/motif/menuitem.cpp
     src/motif/minifram.cpp
@@ -1405,6 +1417,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/fontdlgg.cpp
     src/generic/fontpickerg.cpp
     src/generic/listctrl.cpp
+    src/generic/mdig.cpp
     src/generic/notebook.cpp
     src/generic/prntdlgg.cpp
     src/generic/statline.cpp
@@ -1422,6 +1435,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/fontdlgg.h
     wx/generic/fontpickerg.h
     wx/generic/listctrl.h
+    wx/generic/mdig.h
     wx/generic/notebook.h
     wx/generic/prntdlgg.h
     wx/generic/statline.h
@@ -1458,7 +1472,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/motif/gauge.h
     wx/motif/icon.h
     wx/motif/listbox.h
-    wx/motif/mdi.h
     wx/motif/menu.h
     wx/motif/menuitem.h
     wx/motif/minifram.h
@@ -1560,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
@@ -1606,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
@@ -1632,6 +1647,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/statusbr.cpp
     src/generic/prntdlgg.cpp
     src/msw/accel.cpp
+    src/msw/artmsw.cpp
     src/msw/bmpbuttn.cpp
     src/msw/button.cpp
     src/msw/checkbox.cpp
@@ -1646,6 +1662,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/filedlg.cpp
     src/msw/frame.cpp
     src/msw/gauge.cpp
+    src/msw/headerctrl.cpp
     src/msw/iniconf.cpp
     src/msw/listbox.cpp
     src/msw/listctrl.cpp
@@ -1670,7 +1687,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/statusbar.cpp
     src/msw/statline.cpp
     src/msw/stattext.cpp
-    src/msw/tabctrl.cpp
     src/msw/toolbar.cpp
     src/msw/textctrl.cpp
     src/msw/textentry.cpp
@@ -1715,6 +1731,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/frame.h
     wx/msw/gauge.h
     wx/msw/gdiimage.h
+    wx/msw/headerctrl.h
     wx/msw/icon.h
     wx/msw/imaglist.h
     wx/msw/iniconf.h
@@ -1754,7 +1771,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/statusbar.h
     wx/msw/statline.h
     wx/msw/stattext.h
-    wx/msw/tabctrl.h
     wx/msw/toolbar.h
     wx/msw/textctrl.h
     wx/msw/textentry.h
@@ -1918,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
@@ -2028,7 +2043,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/os2/frame.cpp
     src/os2/gauge.cpp
     src/os2/gdiimage.cpp
-    src/os2/gsockpm.cpp
+    src/os2/sockpm.cpp
     src/os2/helpwin.cpp
     src/os2/icon.cpp
     src/os2/iniconf.cpp
@@ -2058,7 +2073,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/os2/statbox.cpp
     src/os2/statline.cpp
     src/os2/stattext.cpp
-    src/os2/tabctrl.cpp
     src/os2/textctrl.cpp
     src/os2/textentry.cpp
     src/os2/tglbtn.cpp
@@ -2137,7 +2151,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/statbox.h
     wx/os2/statline.h
     wx/os2/stattext.h
-    wx/os2/tabctrl.h
     wx/os2/textctrl.h
     wx/os2/textentry.h
     wx/os2/tglbtn.h
@@ -2156,40 +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/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 -->
@@ -2221,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
@@ -2239,6 +2253,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/osx/carbon/dcclient.cpp
     src/osx/carbon/dcprint.cpp
     src/osx/carbon/dcscreen.cpp
+    src/osx/core/glgrab.cpp
     src/osx/carbon/graphics.cpp
     src/osx/carbon/dnd.cpp
     src/osx/carbon/font.cpp
@@ -2247,13 +2262,26 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
+    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>
 
@@ -2277,8 +2305,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/osx/carbon/msgdlg.cpp
     src/osx/carbon/nonownedwnd.cpp
     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
@@ -2292,24 +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
-    src/generic/tabg.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
@@ -2378,7 +2395,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/osx/statline.h
     wx/osx/stattext.h
     wx/osx/statusbr.h
-    wx/osx/tabctrl.h
     wx/osx/taskbarosx.h
     wx/osx/textctrl.h
     wx/osx/tglbtn.h
@@ -2388,102 +2404,35 @@ 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">
     <!-- core files -->
     wx/osx/core/colour.h
     <!-- carbon files -->
-    wx/osx/carbon/accel.h
-    wx/osx/carbon/app.h
-    wx/osx/carbon/bitmap.h
-    wx/osx/carbon/bmpbuttn.h
-    wx/osx/carbon/button.h
-    wx/osx/carbon/checkbox.h
-    wx/osx/carbon/checklst.h
     wx/osx/carbon/chkconf.h
-    wx/osx/carbon/choice.h
-    wx/osx/carbon/clipbrd.h
-    wx/osx/carbon/colordlg.h
-    wx/osx/carbon/combobox.h
-    wx/osx/carbon/control.h
-    wx/osx/carbon/cursor.h
-    wx/osx/carbon/dataform.h
-    wx/osx/carbon/dataobj.h
-    wx/osx/carbon/dataobj2.h
-    wx/osx/carbon/dc.h
-    wx/osx/carbon/dcclient.h
-    wx/osx/carbon/dcmemory.h
-    wx/osx/carbon/dcprint.h
-    wx/osx/carbon/dcscreen.h
-    wx/osx/carbon/dialog.h
-    wx/osx/carbon/dirdlg.h
-    wx/osx/carbon/dnd.h
     wx/osx/carbon/evtloop.h
-    wx/osx/carbon/filedlg.h
-    wx/osx/carbon/font.h
-    wx/osx/carbon/fontdlg.h
-    wx/osx/carbon/frame.h
-    wx/osx/carbon/gauge.h
-    wx/osx/carbon/helpxxxx.h
-    wx/osx/carbon/icon.h
-    wx/osx/carbon/imaglist.h
-    wx/osx/carbon/listbox.h
-    wx/osx/carbon/listctrl.h
-    wx/osx/carbon/mdi.h
-    wx/osx/carbon/menu.h
-    wx/osx/carbon/menuitem.h
-    wx/osx/carbon/metafile.h
-    wx/osx/carbon/mimetype.h
-    wx/osx/carbon/minifram.h
-    wx/osx/carbon/msgdlg.h
-    wx/osx/carbon/nonownedwnd.h
-    wx/osx/carbon/notebook.h
-    wx/osx/carbon/palette.h
-    wx/osx/carbon/popupwin.h
-    wx/osx/carbon/pnghand.h
-    wx/osx/carbon/pngread.h
-    wx/osx/carbon/printdlg.h
-    wx/osx/carbon/printmac.h
     wx/osx/carbon/private.h
     wx/osx/carbon/private/mactext.h
     wx/osx/carbon/private/overlay.h
     wx/osx/carbon/private/print.h
-    wx/osx/carbon/radiobox.h
-    wx/osx/carbon/radiobut.h
     wx/osx/carbon/region.h
-    wx/osx/carbon/scrolbar.h
-    wx/osx/carbon/slider.h
-    wx/osx/carbon/spinbutt.h
-    wx/osx/carbon/spinctrl.h
-    wx/osx/carbon/srchctrl.h
     wx/osx/carbon/statbmp.h
-    wx/osx/carbon/statbox.h
-    wx/osx/carbon/statline.h
-    wx/osx/carbon/stattext.h
-    wx/osx/carbon/statusbr.h
-    wx/osx/carbon/tabctrl.h
-    wx/osx/carbon/textctrl.h
-    wx/osx/carbon/tglbtn.h
-    wx/osx/carbon/toolbar.h
-    wx/osx/carbon/tooltip.h
-    wx/osx/carbon/toplevel.h
-    wx/osx/carbon/treectrl.h
     wx/osx/carbon/uma.h
-    wx/osx/carbon/window.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
-    wx/generic/tabg.h
-    <!-- wxWebKit headers -->
-    wx/html/webkit.h
 </set>
 
 <!-- ====================================================================== -->
@@ -2508,6 +2457,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/osx/cocoa/nonownedwnd.mm
     src/osx/cocoa/notebook.mm
     src/osx/cocoa/radiobut.mm
+    src/osx/cocoa/printdlg.mm
     src/osx/cocoa/scrolbar.mm
     src/osx/cocoa/slider.mm
     src/osx/cocoa/spinbutt.mm
@@ -2520,21 +2470,10 @@ 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
-    src/generic/tabg.cpp
 </set>
 <set var="OSX_COCOA_HDR" hints="files">
     wx/osx/cocoa/chkconf.h
+    wx/osx/cocoa/evtloop.h
     wx/osx/cocoa/private.h
     $(OSX_CARBON_HDR) <!-- FIXME: these headers need moved somewhere shared... -->
     wx/generic/region.h
@@ -2653,7 +2592,6 @@ src/osx/iphone/window.mm
     src/generic/paletteg.cpp
     src/generic/regiong.cpp
     src/generic/statusbr.cpp
-    src/generic/tabg.cpp
 </set>
 <set var="COCOA_HDR" hints="files">
     wx/cocoa/NSApplication.h
@@ -2696,6 +2634,7 @@ src/osx/iphone/window.mm
     wx/cocoa/dialog.h
     wx/cocoa/dirdlg.h
     wx/cocoa/drawer.h
+    wx/cocoa/evtloop.h
     wx/cocoa/filedlg.h
     wx/cocoa/font.h
     wx/cocoa/fontdlg.h
@@ -2741,7 +2680,6 @@ src/osx/iphone/window.mm
     wx/generic/paletteg.h
     wx/generic/region.h
     wx/generic/statusbr.h
-    wx/generic/tabg.h
 </set>
 
 
@@ -2773,7 +2711,6 @@ src/osx/iphone/window.mm
     src/generic/mdig.cpp
     src/generic/msgdlgg.cpp
     src/generic/prntdlgg.cpp
-    src/generic/tabg.cpp
     src/univ/bmpbuttn.cpp
     src/univ/button.cpp
     src/univ/checkbox.cpp
@@ -2826,7 +2763,6 @@ src/osx/iphone/window.mm
     wx/generic/listctrl.h
     wx/generic/mdig.h
     wx/generic/statusbr.h
-    wx/generic/tabg.h
     wx/univ/app.h
     wx/univ/bmpbuttn.h
     wx/univ/button.h
@@ -2887,6 +2823,7 @@ src/osx/iphone/window.mm
     src/generic/editlbox.cpp
     src/generic/grid.cpp
     src/generic/gridctrl.cpp
+    src/generic/grideditors.cpp
     src/generic/gridsel.cpp
     src/generic/helpext.cpp
     src/generic/hyperlinkg.cpp
@@ -2917,6 +2854,7 @@ src/osx/iphone/window.mm
     wx/generic/dataview.h
     wx/generic/grid.h
     wx/generic/gridctrl.h
+    wx/generic/grideditors.h
     wx/generic/gridsel.h
     wx/generic/helpext.h
     wx/generic/hyperlink.h
@@ -2943,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
@@ -2958,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>
 
@@ -2983,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
@@ -2995,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>
@@ -3016,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">
@@ -3075,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">
@@ -3125,10 +3061,8 @@ src/osx/iphone/window.mm
     src/msw/mediactrl_am.cpp
     src/msw/mediactrl_wmp10.cpp
     src/msw/mediactrl_qt.cpp
-    src/msw/ole/activex.cpp
 </set>
 <set var="MEDIA_MSW_HDR" hints="files">
-    wx/msw/ole/activex.h
 </set>
 <!-- not built on WindowsCE: -->
 <set var="MEDIA_MSW_DESKTOP_SRC" hints="files">
@@ -3258,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
@@ -3273,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
@@ -3321,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
@@ -3413,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
@@ -3611,14 +3552,11 @@ src/osx/iphone/window.mm
     <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_UNIX_SRC)</if>
+        <if cond="PLATFORM_MACOSX=='1'">$(NET_UNIX_SRC) $(NET_OSX_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_MACOSX=='1'">$(NET_UNIX_HDR)</if>
     </set>
 
     <set var="NET_SRC" hints="files">
@@ -3788,7 +3726,7 @@ src/osx/iphone/window.mm
     <!-- for 'make install', only the headers needed for the installed port -->
     <set var="ALL_BASE_HEADERS" make_var="1" hints="files">
         $(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
-        $(NET_CMN_HDR) $(NET_PLATFORM_HDR)
+        $(NET_CMN_HDR)
         $(XML_HDR)
     </set>
     <set var="ALL_HEADERS" make_var="1" hints="files">
@@ -3805,10 +3743,6 @@ src/osx/iphone/window.mm
         $(BASE_PALMOS_HDR)
         $(BASE_MSDOS_HDR)
         $(NET_CMN_HDR)
-        $(NET_UNIX_HDR)
-        $(NET_WIN32_HDR) $(NET_WINCE_HDR)
-        $(NET_OS2_HDR)
-        $(NET_UNIX_HDR)
         $(XML_HDR)
     </set>
 
@@ -3824,7 +3758,8 @@ src/osx/iphone/window.mm
         $(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)
+        $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_OSX_SRC)
+        $(NET_WIN32_SRC) $(NET_WINCE_SRC)
         $(XML_SRC)
     </set>