X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2c0dabfa61fc435265f3dc71122592d359f0119..302e251b4df575dc60eb5bfafc931652dad165ec:/samples/dialogs/dialogs.h?ds=sidebyside

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 88b81497bb..2c9c7e5b4e 100644
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -2,16 +2,71 @@
 // Name:        dialogs.h
 // Purpose:     Common dialogs demo
 // Author:      Julian Smart
-// Modified by:
+// Modified by: ABX (2004) - adjustementd for conditional building
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __DIALOGSH__
 #define __DIALOGSH__
 
+#ifdef __WXUNIVERSAL__
+    #define USE_WXUNIVERSAL 1
+#else
+    #define USE_WXUNIVERSAL 0
+#endif
+
+#ifdef WXUSINGDLL
+    #define USE_DLL 1
+#else
+    #define USE_DLL 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_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
 {
@@ -22,6 +77,8 @@ public:
     wxColour     m_canvasTextColour;
 };
 
+#if USE_MODAL_PRESENTATION
+
 // A custom modeless dialog
 class MyModelessDialog : public wxDialog
 {
@@ -44,59 +101,112 @@ public:
     void OnButton(wxCommandEvent& event);
 
 private:
-    wxButton *m_btnFocused;
-    wxButton *m_btnDelete;
+    wxButton *m_btnModal,
+             *m_btnModeless,
+             *m_btnDelete;
 
     DECLARE_EVENT_TABLE()
 };
 
+#endif // USE_MODAL_PRESENTATION
+
 // Define a new frame type
 class MyFrame: public wxFrame
 {
 public:
-    MyFrame(wxWindow *parent, const wxString& title,
-            const wxPoint& pos, const wxSize& size);
+    MyFrame(wxWindow *parent, const wxString& title);
 
+    void MessageBox(wxCommandEvent& event);
+
+#if wxUSE_COLOURDLG
     void ChooseColour(wxCommandEvent& event);
+#endif // wxUSE_COLOURDLG
+
+#if wxUSE_FONTDLG
     void ChooseFont(wxCommandEvent& event);
+#endif // wxUSE_FONTDLG
+
+#if wxUSE_LOG_DIALOG
     void LogDialog(wxCommandEvent& event);
-    void MessageBox(wxCommandEvent& event);
+#endif // wxUSE_LOG_DIALOG
+
+#if wxUSE_CHOICEDLG
     void SingleChoice(wxCommandEvent& event);
     void MultiChoice(wxCommandEvent& event);
+#endif // wxUSE_CHOICEDLG
+
+#if wxUSE_TEXTDLG
     void TextEntry(wxCommandEvent& event);
     void PasswordEntry(wxCommandEvent& event);
+#endif // wxUSE_TEXTDLG
+
+#if wxUSE_NUMBERDLG
     void NumericEntry(wxCommandEvent& event);
+#endif // wxUSE_NUMBERDLG
+
+#if wxUSE_FILEDLG
     void FileOpen(wxCommandEvent& event);
     void FileOpen2(wxCommandEvent& event);
     void FilesOpen(wxCommandEvent& event);
     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);
+#endif // wxUSE_DIRDLG
+
+#if USE_DIRDLG_GENERIC
     void GenericDirChoose(wxCommandEvent& event);
+#endif // USE_DIRDLG_GENERIC
+
+#if wxUSE_STARTUP_TIPS
     void ShowTip(wxCommandEvent& event);
+#endif // wxUSE_STARTUP_TIPS
+
+#if USE_MODAL_PRESENTATION
     void ModalDlg(wxCommandEvent& event);
     void ModelessDlg(wxCommandEvent& event);
+#endif // USE_MODAL_PRESENTATION
+
 #if wxUSE_PROGRESSDLG
     void ShowProgress(wxCommandEvent& event);
 #endif // wxUSE_PROGRESSDLG
+
 #if wxUSE_BUSYINFO
     void ShowBusyInfo(wxCommandEvent& event);
 #endif // wxUSE_BUSYINFO
+
 #if wxUSE_FINDREPLDLG
     void ShowFindDialog(wxCommandEvent& event);
     void ShowReplaceDialog(wxCommandEvent& event);
-
     void OnFindDialog(wxFindDialogEvent& event);
 #endif // wxUSE_FINDREPLDLG
 
-#if !defined(__WXMSW__) || wxTEST_GENERIC_DIALOGS_IN_MSW
+#if USE_COLOURDLG_GENERIC
     void ChooseColourGeneric(wxCommandEvent& event);
+#endif // USE_COLOURDLG_GENERIC
+
+#if USE_FONTDLG_GENERIC
     void ChooseFontGeneric(wxCommandEvent& event);
-#endif
+#endif // USE_FONTDLG_GENERIC
 
     void OnExit(wxCommandEvent& event);
 
 private:
+#if wxUSE_DIRDLG
+    void DoDirChoose(int style);
+#endif // wxUSE_DIRDLG
+
+#if USE_MODAL_PRESENTATION
     MyModelessDialog *m_dialog;
+#endif // USE_MODAL_PRESENTATION
 
 #if wxUSE_FINDREPLDLG
     wxFindReplaceData m_findData;
@@ -105,6 +215,8 @@ private:
                         *m_dlgReplace;
 #endif // wxUSE_FINDREPLDLG
 
+    wxColourData m_clrData;
+
     DECLARE_EVENT_TABLE()
 };
 
@@ -112,7 +224,7 @@ class MyCanvas: public wxScrolledWindow
 {
 public:
     MyCanvas(wxWindow *parent) : 
-       wxScrolledWindow(parent,-1,wxDefaultPosition,wxDefaultSize,wxNO_FULL_REPAINT_ON_RESIZE) { }
+       wxScrolledWindow(parent,wxID_ANY,wxDefaultPosition,wxDefaultSize,wxNO_FULL_REPAINT_ON_RESIZE) { }
 
     void OnPaint(wxPaintEvent& event);
 
@@ -123,7 +235,7 @@ public:
 // Menu IDs
 enum
 {
-    DIALOGS_CHOOSE_COLOUR = 1,
+    DIALOGS_CHOOSE_COLOUR = wxID_HIGHEST,
     DIALOGS_CHOOSE_COLOUR_GENERIC,
     DIALOGS_CHOOSE_FONT,
     DIALOGS_CHOOSE_FONT_GENERIC,
@@ -136,7 +248,11 @@ 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,
     DIALOGS_TIP,
     DIALOGS_NUM_ENTRY,