X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/987ae041ae453aac8d10fbd3081a2f5e0782fb56..6a603a10e77f719458939d117e46f7d8ed0b372b:/build/bakefiles/files.bkl?ds=sidebyside

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 1db594b3fd..662c1f5590 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -58,13 +58,15 @@ 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/baseunix.cpp
     src/unix/evtloopunix.cpp
     src/unix/dlunix.cpp
     src/unix/snglinst.cpp
     src/unix/stdpaths.cpp
     src/unix/timerunx.cpp
+    src/unix/stackwalk.cpp
+    src/unix/utilsunx.cpp
 </set>
 
 <set var="BASE_UNIX_AND_DARWIN_HDR" hints="files">
@@ -77,6 +79,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/unix/evtloop.h
     wx/unix/pipe.h
     wx/unix/stdpaths.h
+    wx/unix/stackwalk.h
 </set>
 
 <!--
@@ -107,16 +110,10 @@ 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
-    src/unix/epolldispatcher.cpp
-    src/unix/stackwalk.cpp
-</set>
-<set var="BASE_AND_GUI_UNIX_SRC" hints="files">
-    src/unix/utilsunx.cpp
 </set>
 <set var="BASE_UNIX_HDR" hints="files">
     $(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR)
     wx/private/gsocketiohandler.h
-    wx/unix/stackwalk.h
 </set>
 
 <!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
@@ -416,6 +413,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/wfstream.cpp
     src/common/wxcrt.cpp
     src/common/wxprintf.cpp
+    src/common/xlocale.cpp
     src/common/xti.cpp
     src/common/xtistrm.cpp
     src/common/zipstrm.cpp
@@ -550,6 +548,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/wxcrtbase.h
     wx/wxcrtvararg.h
     wx/wxprec.h
+    wx/xlocale.h
     wx/xti.h
     wx/xtistrm.h
     wx/zipstrm.h
@@ -835,6 +834,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mdi.h
     wx/menu.h
     wx/msgdlg.h
+    wx/nativewin.h
     wx/numdlg.h
     wx/overlay.h
     wx/palette.h
@@ -968,6 +968,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/xpmhand.h
 </set>
 
+<!-- ====================================================================== -->
+<!--                            Common Unix files:                          -->
+<!-- ====================================================================== -->
+
+<set var="UNIX_SRC" hints="files">
+    src/unix/apptraits.cpp
+</set>
 
 <!-- ====================================================================== -->
 <!--                            Common X11 code:                            -->
@@ -1051,10 +1058,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/minifram.h
     wx/gtk/pen.h
     wx/gtk/popupwin.h
+    wx/gtk/private/win_gtk.h
     wx/gtk/region.h
     wx/gtk/tooltip.h
     wx/gtk/toplevel.h
-    wx/gtk/win_gtk.h
     wx/gtk/window.h
 </set>
 <set var="GTK_SRC" hints="files">
@@ -1099,6 +1106,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/menu.cpp
     src/gtk/mnemonics.cpp
     src/gtk/msgdlg.cpp
+    src/gtk/nativewin.cpp
     src/gtk/notebook.cpp
     src/gtk/radiobox.cpp
     src/gtk/radiobut.cpp
@@ -1664,7 +1672,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/dragimag.cpp
     src/msw/filedlg.cpp
     src/msw/frame.cpp
-    src/msw/gauge95.cpp
+    src/msw/gauge.cpp
     src/msw/iniconf.cpp
     src/msw/listbox.cpp
     src/msw/listctrl.cpp
@@ -1674,22 +1682,23 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/metafile.cpp
     src/msw/msgdlg.cpp
     src/msw/nativdlg.cpp
+    src/msw/nativewin.cpp
     src/msw/notebook.cpp
     src/msw/ole/access.cpp
     src/msw/ownerdrw.cpp
     src/msw/radiobox.cpp
     src/msw/radiobut.cpp
     src/msw/scrolbar.cpp
-    src/msw/slider95.cpp
+    src/msw/slider.cpp
     src/msw/spinbutt.cpp
     src/msw/spinctrl.cpp
     src/msw/statbmp.cpp
     src/msw/statbox.cpp
-    src/msw/statbr95.cpp
+    src/msw/statusbar.cpp
     src/msw/statline.cpp
     src/msw/stattext.cpp
     src/msw/tabctrl.cpp
-    src/msw/tbar95.cpp
+    src/msw/toolbar.cpp
     src/msw/textctrl.cpp
     src/msw/textentry.cpp
     src/msw/tglbtn.cpp
@@ -1731,7 +1740,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/filedlg.h
     wx/msw/font.h
     wx/msw/frame.h
-    wx/msw/gauge95.h
+    wx/msw/gauge.h
     wx/msw/gdiimage.h
     wx/msw/icon.h
     wx/msw/imaglist.h
@@ -1764,16 +1773,16 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/rcdefs.h
     wx/msw/scrolbar.h
     wx/msw/setup0.h
-    wx/msw/slider95.h
+    wx/msw/slider.h
     wx/msw/spinbutt.h
     wx/msw/spinctrl.h
     wx/msw/statbmp.h
     wx/msw/statbox.h
-    wx/msw/statbr95.h
+    wx/msw/statusbar.h
     wx/msw/statline.h
     wx/msw/stattext.h
     wx/msw/tabctrl.h
-    wx/msw/tbar95.h
+    wx/msw/toolbar.h
     wx/msw/textctrl.h
     wx/msw/textentry.h
     wx/msw/tglbtn.h
@@ -2055,6 +2064,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/os2/menu.cpp
     src/os2/menuitem.cpp
     src/os2/metafile.cpp
