X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4c45f240f689efee80acca96aefb76bfe500d703..5270a2f939501d8bb83451ddc15408ee929346e2:/samples/dialogs/dialogs.h?ds=sidebyside

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 96bdfbeeba..3193e26f2f 100644
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -22,11 +22,32 @@ public:
     wxColour     m_canvasTextColour;
 };
 
-// A modeless dialog
+// 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_btnFocused;
+    wxButton *m_btnDelete;
+
+    DECLARE_EVENT_TABLE()
 };
 
 // Define a new frame type
@@ -41,15 +62,31 @@ public:
     void LogDialog(wxCommandEvent& event);
     void MessageBox(wxCommandEvent& event);
     void SingleChoice(wxCommandEvent& event);
+    void MultiChoice(wxCommandEvent& event);
     void TextEntry(wxCommandEvent& event);
     void PasswordEntry(wxCommandEvent& event);
     void NumericEntry(wxCommandEvent& event);
     void FileOpen(wxCommandEvent& event);
+    void FileOpen2(wxCommandEvent& event);
     void FilesOpen(wxCommandEvent& event);
     void FileSave(wxCommandEvent& event);
     void DirChoose(wxCommandEvent& event);
+    void GenericDirChoose(wxCommandEvent& event);
     void ShowTip(wxCommandEvent& event);
+    void ModalDlg(wxCommandEvent& event);
     void ModelessDlg(wxCommandEvent& event);
+#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
     void ChooseColourGeneric(wxCommandEvent& event);
@@ -58,11 +95,16 @@ public:
 
     void OnExit(wxCommandEvent& event);
 
-    void OnButton(wxCommandEvent& event);
-
 private:
     MyModelessDialog *m_dialog;
 
+#if wxUSE_FINDREPLDLG
+    wxFindReplaceData m_findData;
+
+    wxFindReplaceDialog *m_dlgFind,
+                        *m_dlgReplace;
+#endif // wxUSE_FINDREPLDLG
+
     DECLARE_EVENT_TABLE()
 };
 
@@ -86,17 +128,25 @@ enum
     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_DIR_CHOOSE,
+    DIALOGS_GENERIC_DIR_CHOOSE,
     DIALOGS_TIP,
     DIALOGS_NUM_ENTRY,
     DIALOGS_LOG_DIALOG,
+    DIALOGS_MODAL,
     DIALOGS_MODELESS,
-    DIALOGS_MODELESS_BTN
+    DIALOGS_MODELESS_BTN,
+    DIALOGS_PROGRESS,
+    DIALOGS_BUSYINFO,
+    DIALOGS_FIND,
+    DIALOGS_REPLACE
 };
 
 #endif