added bookctrl.cpp

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 54112f1a75aef94fcd64990146a14f9cafee8ff5..10f507b34395c4f9c4cc63d1695e44dcb85714b7 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -113,6 +113,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="BASE_AND_GUI_MAC_SRC" hints="files">
     src/mac/utils.cpp
 
 <set var="BASE_AND_GUI_MAC_SRC" hints="files">
     src/mac/utils.cpp

+<<<<<<< files.bkl
+    <!-- src/mac/utilsexc.cpp -->
+=======
+>>>>>>> 1.74

 </set>
 
 <set var="BASE_MAC_HDR" hints="files">
 </set>
 
 <set var="BASE_MAC_HDR" hints="files">


@@ -181,6 +185,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/zstream.cpp
 </set>
 <set var="BASE_AND_GUI_CMN_SRC" hints="files">
     src/common/zstream.cpp
 </set>
 <set var="BASE_AND_GUI_CMN_SRC" hints="files">

+    src/common/bookctrl.cpp

     src/common/event.cpp
     src/common/fs_mem.cpp
     src/common/msgout.cpp
     src/common/event.cpp
     src/common/fs_mem.cpp
     src/common/msgout.cpp