minor clean up

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

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index d0e114f6b9b1893210bbaa652ce719447b6970ff..ccd0c2018331e09eca06bb653afefcbc4f69b96b 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -22,18 +22,34 @@ public:
     wxColour     m_canvasTextColour;
 };
 
     wxColour     m_canvasTextColour;
 };
 

-// A modeless dialog
+// A custom modeless dialog

 class MyModelessDialog : public wxDialog
 {
 public:
     MyModelessDialog(wxWindow *parent);
 
 class MyModelessDialog : public wxDialog
 {
 public:
     MyModelessDialog(wxWindow *parent);
 

+    void OnButton(wxCommandEvent& event);

     void OnClose(wxCloseEvent& event);
 
 private:
     DECLARE_EVENT_TABLE()
 };
 
     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
 class MyFrame: public wxFrame
 {
 // Define a new frame type
 class MyFrame: public wxFrame
 {


@@ -46,16 +62,28 @@ 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 FileOpen(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 FilesOpen(wxCommandEvent& event);
     void FileSave(wxCommandEvent& event);
     void DirChoose(wxCommandEvent& event);

+    void GenericDirChoose(wxCommandEvent& event);

     void ShowTip(wxCommandEvent& event);
     void ShowTip(wxCommandEvent& event);

+    void ModalDlg(wxCommandEvent& event);

     void ModelessDlg(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);


@@ -64,11 +92,13 @@ public:
 
     void OnExit(wxCommandEvent& event);
 
 
     void OnExit(wxCommandEvent& event);
 

-    void OnButton(wxCommandEvent& event);
-

 private:
     MyModelessDialog *m_dialog;
 
 private:
     MyModelessDialog *m_dialog;
 

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

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -92,18 +122,24 @@ 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,

+    DIALOGS_FILE_OPEN2,

     DIALOGS_FILES_OPEN,
     DIALOGS_FILE_SAVE,
     DIALOGS_DIR_CHOOSE,
     DIALOGS_FILES_OPEN,
     DIALOGS_FILE_SAVE,
     DIALOGS_DIR_CHOOSE,

+    DIALOGS_GENERIC_DIR_CHOOSE,

     DIALOGS_TIP,
     DIALOGS_NUM_ENTRY,
     DIALOGS_LOG_DIALOG,
     DIALOGS_TIP,
     DIALOGS_NUM_ENTRY,
     DIALOGS_LOG_DIALOG,

+    DIALOGS_MODAL,

     DIALOGS_MODELESS,
     DIALOGS_MODELESS_BTN,
     DIALOGS_MODELESS,
     DIALOGS_MODELESS_BTN,

-    DIALOGS_PROGRESS
+    DIALOGS_PROGRESS,
+    DIALOGS_FIND,
+    DIALOGS_REPLACE

 };
 
 #endif
 };
 
 #endif