restored changes accidentally reverted by previous commit

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

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 93cade31b947c0bd663716da2df9bced525a10b4..f4ef59f44af9166f72e5d2a00afe677ea1576ee1 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -7,8 +7,8 @@
 IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 -->
 IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 -->

-    
-    
+
+

 <!-- ======================================================================
                                        FILES
 
 <!-- ======================================================================
                                        FILES
 


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

+    wx/afterstd.h

     wx/app.h
     wx/apptrait.h
     wx/arrimpl.cpp
     wx/app.h
     wx/apptrait.h
     wx/arrimpl.cpp


@@ -524,7 +525,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
     wx/accel.h
     wx/access.h
 
     wx/accel.h
     wx/access.h

-    wx/afterstd.h

     wx/artprov.h
     wx/bitmap.h
     wx/busyinfo.h
     wx/artprov.h
     wx/bitmap.h
     wx/busyinfo.h


@@ -1557,6 +1557,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/fontdlgg.cpp
     src/generic/imaglist.cpp
     src/generic/listctrl.cpp
     src/generic/fontdlgg.cpp
     src/generic/imaglist.cpp
     src/generic/listctrl.cpp

+    src/generic/prntdlgg.cpp

     src/generic/statusbr.cpp
     src/generic/tabg.cpp
     <!-- Unix files used by wxMac: -->
     src/generic/statusbr.cpp
     src/generic/tabg.cpp
     <!-- Unix files used by wxMac: -->


@@ -2145,8 +2146,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(BASE_AND_GUI_CMN_SRC)
         $(BASE_AND_GUI_PLATFORM_SRC) $(BASE_AND_GUI_TOOLKIT_SRC)
     </set>
         $(BASE_AND_GUI_CMN_SRC)
         $(BASE_AND_GUI_PLATFORM_SRC) $(BASE_AND_GUI_TOOLKIT_SRC)
     </set>

-    
-    
+
+

     <!-- wxNet files: -->
     <set var="NET_MACOSX_SRC" hints="files">
         <if cond="TOOLKIT=='MAC'">$(NET_MAC_SRC)</if>
     <!-- wxNet files: -->
     <set var="NET_MACOSX_SRC" hints="files">
         <if cond="TOOLKIT=='MAC'">$(NET_MAC_SRC)</if>


@@ -2172,7 +2173,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 
     <!-- GUI sources: -->
 
 
     <!-- GUI sources: -->

-    
+

     <set var="LOWLEVEL_SRC" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
     <set var="LOWLEVEL_SRC" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>


@@ -2193,7 +2194,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_HDR)</if>
     </set>
         <if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_HDR)</if>
         <if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_HDR)</if>
     </set>

-    
+

     <set var="GUI_SRC" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
     <set var="GUI_SRC" hints="files">
         <if cond="TOOLKIT=='GTK'">$(GTK_SRC)</if>
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>


@@ -2219,7 +2220,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
             $(LOWLEVEL_SRC) $(UNIV_SRC) $(UNIV_THEMES_SRC) $(GUI_CMN_SRC)
         </if>
     </set>
             $(LOWLEVEL_SRC) $(UNIV_SRC) $(UNIV_THEMES_SRC) $(GUI_CMN_SRC)
         </if>
     </set>

-    
+

     <!-- wxAdvanced files: -->
     <set var="ADVANCED_PLATFORM_SRC" hints="files">
         <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC)</if>
     <!-- wxAdvanced files: -->
     <set var="ADVANCED_PLATFORM_SRC" hints="files">
         <if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC)</if>


@@ -2253,15 +2254,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
             $(LOWLEVEL_HDR)
             $(GUI_CORE_HEADERS)
             $(ADVANCED_HDR) $(HTML_HDR)
             $(LOWLEVEL_HDR)
             $(GUI_CORE_HEADERS)
             $(ADVANCED_HDR) $(HTML_HDR)

-            $(OPENGL_HDR) $(ODBC_HDR) $(DBGRID_HDR)
+            $(OPENGL_HDR) $(DBGRID_HDR)

         </if>
     </set>
         </if>
     </set>

-        
+

 
     <set var="ALL_BASE_HEADERS" make_var="1" hints="files">
         $(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
         $(NET_CMN_HDR) $(NET_PLATFORM_HDR)
 
     <set var="ALL_BASE_HEADERS" make_var="1" hints="files">
         $(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
         $(NET_CMN_HDR) $(NET_PLATFORM_HDR)

-        $(XML_HDR)
+        $(XML_HDR) $(ODBC_HDR)

     </set>
 
     <set var="ALL_HEADERS" make_var="1" hints="files">
     </set>
 
     <set var="ALL_HEADERS" make_var="1" hints="files">


@@ -2278,7 +2279,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(BASE_AND_GUI_DARWIN_SRC)
         $(BASE_AND_GUI_WIN32_SRC)
         $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_MAC_SRC)
         $(BASE_AND_GUI_DARWIN_SRC)
         $(BASE_AND_GUI_WIN32_SRC)
         $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_MAC_SRC)

-        $(XML_SRC)
+        $(XML_SRC) $(ODBC_SRC)

     </set>
 
 </makefile>
     </set>
 
 </makefile>

diff --git a/contrib/build/deprecated/deprecated.bkl b/contrib/build/deprecated/deprecated.bkl
index 65ad4cd456a210d9edaa2003168460f1f34d816b..5b3fd85991655e00dc6fbd7543728b7957f2e87f 100644 (file)
--- a/contrib/build/deprecated/deprecated.bkl
+++ b/contrib/build/deprecated/deprecated.bkl
@@ -11,7 +11,7 @@
         proplist.cpp
         resource.cpp
         tbarsmpl.cpp
         proplist.cpp
         resource.cpp
         tbarsmpl.cpp

-        treelay.cpp
+        treelay.cpp        

         wxexpr.cpp
         
         <!--
         wxexpr.cpp
         
         <!--


@@ -38,12 +38,14 @@
     <dll id="deprecateddll" template="wx_contrib_dll" cond="SHARED=='1'">
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_DEPRECATED</define>
     <dll id="deprecateddll" template="wx_contrib_dll" cond="SHARED=='1'">
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_DEPRECATED</define>

+        <include>$(SRCDIR)</include>

         <sources>$(DEPRECATED_SRC)</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
     </dll>
     
     <lib id="deprecatedlib" template="wx_contrib_lib" cond="SHARED=='0'">
         <sources>$(DEPRECATED_SRC)</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
     </dll>
     
     <lib id="deprecatedlib" template="wx_contrib_lib" cond="SHARED=='0'">

+        <include>$(SRCDIR)</include>

         <sources>$(DEPRECATED_SRC)</sources>
     </lib>
     
         <sources>$(DEPRECATED_SRC)</sources>
     </lib>