fixed MSW linking (check for wxUSE_GENERIC_DIALOGS_IN_MSW)

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

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 3d86a33230c2101f69fb87107aafb8184c23e2bb..2c9c7e5b4ef39b482b07689ed67178dc8ffd5fb8 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -48,40 +48,17 @@
     #define USE_WXPM 0
 #endif
 
-#define USE_COLOURDLG_GENERIC                       \
-    (                                               \
-        wxUSE_COLOURDLG &&                          \
-        ( USE_WXMSW || USE_WXMAC ) &&               \
-        !USE_WXUNIVERSAL &&                         \
-        !USE_DLL                                    \
-    )
-
-
-#define USE_DIRDLG_GENERIC                          \
-    (                                               \
-        wxUSE_DIRDLG &&                             \
-        ( USE_WXMSW || USE_WXMAC ) &&               \
-        !USE_WXUNIVERSAL &&                         \
-        !USE_DLL                                    \
-    )
-
-#define USE_FILEDLG_GENERIC                         \
-    (                                               \
-        wxUSE_FILEDLG &&                            \
-        ( USE_WXMSW || USE_WXMAC || USE_WXPM ) &&   \
-        !USE_WXUNIVERSAL &&                         \
-        !USE_DLL                                    \
-    )
-
-#define USE_FONTDLG_GENERIC                         \
-    (                                               \
-        wxUSE_FONTDLG &&                            \
-        ( USE_WXMSW || USE_WXPM ) &&                \
-        !USE_WXUNIVERSAL &&                         \
-        !USE_DLL                                    \
-    )
+#define USE_GENERIC_DIALOGS                                                   \
+    (((USE_WXMSW && wxUSE_GENERIC_DIALOGS_IN_MSW) ||                          \
+      USE_WXMAC) &&                                                           \
+     !USE_WXUNIVERSAL)
 
+#define USE_COLOURDLG_GENERIC (USE_GENERIC_DIALOGS && wxUSE_COLOURDLG)
+#define USE_DIRDLG_GENERIC (USE_GENERIC_DIALOGS && wxUSE_DIRDLG)
+#define USE_FILEDLG_GENERIC (USE_GENERIC_DIALOGS && wxUSE_FILEDLG)
+#define USE_FONTDLG_GENERIC (USE_GENERIC_DIALOGS && wxUSE_FONTDLG)
 
+// VZ: what is this for?
 #define USE_MODAL_PRESENTATION                      \
     (                                               \
         USE_WXMSW ||                                \