Destroy the wxDialog::ShowWindowModalThenDo() functor a.s.a.p.

[wxWidgets.git] / build / bakefiles / files.bkl

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index b9e003d94dfeb3efa4c69e5d9dfb45cd33f9e00a..a297dfcf8c334d60f6b80ea857689f80ec6ee9a1 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?>
 <?xml version="1.0" ?>

-<!-- $Id$ -->

 <makefile>
 
 <!--
 <makefile>
 
 <!--


@@ -359,6 +358,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/tarstrm.cpp
     src/common/textbuf.cpp
     src/common/textfile.cpp
     src/common/tarstrm.cpp
     src/common/textbuf.cpp
     src/common/textfile.cpp

+    src/common/threadinfo.cpp

     src/common/time.cpp
     src/common/timercmn.cpp
     src/common/timerimpl.cpp
     src/common/time.cpp
     src/common/timercmn.cpp
     src/common/timerimpl.cpp


@@ -908,6 +908,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/valnum.h
     wx/window.h
     wx/windowid.h
     wx/valnum.h
     wx/window.h
     wx/windowid.h

+    wx/windowptr.h

     wx/withimages.h
     wx/wrapsizer.h
     wx/wupdlock.h
     wx/withimages.h
     wx/wrapsizer.h
     wx/wupdlock.h


@@ -3251,9 +3252,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="ADVANCED_UNIV_SRC" hints="files">
 <!--
 
 <set var="ADVANCED_UNIV_SRC" hints="files">
 <!--

-Don't include src/generic/animateg.cpp many times in ADVANCED_SRC(WXUNIV=='1').
-This file is already included in [OSX_CARBON, OSX_COCOA, OSX_IPHONE, COCOA, PM, MOTIF] TOOLKITs
-and TOOLKIT=='GTK' and TOOLKIT_VERSION==''.
+    Including src/generic/animateg.cpp hre unconditionally results in bakefile
+    errors when not fixing the value of TOOLKIT to MSW in msvc format, see #15327.

 -->
     <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
         src/generic/animateg.cpp
 -->
     <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
         src/generic/animateg.cpp


@@ -3264,6 +3264,9 @@ and TOOLKIT=='GTK' and TOOLKIT_VERSION==''.
     <if cond="TOOLKIT=='WINCE'">
         src/generic/animateg.cpp
     </if>
     <if cond="TOOLKIT=='WINCE'">
         src/generic/animateg.cpp
     </if>

+    <if cond="TOOLKIT=='X11'">
+        src/generic/animateg.cpp
+    </if>

 </set>
 <set var="ADVANCED_UNIV_HDR" hints="files">
     wx/generic/animate.h
 </set>
 <set var="ADVANCED_UNIV_HDR" hints="files">
     wx/generic/animate.h