X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e86e15224d782522f5e4f5fd8c4532f7b2f78fad..92c8c54e7e1f03a461da5d5687eaad759c1d5430:/build/bakefiles/files.bkl

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 8a4152f64d..b7320c52ef 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -57,7 +57,6 @@
     src/msw/basemsw.cpp
     src/msw/dde.cpp
     src/msw/dir.cpp
-    src/msw/main.cpp
     src/msw/mimetype.cpp
     src/msw/regconf.cpp
     src/msw/registry.cpp
@@ -67,6 +66,7 @@
     src/msw/utilsexc.cpp
 </set>
 <set var="BASE_AND_GUI_WIN32_SRC">
+    src/msw/main.cpp
     src/msw/mslu.cpp
     src/msw/volume.cpp
 </set>
@@ -77,9 +77,30 @@
     wx/msw/winundef.h
 </set>
 
+<set var="BASE_DARWIN_SRC">
+    src/unix/baseunix.cpp
+    src/unix/dir.cpp
+    src/unix/gsocket.c
+    src/unix/mimetype.cpp
+    src/unix/snglinst.cpp
+    src/unix/threadpsx.cpp
+</set>
+<set var="BASE_AND_GUI_DARWIN_SRC">
+    src/unix/utilsunx.cpp
+</set>
+<set var="BASE_DARWIN_HDR">
+</set>
+
 <set var="BASE_MAC_SRC">
+    src/unix/baseunix.cpp
+    src/mac/dirmac.cpp
+    src/mac/gsocket.c
+    src/mac/mimetmac.cpp
+    src/mac/utils.cpp
+    src/mac/utilsexc.cpp
 </set>
 <set var="BASE_AND_GUI_MAC_SRC">
+    src/unix/utilsunx.cpp
 </set>
 <set var="BASE_MAC_HDR">
 </set>
@@ -122,6 +143,7 @@
     src/common/hash.cpp
     src/common/hashmap.cpp
     src/common/http.cpp
+    src/common/init.cpp
     src/common/intl.cpp
     src/common/ipcbase.cpp
     src/common/list.cpp
@@ -158,11 +180,13 @@
     src/common/zstream.cpp
 </set>
 <set var="BASE_AND_GUI_CMN_SRC">
+    src/common/event.cpp
     src/common/fs_mem.cpp
     src/common/msgout.cpp
     src/common/utilscmn.cpp
 </set>
 <set var="BASE_CMN_HDR">
+    wx/init.h
     wx/arrimpl.cpp
     wx/listimpl.cpp
     wx/app.h
@@ -177,6 +201,7 @@
     wx/datetime.inl
     wx/datstrm.h
     wx/db.h
+    wx/dbkeyg.h
     wx/dbtable.h
     wx/dde.h
     wx/debug.h
@@ -199,10 +224,10 @@
     wx/fs_inet.h
     wx/fs_zip.h
     wx/fs_mem.h
-    wx/dbkeyg.h
     wx/gsocket.h
     wx/hash.h
     wx/hashmap.h
+    wx/iconloc.h
     wx/intl.h
     wx/iosfwrap.h
     wx/ioswrap.h
@@ -230,6 +255,7 @@
     wx/sckstrm.h
     wx/socket.h
     wx/snglinst.h
+    wx/stopwatch.h
     wx/strconv.h
     wx/stream.h
     wx/string.h
@@ -238,7 +264,6 @@
     wx/textfile.h
     wx/thread.h
     wx/thrimpl.cpp
-    wx/timer.h
     wx/tokenzr.h
     wx/txtstrm.h
     wx/url.h
@@ -287,9 +312,10 @@
     src/generic/tipdlg.cpp
     src/generic/tipwin.cpp
     src/generic/treectlg.cpp
+    src/generic/vlbox.cpp
+    src/generic/vscroll.cpp
     src/generic/wizard.cpp
     src/common/appcmn.cpp
-    src/common/event.cpp
     src/common/fontmap.cpp
     src/common/accesscmn.cpp
     src/common/artprov.cpp
@@ -365,7 +391,6 @@
     wx/selstore.h
     wx/generic/accel.h
     wx/generic/calctrl.h
-    wx/generic/caret.h
     wx/generic/choicdgg.h
     wx/generic/colrdlgg.h
     wx/generic/dcpsg.h
@@ -408,6 +433,7 @@
     src/common/taskbarcmn.cpp
     src/unix/taskbarx11.cpp
     src/generic/printps.cpp
+    src/generic/caret.cpp
     src/unix/dialup.cpp
 </set>
 <set var="XWIN_LOWLEVEL_HDR">
@@ -415,6 +441,7 @@
     wx/unix/utilsx11.h
     wx/unix/taskbarx11.h
     wx/generic/printps.h
+    wx/generic/caret.h
 </set>
 
 
@@ -831,7 +858,6 @@
     src/msw/dirdlg.cpp
     src/msw/display.cpp
     src/msw/enhmeta.cpp
