don't crash when invalid colour is set as fg/bg colour

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

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index d0e114f6b9b1893210bbaa652ce719447b6970ff..bcf6e2a08323afca3fa99101fb74beeac97a1b76 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -22,7 +22,7 @@ public:
     wxColour     m_canvasTextColour;
 };
 
-// A modeless dialog
+// A custom modeless dialog
 class MyModelessDialog : public wxDialog
 {
 public:
@@ -34,6 +34,21 @@ 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
 {
@@ -46,14 +61,18 @@ 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);
+    void GenericDirChoose(wxCommandEvent& event);
     void ShowTip(wxCommandEvent& event);
+    void ModalDlg(wxCommandEvent& event);
     void ModelessDlg(wxCommandEvent& event);
     void ShowProgress(wxCommandEvent& event);
 
@@ -92,15 +111,19 @@ 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,
+    DIALOGS_GENERIC_DIR_CHOOSE,
     DIALOGS_TIP,
     DIALOGS_NUM_ENTRY,
     DIALOGS_LOG_DIALOG,
+    DIALOGS_MODAL,
     DIALOGS_MODELESS,
     DIALOGS_MODELESS_BTN,
     DIALOGS_PROGRESS