respect wxBU_NOTEXT style in wxButton

[wxWidgets.git] / samples / samples.bkl

diff --git a/samples/samples.bkl b/samples/samples.bkl
index 4bc61d34dd67271bb4cec1d12b5ac54df574feed..a8c41e5e86f2def0fb939be411959bfc7b457c22 100644 (file)
--- a/samples/samples.bkl
+++ b/samples/samples.bkl
@@ -21,8 +21,8 @@
     <subproject id="caret" template="sub"/>
     <subproject id="clipboard" template="sub"/>
     <subproject id="collpane" template="sub"/>
-    <subproject id="config" template="sub"/>
     <subproject id="combo" template="sub"/>
+    <subproject id="config" template="sub"/>
     <subproject id="console" template="sub"/>
     <subproject id="controls" template="sub"/>
     <subproject id="dataview" template="sub"/>
@@ -35,8 +35,8 @@
     <subproject id="drawing" template="sub"/>
     <subproject id="erase" template="sub"/>
     <subproject id="event" template="sub"/>
-    <subproject id="exec" template="sub"/>
     <subproject id="except" template="sub"/>
+    <subproject id="exec" template="sub"/>
     <subproject id="font" template="sub"/>
     <subproject id="grid" template="sub"/>
     <subproject id="help" template="sub"/>
@@ -59,6 +59,7 @@
     <subproject id="opengl" template="sub"/>
     <subproject id="ownerdrw" template="sub"/>
     <subproject id="popup" template="sub"/>
+    <subproject id="power" template="sub"/>
     <subproject id="printing" template="sub"/>
     <subproject id="propgrid" template="sub"/>
     <subproject id="regtest" template="sub"/>
@@ -73,6 +74,8 @@
     <subproject id="splitter" template="sub"/>
     <subproject id="statbar" template="sub"/>
     <subproject id="stc" template="sub"/>
+    <subproject id="svg" template="sub"/>
+    <subproject id="taborder" template="sub"/>
     <subproject id="taskbar" template="sub"/>
     <subproject id="text" template="sub"/>
     <subproject id="thread" template="sub"/>
@@ -84,9 +87,19 @@
     <subproject id="widgets" template="sub"/>
     <subproject id="wizard" template="sub"/>
     <subproject id="wrapsizer" template="sub"/>
-    <!-- These samples don't always build so don't build them by default -->
-    <subproject id="flash" template="optsub"/>
-    <subproject id="mfc" template="optsub"/>
+    <subproject id="xrc" template="sub"/>
+
+    <!--
+        These samples don't always build (they need non-default wxWidgets
+        configuration or some 3rd party library being installed) so don't build
+        them by default by using "optsub" template instead of "sub" one and
+        some of them also require MSVC compiler so don't use them with the
+        other ones.
+     -->
+    <if cond="FORMAT[:3] == 'msv'">
+        <subproject id="flash" template="optsub"/>
+        <subproject id="mfc" template="optsub"/>
+    </if>
     <subproject id="memcheck" template="optsub"/>
 
 </makefile>