-    src/msw/helpbest.cpp
     src/msw/evtloop.cpp
     src/msw/font.cpp
     src/msw/fontenum.cpp
@@ -867,6 +893,8 @@
 <set var="MSW_LOWLEVEL_HDR">
 </set>
 <set var="MSW_SRC">
+    src/generic/statusbr.cpp
+    src/msw/uxtheme.cpp
     src/msw/ole/access.cpp
     src/msw/accel.cpp
     src/msw/bmpbuttn.cpp
@@ -915,7 +943,6 @@
     src/msw/textctrl.cpp
     src/msw/tglbtn.cpp
     src/msw/treectrl.cpp
-    src/msw/mslu.cpp
 </set>
 <set var="MSW_HDR">
     wx/msw/access.h
@@ -954,7 +981,6 @@
     wx/msw/gdiimage.h
     wx/msw/gdiobj.h
     wx/msw/glcanvas.h
-    wx/msw/helpbest.h
     wx/msw/helpchm.h
     wx/msw/helpwin.h
     wx/msw/icon.h
@@ -1015,6 +1041,7 @@
     wx/msw/droptgt.h
     wx/msw/oleutils.h
     wx/msw/uuid.h
+    wx/msw/helpbest.h
 </set>
 
 
@@ -1049,6 +1076,7 @@
     src/mgl/window.cpp
     src/mgl/utils.cpp
     src/generic/timer.cpp
+    src/generic/caret.cpp
 </set>
 <set var="MGL_LOWLEVEL_HDR">
     wx/mgl/app.h
@@ -1073,6 +1101,7 @@
     wx/mgl/toplevel.h
     wx/mgl/window.h
     wx/generic/timer.h
+    wx/generic/caret.h
 </set>
 
 
@@ -1157,6 +1186,7 @@
     src/os2/window.cpp
     src/os2/gsocket.c
     src/os2/gsockpm.c
+    src/generic/caret.cpp
 </set>
 <set var="OS2_HDR">
     wx/os2/accel.h
@@ -1229,6 +1259,7 @@
     wx/os2/pnghand.h
     wx/os2/statbox.h
     wx/os2/toplevel.h
+    wx/generic/caret.h
 </set>
 
 
@@ -1242,7 +1273,6 @@
 <set var="MAC_LOWLEVEL_HDR">
 </set>
 <set var="MAC_SRC">
-    src/mac/gsocket.c
     src/mac/accel.cpp
     src/mac/aga.cpp
     src/mac/app.cpp
@@ -1268,7 +1298,6 @@
     src/mac/dcscreen.cpp
     src/mac/dialog.cpp
     src/mac/dirdlg.cpp
-    src/mac/dirmac.cpp
     src/mac/dnd.cpp
     src/mac/filedlg.cpp
     src/mac/font.cpp
@@ -1286,7 +1315,6 @@
     src/mac/menu.cpp
     src/mac/menuitem.cpp
     src/mac/metafile.cpp
-    src/mac/mimetmac.cpp
     src/mac/minifram.cpp
     src/mac/msgdlg.cpp
     src/mac/notebmac.cpp
@@ -1315,8 +1343,6 @@
     src/mac/toolbar.cpp
     src/mac/tooltip.cpp
     src/mac/uma.cpp
-    src/mac/utils.cpp
-    src/mac/utilsexc.cpp
     src/mac/wave.cpp
     src/mac/window.cpp
     src/mac/morefilex/MoreFilesX.c
@@ -1327,9 +1353,9 @@
     src/generic/fdrepdlg.cpp
     src/generic/tabg.cpp
     src/generic/fontdlgg.cpp
+    src/generic/caret.cpp
     <!-- Unix files used by wxMac: -->
     src/unix/snglinst.cpp
-    src/unix/utilsunx.cpp
 </set>
 <set var="MAC_HDR">
     wx/mac/accel.h
@@ -1419,6 +1445,7 @@
     wx/generic/listctrl.h
     wx/generic/fdrepdlg.h
     wx/generic/tabg.h
+    wx/generic/caret.h
 </set>
 
 
@@ -1442,7 +1469,7 @@
     src/cocoa/app.mm
     src/cocoa/bmpbuttn.mm
     src/cocoa/bitmap.mm
-    src/cocoa/brush.cpp
+    src/cocoa/brush.mm
     src/cocoa/button.mm
     src/cocoa/checkbox.mm
     src/cocoa/checklst.mm
@@ -1480,6 +1507,22 @@
     src/cocoa/utils.cpp
     src/cocoa/utilsexc.cpp
     src/cocoa/window.mm
