fixed the last of the off-by-one errors (some are refixed, again...)

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

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 56493424e8094145ef48121294c36dbcf2888988..ccf3da8b7d0eee27cf5a95c4f13ff3782b0e226f 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -61,6 +61,7 @@ public:
     void LogDialog(wxCommandEvent& event);
     void MessageBox(wxCommandEvent& event);
     void SingleChoice(wxCommandEvent& event);
     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 TextEntry(wxCommandEvent& event);
     void PasswordEntry(wxCommandEvent& event);
     void NumericEntry(wxCommandEvent& event);


@@ -73,7 +74,15 @@ public:
     void ShowTip(wxCommandEvent& event);
     void ModalDlg(wxCommandEvent& event);
     void ModelessDlg(wxCommandEvent& event);
     void ShowTip(wxCommandEvent& event);
     void ModalDlg(wxCommandEvent& event);
     void ModelessDlg(wxCommandEvent& event);

+#if wxUSE_PROGRESSDLG

     void ShowProgress(wxCommandEvent& event);
     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);
 
 #if !defined(__WXMSW__) || wxTEST_GENERIC_DIALOGS_IN_MSW
     void ChooseColourGeneric(wxCommandEvent& event);


@@ -87,6 +96,10 @@ public:
 private:
     MyModelessDialog *m_dialog;
 
 private:
     MyModelessDialog *m_dialog;
 

+#if wxUSE_FINDREPLDLG
+    wxFindReplaceData m_findData;
+#endif // wxUSE_FINDREPLDLG
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -110,6 +123,7 @@ enum
     DIALOGS_CHOOSE_FONT_GENERIC,
     DIALOGS_MESSAGE_BOX,
     DIALOGS_SINGLE_CHOICE,
     DIALOGS_CHOOSE_FONT_GENERIC,
     DIALOGS_MESSAGE_BOX,
     DIALOGS_SINGLE_CHOICE,

+    DIALOGS_MULTI_CHOICE,

     DIALOGS_TEXT_ENTRY,
     DIALOGS_PASSWORD_ENTRY,
     DIALOGS_FILE_OPEN,
     DIALOGS_TEXT_ENTRY,
     DIALOGS_PASSWORD_ENTRY,
     DIALOGS_FILE_OPEN,


@@ -124,7 +138,9 @@ enum
     DIALOGS_MODAL,
     DIALOGS_MODELESS,
     DIALOGS_MODELESS_BTN,
     DIALOGS_MODAL,
     DIALOGS_MODELESS,
     DIALOGS_MODELESS_BTN,

-    DIALOGS_PROGRESS
+    DIALOGS_PROGRESS,
+    DIALOGS_FIND,
+    DIALOGS_REPLACE

 };
 
 #endif
 };
 
 #endif