Allow multiline tooltip testing.

[wxWidgets.git] / build / bakefiles / wxpresets / presets / wx_win32.bkl

diff --git a/build/bakefiles/wxpresets/presets/wx_win32.bkl b/build/bakefiles/wxpresets/presets/wx_win32.bkl
index 4749a243524b96724e0a2bcd2e2d52bf3d9b8220..6d4f19b509885d119a1d73049e6c11545e13cf8c 100644 (file)
--- a/build/bakefiles/wxpresets/presets/wx_win32.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl
@@ -34,7 +34,7 @@ FIXME: this template has (at least) the following bugs:
     <!--    In MSVC these are the different build                   -->
     <!--    configurations you can have (in the build menu),        -->
     <!--    and in autoconf is enabled with enable-xxx=xx.          -->
     <!--    In MSVC these are the different build                   -->
     <!--    configurations you can have (in the build menu),        -->
     <!--    and in autoconf is enabled with enable-xxx=xx.          -->

-    <!--    For other compilers a seperate configuration            -->
+    <!--    For other compilers a separate configuration            -->

     <!--    file is created (such as config.gcc on gcc)             -->
     <!--    which has several options a user can modify.            -->
     <!--                                                            -->
     <!--    file is created (such as config.gcc on gcc)             -->
     <!--    which has several options a user can modify.            -->
     <!--                                                            -->


@@ -94,7 +94,7 @@ FIXME: this template has (at least) the following bugs:
         </description>
     </option>
 
         </description>
     </option>
 

-    <set var="WX_VERSION_DEFAULT" overwrite="0">25</set>
+    <set var="WX_VERSION_DEFAULT" overwrite="0">26</set>

     <option name="WX_VERSION">
         <default-value>$(WX_VERSION_DEFAULT)</default-value>
         <description>
     <option name="WX_VERSION">
         <default-value>$(WX_VERSION_DEFAULT)</default-value>
         <description>


@@ -155,7 +155,7 @@ FIXME: this template has (at least) the following bugs:
     <!--                                                            -->
     <!--    The "base class" of all our build targets               -->
     <!--    This links with the appropriate native                  -->
     <!--                                                            -->
     <!--    The "base class" of all our build targets               -->
     <!--    This links with the appropriate native                  -->

-    <!--    libraries required by the platform, the libaries        -->
+    <!--    libraries required by the platform, the libraries       -->

     <!--    we want for our stuff, and the wxWindows libs.          -->
 
 
     <!--    we want for our stuff, and the wxWindows libs.          -->
 
 


@@ -165,7 +165,7 @@ FIXME: this template has (at least) the following bugs:
         <if cond="value=='base'">
             <sys-lib>wxbase$(WX_VERSION)$(WXLIBPOSTFIX)</sys-lib>
         </if>
         <if cond="value=='base'">
             <sys-lib>wxbase$(WX_VERSION)$(WXLIBPOSTFIX)</sys-lib>
         </if>

-        <if cond="value in ['net','xml']">
+        <if cond="value in ['net','xml', 'odbc']">

             <sys-lib>wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
         </if>
         <if cond="value not in ['base','net','xml']">
             <sys-lib>wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</sys-lib>
         </if>
         <if cond="value not in ['base','net','xml']">