X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/afbd36dd57909dc8e38b5d314f8b29498c8cf604..60df0f96859fb0131ddfa8b477612a15f4a43790:/samples/dialogs/dialogs.cpp

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 406643cf1d..9e8b340bfa 100644
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -38,13 +38,14 @@
 #define wxTEST_GENERIC_DIALOGS_IN_MSW 0
 
 #if defined(__WXMSW__) && wxTEST_GENERIC_DIALOGS_IN_MSW
-#include <wx/generic/colrdlgg.h>
-#include <wx/generic/fontdlgg.h>
+#include "wx/generic/colrdlgg.h"
+#include "wx/generic/fontdlgg.h"
 #endif
 
+#define wxUSE_DIRDLGG 0
+
 #if !defined(__WXMSW__) || defined(wxUSE_DIRDLGG) && wxUSE_DIRDLGG
-// New wxGenericDirCtrl
-#include "wx/dirctrl.h"
+#include "wx/generic/dirdlgg.h"
 #endif
 
 #include "dialogs.h"
@@ -376,10 +377,12 @@ void MyFrame::TextEntry(wxCommandEvent& WXUNUSED(event))
 void MyFrame::SingleChoice(wxCommandEvent& WXUNUSED(event) )
 {
     const wxString choices[] = { "One", "Two", "Three", "Four", "Five" } ;
-    int n = 5;
 
-    wxSingleChoiceDialog dialog(this, "This is a small sample\nA single-choice convenience dialog",
-        "Please select a value", n, (const wxString *)choices);
+    wxSingleChoiceDialog dialog(this,
+                                "This is a small sample\n"
+                                "A single-choice convenience dialog",
+                                "Please select a value",
+                                WXSIZEOF(choices), choices);
 
     dialog.SetSelection(2);
 
@@ -392,15 +395,19 @@ void MyFrame::SingleChoice(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::MultiChoice(wxCommandEvent& WXUNUSED(event) )
 {
-    const wxString choices[] = { "One", "Two", "Three", "Four", "Five" } ;
-    int n = 5;
+    const wxString choices[] =
+    {
+        "One", "Two", "Three", "Four", "Five",
+        "Six", "Seven", "Eight", "Nine", "Ten",
+        "Eleven", "Twelve", "Seventeen",
+    };
 
     wxArrayInt selections;
     size_t count = wxGetMultipleChoices(selections,
                                         "This is a small sample\n"
                                         "A multi-choice convenience dialog",
                                         "Please select a value",
-                                        n, (const wxString *)choices,
+                                        WXSIZEOF(choices), choices,
                                         this);
     if ( count )
     {
@@ -418,9 +425,14 @@ void MyFrame::MultiChoice(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::FileOpen(wxCommandEvent& WXUNUSED(event) )
 {
-    wxFileDialog dialog(this, "Testing open file dialog",
-                        "", "",
-                        "C++ files (*.h;*.cpp)|*.h;*.cpp");
+    wxFileDialog dialog
+                 (
+                    this,
+                    _T("Testing open file dialog"),
+                    _T(""),
+                    _T(""),
+                    _T("C++ files (*.h;*.cpp)|*.h;*.cpp")
+                 );
 
     if (dialog.ShowModal() == wxID_OK)
     {
@@ -447,7 +459,7 @@ void MyFrame::FileOpen2(wxCommandEvent& WXUNUSED(event) )
                                     _T(""), _T(""),
                                     s_extDef,
                                     _T("Waveform (*.wav)|*.wav|Plain text (*.txt)|*.txt|All files (*.*)|*.*"),
-                                    0,
+                                    wxCHANGE_DIR,
                                     this
                                    );