reverted last check in

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

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 2c9c7e5b4ef39b482b07689ed67178dc8ffd5fb8..0b1dcf8ee2e49d49716dddf9a031d636fc0af9ad 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -48,15 +48,16 @@
     #define USE_WXPM 0
 #endif
 
-#define USE_GENERIC_DIALOGS                                                   \
-    (((USE_WXMSW && wxUSE_GENERIC_DIALOGS_IN_MSW) ||                          \
-      USE_WXMAC) &&                                                           \
-     !USE_WXUNIVERSAL)
+#define USE_GENERIC_DIALOGS (!USE_WXUNIVERSAL && !USE_DLL)
 
-#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)
+#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 && wxUSE_FILEDLG)
+#define USE_FONTDLG_GENERIC \
+    ((USE_WXMSW || USE_WXPM) && USE_GENERIC_DIALOGS && wxUSE_FONTDLG)
 
 // VZ: what is this for?
 #define USE_MODAL_PRESENTATION                      \
@@ -197,6 +198,7 @@ public:
     void ChooseFontGeneric(wxCommandEvent& event);
 #endif // USE_FONTDLG_GENERIC
 
+    void OnRequestUserAttention(wxCommandEvent& event);
     void OnExit(wxCommandEvent& event);
 
 private:
@@ -263,7 +265,8 @@ enum
     DIALOGS_PROGRESS,
     DIALOGS_BUSYINFO,
     DIALOGS_FIND,
-    DIALOGS_REPLACE
+    DIALOGS_REPLACE,
+    DIALOGS_REQUEST
 };
 
 #endif