minor clean up

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

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index b0f79f011630f651bf12f5e4e69fede5524d1b8c..ccd0c2018331e09eca06bb653afefcbc4f69b96b 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -22,6 +22,34 @@ public:
     wxColour     m_canvasTextColour;
 };
 
     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_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
 {


@@ -31,15 +59,31 @@ public:
 
     void ChooseColour(wxCommandEvent& event);
     void ChooseFont(wxCommandEvent& event);
 
     void ChooseColour(wxCommandEvent& event);
     void ChooseFont(wxCommandEvent& event);

+    void LogDialog(wxCommandEvent& event);

     void MessageBox(wxCommandEvent& event);
     void SingleChoice(wxCommandEvent& event);
     void MessageBox(wxCommandEvent& event);
     void SingleChoice(wxCommandEvent& event);

+    void MultiChoice(wxCommandEvent& event);

     void TextEntry(wxCommandEvent& event);
     void TextEntry(wxCommandEvent& event);

+    void PasswordEntry(wxCommandEvent& event);

     void NumericEntry(wxCommandEvent& event);
     void FileOpen(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 FileSave(wxCommandEvent& event);
     void DirChoose(wxCommandEvent& event);

+    void GenericDirChoose(wxCommandEvent& event);

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

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


@@ -48,7 +92,14 @@ public:
 
     void OnExit(wxCommandEvent& event);
 
 
     void OnExit(wxCommandEvent& event);
 

-  DECLARE_EVENT_TABLE()
+private:
+    MyModelessDialog *m_dialog;
+
+#if wxUSE_FINDREPLDLG
+    wxFindReplaceData m_findData;
+#endif // wxUSE_FINDREPLDLG
+
+    DECLARE_EVENT_TABLE()

 };
 
 class MyCanvas: public wxScrolledWindow
 };
 
 class MyCanvas: public wxScrolledWindow


@@ -63,19 +114,33 @@ public:
 
 
 // Menu IDs
 
 
 // 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
-#define DIALOGS_NUM_ENTRY                   13
+enum
+{
+    DIALOGS_CHOOSE_COLOUR = 1,
+    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_DIR_CHOOSE,
+    DIALOGS_GENERIC_DIR_CHOOSE,
+    DIALOGS_TIP,
+    DIALOGS_NUM_ENTRY,
+    DIALOGS_LOG_DIALOG,
+    DIALOGS_MODAL,
+    DIALOGS_MODELESS,
+    DIALOGS_MODELESS_BTN,
+    DIALOGS_PROGRESS,
+    DIALOGS_FIND,
+    DIALOGS_REPLACE
+};

 
 #endif
 
 
 #endif