use a default position for frames and in some cases a default size as well (otherwise...

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

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 91bef905f17625f709dfbde6b7675017c9b62cc0..f140a81b702432f17678f31290e023670ce5428b 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -12,37 +12,73 @@
 #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
+
+#if defined(__WXMSW__) && !defined(__WXWINCE__)
+    #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   1
+#define USE_MODAL_PRESENTATION                      \
+    (                                               \
+        USE_WXMSW ||                                \
+        USE_WXMAC ||                                \
+        USE_WXGTK ||                                \
+        USE_WXPM                                    \
+    )
 
 // Define a new application type
 class MyApp: public wxApp
@@ -54,6 +90,8 @@ public:
     wxColour     m_canvasTextColour;
 };
 
+#if USE_MODAL_PRESENTATION
+
 // A custom modeless dialog
 class MyModelessDialog : public wxDialog
 {
@@ -83,6 +121,8 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
+#endif // USE_MODAL_PRESENTATION
+
 // Define a new frame type
 class MyFrame: public wxFrame
 {