X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/329e86bfdedacf2736fa77eea1ae171c3c732355..751731864888f00e31e6dce1092ac28a1fac5358:/samples/dialogs/dialogs.h

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 3143996187..91bef905f1 100644
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -2,76 +2,242 @@
 // 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
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __DIALOGSH__
 #define __DIALOGSH__
 
+#define USE_COLOURDLG_GENERIC                                                     \
+    (                                                                             \
+        wxUSE_COLOURDLG &&                                                        \
+        ( defined(__WXMSW__) || defined(__WXMAC__) ) &&                           \
+        !defined(__WXUNIVERSAL__)                                                 \
+    )
+
+
+#define USE_DIRDLG_GENERIC                                                        \
+    (                                                                             \
+        wxUSE_DIRDLG &&                                                           \
+        ( defined(__WXMSW__) || defined(__WXMAC__) ) &&                           \
+        !defined(__WXUNIVERSAL__)                                                 \
+    )
+
+#define USE_FILEDLG_GENERIC                                                       \
+    (                                                                             \
+        wxUSE_FILEDLG &&                                                          \
+        ( defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXPM__) ) &&      \
+        !defined(__WXUNIVERSAL__)                                                 \
+    )
+
+#define USE_FONTDLG_GENERIC                                                       \
+    (                                                                             \
+        wxUSE_FONTDLG &&                                                          \
+        ( defined(__WXMSW__) || defined(__WXPM__) ) &&                            \
+        !defined(__WXUNIVERSAL__)                                                 \
+    )
+
+
+#define USE_MODAL_PRESENTATION   1
+
 // Define a new application type
 class MyApp: public wxApp
-{ public:
-    bool OnInit(void);
+{
+public:
+    bool OnInit();
 
     wxFont       m_canvasFont;
     wxColour     m_canvasTextColour;
 };
 
+// A custom modeless dialog
+class MyModelessDialog : public wxDialog
+{
+public:
+    MyModelessDialog(wxWindow *parent);
+
+    void OnButton(wxCommandEvent& event);
+    void OnClose(wxCloseEvent& event);
+
+private:
+    DECLARE_EVENT_TABLE()
+};
+
+// A custom modal dialog
+class MyModalDialog : public wxDialog
+{
+public:
+    MyModalDialog(wxWindow *parent);
+
+    void OnButton(wxCommandEvent& event);
+
+private:
+    wxButton *m_btnModal,
+             *m_btnModeless,
+             *m_btnDelete;
+
+    DECLARE_EVENT_TABLE()
+};
+
 // Define a new frame type
 class MyFrame: public wxFrame
-{ public:
-    MyFrame(wxWindow *parent, const wxString& title, const wxPoint& pos,
-		const wxSize& size);
+{
+public:
+    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);
-    void MessageBox(wxCommandEvent& event);
+#endif // wxUSE_FONTDLG
+
+#if wxUSE_LOG_DIALOG
+    void LogDialog(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);
-    void ExtDialog(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 !defined(__WXMSW__) || wxTEST_GENERIC_DIALOGS_IN_MSW
+#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 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);
-	
-  DECLARE_EVENT_TABLE()
+
+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;
+
+    wxFindReplaceDialog *m_dlgFind,
+                        *m_dlgReplace;
+#endif // wxUSE_FINDREPLDLG
+
+    wxColourData m_clrData;
+
+    DECLARE_EVENT_TABLE()
 };
 
 class MyCanvas: public wxScrolledWindow
 {
- public:
-  MyCanvas(wxWindow *parent):
-      wxScrolledWindow(parent)
-    {
-    }
-  void OnPaint(wxPaintEvent& event);
-DECLARE_EVENT_TABLE()
+public:
+    MyCanvas(wxWindow *parent) : 
+       wxScrolledWindow(parent,wxID_ANY,wxDefaultPosition,wxDefaultSize,wxNO_FULL_REPAINT_ON_RESIZE) { }
+
+    void OnPaint(wxPaintEvent& event);
+
+    DECLARE_EVENT_TABLE()
 };
 
 
 // Menu IDs
-#define DIALOGS_CHOOSE_COLOUR               1
-#define DIALOGS_CHOOSE_COLOUR_GENERIC       2
-#define DIALOGS_CHOOSE_FONT                 3
-#define DIALOGS_CHOOSE_FONT_GENERIC         4
-#define DIALOGS_MESSAGE_BOX                 5
-#define DIALOGS_SINGLE_CHOICE               6
-#define DIALOGS_TEXT_ENTRY                  7
-#define DIALOGS_FILE_OPEN                   8
-#define DIALOGS_FILE_SAVE                   9
-#define DIALOGS_DIR_CHOOSE                  10
-#define DIALOGS_TIP                         11
-#define DIALOGS_EXT_DIALOG                  12
+enum
+{
+    DIALOGS_CHOOSE_COLOUR = wxID_HIGHEST,
+    DIALOGS_CHOOSE_COLOUR_GENERIC,
+    DIALOGS_CHOOSE_FONT,
+    DIALOGS_CHOOSE_FONT_GENERIC,
+    DIALOGS_MESSAGE_BOX,
+    DIALOGS_SINGLE_CHOICE,
+    DIALOGS_MULTI_CHOICE,
+    DIALOGS_TEXT_ENTRY,
+    DIALOGS_PASSWORD_ENTRY,
+    DIALOGS_FILE_OPEN,
+    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,
+    DIALOGS_LOG_DIALOG,
+    DIALOGS_MODAL,
+    DIALOGS_MODELESS,
+    DIALOGS_MODELESS_BTN,
+    DIALOGS_PROGRESS,
+    DIALOGS_BUSYINFO,
+    DIALOGS_FIND,
+    DIALOGS_REPLACE
+};
 
 #endif