+    <!-- Generic implementations used by wxCocoa: -->
+    src/generic/statusbr.cpp
+    src/generic/imaglist.cpp
+    src/generic/listctrl.cpp
+    src/generic/fdrepdlg.cpp
+    src/generic/tabg.cpp
+    src/generic/fontdlgg.cpp
+    src/generic/colrdlgg.cpp
+    src/generic/msgdlgg.cpp
+    src/generic/dirdlgg.cpp
+    src/generic/filedlgg.cpp
+    src/generic/notebook.cpp
+    src/generic/accel.cpp
+    src/generic/paletteg.cpp
+    src/generic/timer.cpp
+    src/generic/caret.cpp
 </set>
 <set var="COCOA_HDR">
     wx/cocoa/NSBox.h
@@ -1526,6 +1569,14 @@
     wx/cocoa/textctrl.h
     wx/cocoa/toplevel.h
     wx/cocoa/window.h
+    <!-- Generic implementations used by wxCocoa: -->
+    wx/generic/statusbr.h
+    wx/generic/fontdlgg.h
+    wx/generic/imaglist.h
+    wx/generic/listctrl.h
+    wx/generic/fdrepdlg.h
+    wx/generic/tabg.h
+    wx/generic/caret.h
 </set>
 
 
@@ -1584,7 +1635,6 @@
     src/univ/toolbar.cpp
     src/univ/theme.cpp
     src/univ/winuniv.cpp
-    src/generic/caret.cpp
     src/generic/mdig.cpp
     src/generic/imaglist.cpp
     src/generic/colrdlgg.cpp
@@ -1637,7 +1687,6 @@
     wx/univ/theme.h
     wx/univ/toolbar.h
     wx/univ/window.h
-    wx/generic/caret.h
     wx/generic/mdig.h
     wx/generic/fdrepdlg.h
     wx/generic/fontdlgg.h
@@ -1653,7 +1702,13 @@
 <!--                               wxHTML                                   -->
 <!-- ====================================================================== -->
 
+<set var="HTML_SRC_PLATFORM">
+    <if cond="TOOLKIT=='MSW'">
+        src/msw/helpbest.cpp
+    </if>
+</set>
 <set var="HTML_SRC">
+    $(HTML_SRC_PLATFORM)
     src/html/helpdata.cpp
     src/html/helpfrm.cpp
     src/html/helpctrl.cpp
@@ -1674,8 +1729,26 @@
     src/html/m_tables.cpp
     src/html/m_style.cpp
     src/html/htmprint.cpp
+    <!-- wxHTML users: -->
+    src/generic/htmllbox.cpp
 </set>
 <set var="HTML_HDR">
+    wx/html/forcelnk.h
+    wx/html/helpctrl.h
+    wx/html/helpdata.h
+    wx/html/helpfrm.h
+    wx/html/htmlcell.h
+    wx/html/htmldefs.h
+    wx/html/htmlfilt.h
+    wx/html/htmlpars.h
+    wx/html/htmlproc.h
+    wx/html/htmltag.h
+    wx/html/htmlwin.h
+    wx/html/htmprint.h
+    wx/html/m_templ.h
+    wx/html/winpars.h
+    <!-- wxHTML users: -->
+    wx/htmllbox.h
 </set>
 
 
@@ -1687,18 +1760,23 @@
 
     <set var="BASE_PLATFORM_SRC">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if>
-        <if cond="PLATFORM_MACOSX=='1'">$(BASE_MAC_SRC)</if>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC)</if>
+        <!-- FIXME: this should really be 
+                    PLATFORM_MACOSX==1 && TOOLKIT{=='MAC',!='MAC'} -->
+        <if cond="TOOLKIT=='MAC'">$(BASE_MAC_SRC)</if>
+        <if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_SRC)</if>
     </set>
     <set var="BASE_AND_GUI_PLATFORM_SRC">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_AND_GUI_UNIX_SRC)</if>
-        <if cond="PLATFORM_MACOSX=='1'">$(BASE_AND_GUI_MAC_SRC)</if>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
+        <if cond="TOOLKIT=='MAC'">$(BASE_AND_GUI_MAC_SRC)</if>
+        <if cond="TOOLKIT=='COCOA'">$(BASE_AND_GUI_DARWIN_SRC)</if>
     </set>
     <set var="BASE_PLATFORM_HDR">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>
-        <if cond="PLATFORM_MACOSX=='1'">$(BASE_MAC_HDR)</if>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_HDR)</if>
+        <if cond="TOOLKIT=='MAC'">$(BASE_MAC_HDR)</if>
+        <if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_HDR)</if>
     </set>
     
     <set var="BASE_SRC">
@@ -1729,7 +1807,6 @@
         <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_HDR)</if>
     </set>
-    
 
     <set var="GUI_SRC">
         <if cond="TOOLKIT=='GTK'">$(GTK_SRC)</if>
@@ -1749,9 +1826,6 @@
     </set>
 
     <set var="CORE_SRC">
-        <if cond="USE_GUI=='0'">
-            src/common/init.cpp
-        </if>
         <if cond="USE_GUI=='1' and WXUNIV=='0'">
             $(LOWLEVEL_SRC) $(GUI_SRC) $(GUI_CMN_SRC)
         </if>