-#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 || \
- USE_WXMAC || \
- USE_WXGTK || \
- USE_WXPM \
- )
+#define USE_GENERIC_DIALOGS (!USE_WXUNIVERSAL && !USE_DLL)
+
+#define USE_COLOURDLG_GENERIC \
+ ((USE_WXMSW || USE_WXMAC) && USE_GENERIC_DIALOGS && wxUSE_COLOURDLG)
+#define USE_DIRDLG_GENERIC \
+ ((USE_WXMSW || USE_WXMAC) && USE_GENERIC_DIALOGS && wxUSE_DIRDLG)
+#define USE_FILEDLG_GENERIC \
+ ((((USE_WXMSW || USE_WXMAC || USE_WXPM) && USE_GENERIC_DIALOGS) || USE_WXWINCE) && wxUSE_FILEDLG)
+#define USE_FONTDLG_GENERIC \
+ ((USE_WXMSW || USE_WXMACFONTDLG || USE_WXPM) && USE_GENERIC_DIALOGS && wxUSE_FONTDLG)
+
+// Turn USE_MODAL_PRESENTATION to 0 if there is any reason for not presenting difference
+// between modal and modeless dialogs (ie. not implemented it in your port yet)
+#if defined(__SMARTPHONE__) || !wxUSE_BOOKCTRL
+ #define USE_MODAL_PRESENTATION 0
+#else
+ #define USE_MODAL_PRESENTATION 1
+#endif
+
+
+// Turn USE_SETTINGS_DIALOG to 0 if supported
+#if wxUSE_BOOKCTRL
+ #define USE_SETTINGS_DIALOG 1
+#else
+ #define USE_SETTINGS_DIALOG 0
+#endif
+