Use _UNICODE instead of UNICODE in wx/msw/winundef.h.

[wxWidgets.git] / samples / dialogs / dialogs.bkl

diff --git a/samples/dialogs/dialogs.bkl b/samples/dialogs/dialogs.bkl
index 684193e7dfcaaf044c1a0e2c530cbeeed5d67ec4..b04b88e4f0623fb9f18b6c1afb228867fb705088 100644 (file)
--- a/samples/dialogs/dialogs.bkl
+++ b/samples/dialogs/dialogs.bkl
@@ -4,6 +4,9 @@
     <include file="../../build/bakefiles/common_samples.bkl"/>
 
     <set var="GENERIC_DIALOGS_IN_NATIVE_BUILDS">
+        <if cond="OUT_OF_TREE_MAKEFILES=='1'">
+            <!-- no files that are not part of the sample in this case -->
+        </if>
         <if cond="TOOLKIT=='MSW' and WXUNIV=='0' and SHARED=='0'">
             $(WXTOPDIR)src/generic/colrdlgg.cpp
             $(WXTOPDIR)src/generic/dirdlgg.cpp
@@ -15,6 +18,9 @@
             $(WXTOPDIR)src/generic/dirdlgg.cpp
             $(WXTOPDIR)src/generic/filedlgg.cpp
         </if>
+        <if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">
+            $(WXTOPDIR)src/generic/filedlgg.cpp
+        </if>
         <if cond="TOOLKIT=='PM' and WXUNIV=='0' and SHARED=='0'">
             $(WXTOPDIR)src/generic/fontdlgg.cpp
             $(WXTOPDIR)src/generic/filedlgg.cpp
@@ -26,9 +32,8 @@
             dialogs.cpp
             $(GENERIC_DIALOGS_IN_NATIVE_BUILDS)
         </sources>
+        <headers>dialogs.h</headers>
         <wx-lib>adv</wx-lib>
-        <wx-lib>html</wx-lib>
-        <wx-lib>xml</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <win32-res>dialogs.rc</win32-res>