According to C99 standard (6.10.1 p3) defined() in #define is undefined, so we need...

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

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index c328fab59165d184153fc9ed2ea6dfd0ff60cbde..bfdcb86686ab6d514119516f908ea06ae6776ad5 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -12,42 +12,72 @@
 #ifndef __DIALOGSH__
 #define __DIALOGSH__
 
-#define USE_COLOURDLG_GENERIC                                                     \
-    (                                                                             \
-        wxUSE_COLOURDLG &&                                                        \
-        ( defined(__WXMSW__) || defined(__WXMAC__) ) &&                           \
-        !defined(__WXUNIVERSAL__)                                                 \
+#ifdef __WXUNIVERSAL__
+    #define USE_WXUNIVERSAL 1
+#else
+    #define USE_WXUNIVERSAL 0
+#endif
+
+#ifdef __WXMSW__
+    #define USE_WXMSW 1
+#else
+    #define USE_WXMSW 0
+#endif
+
+#ifdef __WXMAC__
+    #define USE_WXMAC 1
+#else
+    #define USE_WXMAC 0
+#endif
+
+#ifdef __WXGTK__
+    #define USE_WXGTK 1
+#else
+    #define USE_WXGTK 0
+#endif
+
+#ifdef __WXPM__
+    #define USE_WXPM 1
+#else
+    #define USE_WXPM 0
+#endif
+
+#define USE_COLOURDLG_GENERIC                       \
+    (                                               \
+        wxUSE_COLOURDLG &&                          \
+        ( USE_WXMSW || USE_WXMAC ) &&               \
+        !USE_WXUNIVERSAL                            \
     )
 
 
-#define USE_DIRDLG_GENERIC                                                        \
-    (                                                                             \
-        wxUSE_DIRDLG &&                                                           \
-        ( defined(__WXMSW__) || defined(__WXMAC__) ) &&                           \
-        !defined(__WXUNIVERSAL__)                                                 \
+#define USE_DIRDLG_GENERIC                          \
+    (                                               \
+        wxUSE_DIRDLG &&                             \
+        ( USE_WXMSW || USE_WXMAC ) &&               \
+        !USE_WXUNIVERSAL                            \
     )
 
-#define USE_FILEDLG_GENERIC                                                       \
-    (                                                                             \
-        wxUSE_FILEDLG &&                                                          \
-        ( defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__) ) &&      \
-        !defined(__WXUNIVERSAL__)                                                 \
+#define USE_FILEDLG_GENERIC                         \
+    (                                               \
+        wxUSE_FILEDLG &&                            \
+        ( USE_WXMSW || USE_WXMAC || USE_WXPM ) &&   \
+        !USE_WXUNIVERSAL                            \
     )
 
-#define USE_FONTDLG_GENERIC                                                       \
-    (                                                                             \
-        wxUSE_FONTDLG &&                                                          \
-        ( defined(__WXMSW__) || defined(__WXPM__) ) &&                            \
-        !defined(__WXUNIVERSAL__)                                                 \
+#define USE_FONTDLG_GENERIC                         \
+    (                                               \
+        wxUSE_FONTDLG &&                            \
+        ( USE_WXMSW || USE_WXPM ) &&                \
+        !USE_WXUNIVERSAL                            \
     )
 
 
-#define USE_MODAL_PRESENTATION                                                    \
-    (                                                                             \
-        defined(__WXMSW__) ||                                                     \
-        defined(__WXMAC__) ||                                                     \
-        defined(__WXGTK__) ||                                                     \
-        defined(__WXPM__)                                                         \
+#define USE_MODAL_PRESENTATION                      \
+    (                                               \
+        USE_WXMSW ||                                \
+        USE_WXMAC ||                                \
+        USE_WXGTK ||                                \
+        USE_WXPM                                    \
     )
 
 // Define a new application type