X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9feb77164b5c3104bf42729b6324021a762fa741..1f6c7c44328d4b81394bb6c3cd5d2e30367262e4:/build/bakefiles/files.bkl

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 62bd7768c3..a318e0abbc 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -20,7 +20,8 @@
                                
        $(port)LOWLEVEL               low-level GUI classes
        $(port)                       high-level files for a port
-       XWIN_LOWLEVEL                 low-level classes for X Window System port
+       XWIN_LOWLEVEL                 low-level classes for X Window System 
+                                     ports (wxGTK, wxMotif, wxX11)
 
        HTML                          wxHTML files
   
@@ -80,10 +81,10 @@
 <set var="BASE_DARWIN_SRC">
     src/unix/baseunix.cpp
     src/unix/dir.cpp
-    src/mac/gsocket.c
-    src/mac/mimetmac.cpp
-    src/mac/utils.cpp
-    src/mac/utilsexc.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
@@ -99,9 +100,6 @@
     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>
 
@@ -186,6 +184,7 @@
     src/common/utilscmn.cpp
 </set>
 <set var="BASE_CMN_HDR">
+    wx/init.h
     wx/arrimpl.cpp
     wx/listimpl.cpp
     wx/app.h
@@ -207,6 +206,7 @@
     wx/defs.h
     wx/dir.h
     wx/dynarray.h
+    wx/arrstr.h
     wx/dynlib.h
     wx/dynload.h
     wx/encconv.h
@@ -311,6 +311,8 @@
     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/fontmap.cpp
@@ -388,7 +390,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
@@ -431,6 +432,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">
@@ -438,6 +440,7 @@
     wx/unix/utilsx11.h
     wx/unix/taskbarx11.h
     wx/generic/printps.h
+    wx/generic/caret.h
 </set>
 
 
@@ -854,7 +857,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
@@ -978,7 +980,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
@@ -1039,6 +1040,7 @@
     wx/msw/droptgt.h
     wx/msw/oleutils.h
     wx/msw/uuid.h
+    wx/msw/helpbest.h
 </set>
 
 
@@ -1073,6 +1075,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
@@ -1097,6 +1100,7 @@
     wx/mgl/toplevel.h
     wx/mgl/window.h
     wx/generic/timer.h
+    wx/generic/caret.h
 </set>
 
 
@@ -1181,6 +1185,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
@@ -1253,6 +1258,7 @@
     wx/os2/pnghand.h
     wx/os2/statbox.h
     wx/os2/toplevel.h
+    wx/generic/caret.h
 </set>
 
 
@@ -1346,10 +1352,12 @@
     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
 </set>
 <set var="MAC_HDR">
+    wx/mac/chkconf.h
     wx/mac/accel.h
     wx/mac/aga.h
     wx/mac/app.h
@@ -1437,6 +1445,7 @@
     wx/generic/listctrl.h
     wx/generic/fdrepdlg.h
     wx/generic/tabg.h
+    wx/generic/caret.h
 </set>
 
 
@@ -1445,12 +1454,8 @@
 <!-- ====================================================================== -->
 
 <set var="COCOA_LOWLEVEL_SRC">
-    <!-- Unix files used by wxCocoa: -->
-    $(BASE_UNIX_SRC)
-    src/unix/utilsunx.cpp
 </set>
 <set var="COCOA_LOWLEVEL_HDR">
-    $(BASE_UNIX_HDR)
 </set>
 <set var="COCOA_SRC">
     src/cocoa/NSBox.mm
@@ -1464,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
@@ -1517,6 +1522,8 @@
     src/generic/accel.cpp
     src/generic/paletteg.cpp
     src/generic/timer.cpp
+    src/generic/caret.cpp
+    src/generic/mdig.cpp
 </set>
 <set var="COCOA_HDR">
     wx/cocoa/NSBox.h
@@ -1570,6 +1577,8 @@
     wx/generic/listctrl.h
     wx/generic/fdrepdlg.h
     wx/generic/tabg.h
+    wx/generic/caret.h
+    wx/generic/mdig.h
 </set>
 
 
@@ -1628,7 +1637,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
@@ -1681,7 +1689,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
@@ -1697,7 +1704,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
@@ -1718,8 +1731,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>
 
 
@@ -1729,19 +1760,22 @@
 <!--                    Define sources for specific libraries:              -->
 <!-- ====================================================================== -->
 
+    <!-- Nested if would be nicer, but this works -->
+    <set var="BASE_MACOSX_SRC">
+        <if cond="TOOLKIT=='MAC'">$(BASE_MAC_SRC)</if>
+        <if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_SRC)</if>
+        <if cond="TOOLKIT=='GTK'">$(BASE_DARWIN_SRC)</if>
+        <!-- FIXME: TOOLKIT!='MAC' is what we really want -->
+    </set>
     <set var="BASE_PLATFORM_SRC">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_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>
+        <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_SRC)</if>
     </set>
     <set var="BASE_AND_GUI_PLATFORM_SRC">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_AND_GUI_UNIX_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>
+        <if cond="PLATFORM_MACOSX=='1'">$(BASE_AND_GUI_DARWIN_SRC)</if>
     </set>
     <set var="BASE_PLATFORM_HDR">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>