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 be71c257a1217017677d6dcb5c666a8c192ff41d..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.          -->
-    <!--    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.            -->
     <!--                                                            -->
@@ -94,7 +94,7 @@ FIXME: this template has (at least) the following bugs:
         </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>
@@ -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                  -->
-    <!--    libraries required by the platform, the libaries        -->
+    <!--    libraries required by the platform, the libraries       -->
     <!--    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 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']">
@@ -178,6 +178,8 @@ FIXME: this template has (at least) the following bugs:
     <define-tag name="__wx-libs-point" rules="exe,dll,module"/>
     <tag-info name="wx-lib"
               position="before:__wx-libs-point"/>
+    <tag-info name="__wx-syslibs"
+              position="after:__wx-libs-point"/>
     
 
     <!-- template for static wx libraries: -->
@@ -196,15 +198,11 @@ FIXME: this template has (at least) the following bugs:
         <include>$(WX_DIR)/include</include>
     </template>
     
-   
-    <!-- template for wx executables/dlls: -->
-    <template id="wx" template="wx-lib">
-        <lib-path>$(WX_DIR)$(WXLIBPATH)</lib-path>
-
-        <!-- wx libs must come before 3rd party and sys libs, this is
-             the place where the hack explained above is carried on: -->
-        <__wx-libs-point/>
-
+    
+    <!-- this ugly tag contains all sys-lib tags used by "wx" template,
+         in order to make sure they are not reorder when wx-lib is moved
+         after __wx-libs-point: -->
+    <define-tag name="__wx-syslibs" rules="exe,dll,module">
         <!-- wx 3rd party libs, always use them: -->
         <sys-lib>wxtiff$(WX3RDPARTLIBPOSTFIX)</sys-lib> 
         <sys-lib>wxjpeg$(WX3RDPARTLIBPOSTFIX)</sys-lib> 
@@ -245,6 +243,16 @@ FIXME: this template has (at least) the following bugs:
         <if cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'">
             <sys-lib>oleacc</sys-lib>
         </if>
+    </define-tag>
+   
+    <!-- template for wx executables/dlls: -->
+    <template id="wx" template="wx-lib">
+        <lib-path>$(WX_DIR)$(WXLIBPATH)</lib-path>
+
+        <!-- wx libs must come before 3rd party and sys libs, this is
+             the place where the hack explained above is carried on: -->
+        <__wx-libs-point/>
+        <__wx-syslibs/>
     </template>
 
 </makefile>