X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da7a860276cdbc9d8178876b5bc7d2858e8db0b4..302e251b4df575dc60eb5bfafc931652dad165ec:/samples/dialogs/dialogs.h?ds=sidebyside

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index bfdcb86686..2c9c7e5b4e 100644
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -18,7 +18,13 @@
     #define USE_WXUNIVERSAL 0
 #endif
 
-#ifdef __WXMSW__
+#ifdef WXUSINGDLL
+    #define USE_DLL 1
+#else
+    #define USE_DLL 0
+#endif
+
+#if defined(__WXMSW__) && !defined(__WXWINCE__)
     #define USE_WXMSW 1
 #else
     #define USE_WXMSW 0
@@ -42,36 +48,17 @@
     #define USE_WXPM 0
 #endif
 
-#define USE_COLOURDLG_GENERIC                       \
-    (                                               \
-        wxUSE_COLOURDLG &&                          \
-        ( USE_WXMSW || USE_WXMAC ) &&               \
-        !USE_WXUNIVERSAL                            \
-    )
-
-
-#define USE_DIRDLG_GENERIC                          \
-    (                                               \
-        wxUSE_DIRDLG &&                             \
-        ( USE_WXMSW || USE_WXMAC ) &&               \
-        !USE_WXUNIVERSAL                            \
-    )
-
-#define USE_FILEDLG_GENERIC                         \
-    (                                               \
-        wxUSE_FILEDLG &&                            \
-        ( USE_WXMSW || USE_WXMAC || USE_WXPM ) &&   \
-        !USE_WXUNIVERSAL                            \
-    )
-
-#define USE_FONTDLG_GENERIC                         \
-    (                                               \
-        wxUSE_FONTDLG &&                            \
-        ( USE_WXMSW || USE_WXPM ) &&                \
-        !USE_WXUNIVERSAL                            \
-    )
+#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 ||                                \