X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d2824cdb7f6ac2371fefd3d44eff62bb48ebc0a3..9653bb3552bb6f14b252f661f54d95f32fce4d00:/build/bakefiles/files.bkl

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index eeb9b500ff..d2ea2993c9 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -99,7 +99,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 +109,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 +181,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,7 +232,6 @@ 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
@@ -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
@@ -541,19 +533,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">
@@ -564,10 +557,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">
@@ -584,7 +574,6 @@ 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
@@ -664,6 +653,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
@@ -692,6 +683,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -721,6 +713,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
@@ -784,6 +777,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
@@ -801,6 +795,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -817,6 +813,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
@@ -923,8 +920,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
@@ -996,7 +991,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
@@ -1030,6 +1025,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
@@ -1050,7 +1046,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
@@ -1107,7 +1102,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
@@ -1180,7 +1174,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
@@ -1239,7 +1233,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
@@ -1284,7 +1277,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
@@ -1370,7 +1362,7 @@ 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
@@ -1649,6 +1641,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
@@ -1673,7 +1666,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
@@ -1718,6 +1710,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
@@ -1757,7 +1750,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
@@ -2031,7 +2023,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
@@ -2061,7 +2053,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
@@ -2140,7 +2131,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
@@ -2188,7 +2178,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -2254,7 +2243,6 @@ 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/tabctrl.cpp
     <!-- cocoa bridge -->
     src/osx/carbon/utilscocoa.mm
 </if>
@@ -2296,7 +2284,7 @@ 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
@@ -2309,7 +2297,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
 </set>
 
 <!-- Header files like wx/osx/foo.h which include wx/osx/carbon/foo.h -->
@@ -2382,7 +2369,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
@@ -2466,7 +2452,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -2485,7 +2470,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
     <!-- wxWebKit headers -->
     wx/html/webkit.h
 </set>
@@ -2535,10 +2519,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     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
@@ -2657,7 +2641,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
@@ -2700,6 +2683,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
@@ -2745,7 +2729,6 @@ src/osx/iphone/window.mm
     wx/generic/paletteg.h
     wx/generic/region.h
     wx/generic/statusbr.h
-    wx/generic/tabg.h
 </set>
 
 
@@ -2777,7 +2760,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
@@ -2830,7 +2812,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
@@ -3615,14 +3596,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">
@@ -3792,7 +3770,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">
@@ -3809,10 +3787,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>
 
@@ -3828,7 +3802,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>