Added possibility of 2-step initialisation, and wxWIZARD_EX_HELPBUTTON style.

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

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 08d8abd3c74e700e21e7dad89fe34fb0cc9d8220..84ea95b342fb3742aef2bd930d7cd151dc24079d 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -399,6 +399,8 @@ void MyFrame::MultiChoice(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::FileOpen(wxCommandEvent& WXUNUSED(event) )
 {
 
 void MyFrame::FileOpen(wxCommandEvent& WXUNUSED(event) )
 {

+//    wxFAIL_MSG( "Test assert" );
+

     wxFileDialog dialog(this, "Testing open file dialog", "", "", "*.txt", 0);
 
     if (dialog.ShowModal() == wxID_OK)
     wxFileDialog dialog(this, "Testing open file dialog", "", "", "*.txt", 0);
 
     if (dialog.ShowModal() == wxID_OK)


@@ -420,6 +422,9 @@ void MyFrame::FileOpen(wxCommandEvent& WXUNUSED(event) )
 // one will use it by default
 void MyFrame::FileOpen2(wxCommandEvent& WXUNUSED(event) )
 {
 // one will use it by default
 void MyFrame::FileOpen2(wxCommandEvent& WXUNUSED(event) )
 {

+    wxOnAssert( "Test assert.txt", 20, "Test" );
+    return;
+

     static wxString s_extDef;
     wxString path = wxFileSelector(
                                     _T("Select the file to load"),
     static wxString s_extDef;
     wxString path = wxFileSelector(
                                     _T("Select the file to load"),