minor clean up

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

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index d1bb0fe773c506f57d4ef04ada3fcb677876d2bb..ccd0c2018331e09eca06bb653afefcbc4f69b96b 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -28,6 +28,7 @@ class MyModelessDialog : public wxDialog
 public:
     MyModelessDialog(wxWindow *parent);
 
+    void OnButton(wxCommandEvent& event);
     void OnClose(wxCloseEvent& event);
 
 private:
@@ -61,10 +62,12 @@ 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);
@@ -72,7 +75,15 @@ public:
     void ShowTip(wxCommandEvent& event);
     void ModalDlg(wxCommandEvent& event);
     void ModelessDlg(wxCommandEvent& event);
+#if wxUSE_PROGRESSDLG
     void ShowProgress(wxCommandEvent& event);
+#endif // wxUSE_PROGRESSDLG
+#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);
@@ -81,11 +92,13 @@ public:
 
     void OnExit(wxCommandEvent& event);
 
-    void OnButton(wxCommandEvent& event);
-
 private:
     MyModelessDialog *m_dialog;
 
+#if wxUSE_FINDREPLDLG
+    wxFindReplaceData m_findData;
+#endif // wxUSE_FINDREPLDLG
+
     DECLARE_EVENT_TABLE()
 };
 
@@ -109,9 +122,11 @@ 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,
@@ -122,7 +137,9 @@ enum
     DIALOGS_MODAL,
     DIALOGS_MODELESS,
     DIALOGS_MODELESS_BTN,
-    DIALOGS_PROGRESS
+    DIALOGS_PROGRESS,
+    DIALOGS_FIND,
+    DIALOGS_REPLACE
 };
 
 #endif