Native Smartphone wxTextCtrl.

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

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 16b915ac85a0a1d87933709e28ba3a1d1512f5cc..2c9c7e5b4ef39b482b07689ed67178dc8ffd5fb8 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -12,24 +12,60 @@
 #ifndef __DIALOGSH__
 #define __DIALOGSH__
 
-#define USE_COLOURDLG_GENERIC                                                     \
-    (                                                                             \
-        wxUSE_COLOURDLG &&                                                        \
-        ( defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXGTK20__) ) &&   \
-        !defined(__WXUNIVERSAL__)                                                 \
-    )
+#ifdef __WXUNIVERSAL__
+    #define USE_WXUNIVERSAL 1
+#else
+    #define USE_WXUNIVERSAL 0
+#endif
 
+#ifdef WXUSINGDLL
+    #define USE_DLL 1
+#else
+    #define USE_DLL 0
+#endif
 
-#define USE_FONTDLG_GENERIC                                                       \
-    (                                                                             \
-        wxUSE_FONTDLG &&                                                          \
-        ( defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__) ) &&      \
-        !defined(__WXUNIVERSAL__)                                                 \
-    )
+#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
 
-#define USE_DIRDLG_GENERIC       0
+#ifdef __WXPM__
+    #define USE_WXPM 1
+#else
+    #define USE_WXPM 0
+#endif
 
-#define USE_MODAL_PRESENTATION   1
+#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 a new application type
 class MyApp: public wxApp
@@ -41,6 +77,8 @@ public:
     wxColour     m_canvasTextColour;
 };
 
+#if USE_MODAL_PRESENTATION
+
 // A custom modeless dialog
 class MyModelessDialog : public wxDialog
 {
@@ -70,6 +108,8 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
+#endif // USE_MODAL_PRESENTATION
+
 // Define a new frame type
 class MyFrame: public wxFrame
 {
@@ -111,6 +151,12 @@ public:
     void FileSave(wxCommandEvent& event);
 #endif // wxUSE_FILEDLG
 
+#if USE_FILEDLG_GENERIC
+    void FileOpenGeneric(wxCommandEvent& event);
+    void FilesOpenGeneric(wxCommandEvent& event);
+    void FileSaveGeneric(wxCommandEvent& event);
+#endif // USE_FILEDLG_GENERIC
+
 #if wxUSE_DIRDLG
     void DirChoose(wxCommandEvent& event);
     void DirChooseNew(wxCommandEvent& event);
@@ -202,6 +248,9 @@ enum
     DIALOGS_FILE_OPEN2,
     DIALOGS_FILES_OPEN,
     DIALOGS_FILE_SAVE,
+    DIALOGS_FILE_OPEN_GENERIC,
+    DIALOGS_FILES_OPEN_GENERIC,
+    DIALOGS_FILE_SAVE_GENERIC,
     DIALOGS_DIR_CHOOSE,
     DIALOGS_DIRNEW_CHOOSE,
     DIALOGS_GENERIC_DIR_CHOOSE,