1. wxProgressDialog uses wxWindowDisabler, not (dumb) wxEnableTopLevelWindows

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

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index c1173e38df01abd39811823ae15c17e188321eb5..d0e114f6b9b1893210bbaa652ce719447b6970ff 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -22,6 +22,18 @@ public:
     wxColour     m_canvasTextColour;
 };
 
+// A modeless dialog
+class MyModelessDialog : public wxDialog
+{
+public:
+    MyModelessDialog(wxWindow *parent);
+
+    void OnClose(wxCloseEvent& event);
+
+private:
+    DECLARE_EVENT_TABLE()
+};
+
 // Define a new frame type
 class MyFrame: public wxFrame
 {
@@ -35,12 +47,15 @@ public:
     void MessageBox(wxCommandEvent& event);
     void SingleChoice(wxCommandEvent& event);
     void TextEntry(wxCommandEvent& event);
+    void PasswordEntry(wxCommandEvent& event);
     void NumericEntry(wxCommandEvent& event);
     void FileOpen(wxCommandEvent& event);
     void FilesOpen(wxCommandEvent& event);
     void FileSave(wxCommandEvent& event);
     void DirChoose(wxCommandEvent& event);
     void ShowTip(wxCommandEvent& event);
+    void ModelessDlg(wxCommandEvent& event);
+    void ShowProgress(wxCommandEvent& event);
 
 #if !defined(__WXMSW__) || wxTEST_GENERIC_DIALOGS_IN_MSW
     void ChooseColourGeneric(wxCommandEvent& event);
@@ -49,7 +64,12 @@ public:
 
     void OnExit(wxCommandEvent& event);
 
-  DECLARE_EVENT_TABLE()
+    void OnButton(wxCommandEvent& event);
+
+private:
+    MyModelessDialog *m_dialog;
+
+    DECLARE_EVENT_TABLE()
 };
 
 class MyCanvas: public wxScrolledWindow
@@ -64,20 +84,27 @@ public:
 
 
 // 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_FILES_OPEN                  9
-#define DIALOGS_FILE_SAVE                   10
-#define DIALOGS_DIR_CHOOSE                  11
-#define DIALOGS_TIP                         12
-#define DIALOGS_NUM_ENTRY                   13
-#define DIALOGS_LOG_DIALOG                  14
+enum
+{
+    DIALOGS_CHOOSE_COLOUR = 1,
+    DIALOGS_CHOOSE_COLOUR_GENERIC,
+    DIALOGS_CHOOSE_FONT,
+    DIALOGS_CHOOSE_FONT_GENERIC,
+    DIALOGS_MESSAGE_BOX,
+    DIALOGS_SINGLE_CHOICE,
+    DIALOGS_TEXT_ENTRY,
+    DIALOGS_PASSWORD_ENTRY,
+    DIALOGS_FILE_OPEN,
+    DIALOGS_FILES_OPEN,
+    DIALOGS_FILE_SAVE,
+    DIALOGS_DIR_CHOOSE,
+    DIALOGS_TIP,
+    DIALOGS_NUM_ENTRY,
+    DIALOGS_LOG_DIALOG,
+    DIALOGS_MODELESS,
+    DIALOGS_MODELESS_BTN,
+    DIALOGS_PROGRESS
+};
 
 #endif