+    src/os2/minifram.cpp
     src/os2/msgdlg.cpp
     src/os2/nativdlg.cpp
     src/os2/notebook.cpp
@@ -2248,6 +2258,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/carbon/metafile.cpp
     src/mac/carbon/minifram.cpp
     src/mac/carbon/msgdlg.cpp
+    src/mac/carbon/nonownedwnd.cpp
     src/mac/carbon/notebmac.cpp
     src/mac/carbon/overlay.cpp
     src/mac/carbon/palette.cpp
@@ -2343,6 +2354,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/mimetype.h
     wx/mac/minifram.h
     wx/mac/msgdlg.h
+    wx/mac/nonownedwnd.h
     wx/mac/notebook.h
     wx/mac/palette.h
     wx/mac/pen.h
@@ -2427,6 +2439,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mac/carbon/mimetype.h
     wx/mac/carbon/minifram.h
     wx/mac/carbon/msgdlg.h
+    wx/mac/carbon/nonownedwnd.h
     wx/mac/carbon/notebook.h
     wx/mac/carbon/palette.h
     wx/mac/carbon/pen.h
@@ -2802,11 +2815,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="ADVANCED_CMN_SRC" hints="files">
     src/common/animatecmn.cpp
+    src/common/calctrlcmn.cpp
     src/common/datavcmn.cpp
     src/common/hyperlnkcmn.cpp
     src/generic/aboutdlgg.cpp
     src/generic/bmpcboxg.cpp
-    src/generic/calctrl.cpp
+    src/generic/calctrlg.cpp
     src/generic/datavgen.cpp
     src/generic/datectlg.cpp
     src/generic/editlbox.cpp
@@ -2837,7 +2851,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/editlbox.h
     wx/generic/aboutdlgg.h
     wx/generic/bmpcbox.h
-    wx/generic/calctrl.h
+    wx/generic/calctrlg.h
     wx/generic/datectrl.h
     wx/generic/dataview.h
     wx/generic/grid.h
@@ -2883,9 +2897,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <!-- not used with wxUniv -->
 <set var="ADVANCED_MSW_NATIVE_SRC" hints="files">
+    src/msw/calctrl.cpp
+    src/msw/datecontrols.cpp
     src/msw/datectrl.cpp
 </set>
 <set var="ADVANCED_MSW_NATIVE_HDR" hints="files">
+    wx/msw/calctrl.h
+    wx/msw/datecontrols.h
     wx/msw/datectrl.h
 </set>
 
@@ -2976,11 +2994,13 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="ADVANCED_GTK_NATIVE_SRC" hints="files">
     src/gtk/aboutdlg.cpp
     src/gtk/animate.cpp
+    src/gtk/calctrl.cpp
     src/gtk/dataview.cpp
     src/gtk/hyperlink.cpp
 </set>
 <set var="ADVANCED_GTK_NATIVE_HDR" hints="files">
     wx/gtk/animate.h
+    wx/gtk/calctrl.h
     wx/gtk/dataview.h
     wx/gtk/hyperlink.h
 </set>
@@ -3423,9 +3443,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='MAC'">$(BASE_AND_GUI_MAC_SRC)</if>
     </set>
     <set var="BASE_AND_GUI_PLATFORM_SRC" hints="files">
-        <if cond="PLATFORM_UNIX=='1'">$(BASE_AND_GUI_UNIX_SRC)</if>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
-        <if cond="PLATFORM_MACOSX=='1'">$(BASE_AND_GUI_UNIX_SRC)</if>
         <if cond="PLATFORM_PALMOS=='1'">$(BASE_AND_GUI_PALMOS_SRC)</if>
         <if cond="PLATFORM_MSDOS=='1'">$(BASE_AND_GUI_MSDOS_SRC)</if>
         <!-- At the moment, BASE_AND_GUI_TOOLKIT_SRC handles this -->
@@ -3514,6 +3532,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='DFB'">$(DFB_LOWLEVEL_HDR)</if>
     </set>
 
+    <set var="PLATFORM_SRC" hints="files">
+        <if cond="PLATFORM_UNIX=='1'">$(UNIX_SRC)</if>
+        <if cond="PLATFORM_MACOSX=='1'">$(UNIX_SRC)</if>
+    </set>
+
     <set var="GUI_SRC" hints="files">
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_SRC)</if>
         <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_SRC)</if>
@@ -3537,10 +3560,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
     <set var="CORE_SRC" hints="files">
         <if cond="USE_GUI=='1' and WXUNIV=='0'">
-            $(LOWLEVEL_SRC) $(GUI_SRC) $(GUI_CMN_SRC)
+            $(LOWLEVEL_SRC) $(PLATFORM_SRC) $(GUI_SRC) $(GUI_CMN_SRC)
         </if>
         <if cond="USE_GUI=='1' and WXUNIV=='1'">
-            $(LOWLEVEL_SRC) $(UNIV_SRC) $(UNIV_THEMES_SRC) $(GUI_CMN_SRC)
+            $(LOWLEVEL_SRC) $(PLATFORM_SRC) $(UNIV_SRC) $(UNIV_THEMES_SRC) $(GUI_CMN_SRC)
         </if>
     </set>
 
@@ -3669,7 +3692,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(BASE_MSDOS_SRC)
         $(BASE_PALMOS_SRC)
         $(BASE_AND_GUI_CMN_SRC)
-        $(BASE_AND_GUI_UNIX_SRC)
         $(BASE_AND_GUI_MAC_SRC)
         $(BASE_AND_GUI_WIN32_SRC)
         $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_WINCE_SRC)