X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/06f89fe437580928d874c063fb737f3875950de9..f68e16c5fcf53c411742c8338a290addc5fb4b62:/samples/validate/validate.cpp

diff --git a/samples/validate/validate.cpp b/samples/validate/validate.cpp
index f6ff23cb41..dc03e879b7 100644
--- a/samples/validate/validate.cpp
+++ b/samples/validate/validate.cpp
@@ -158,7 +158,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString&title, int x, int y, int w, int
 
     // Create a listbox to display the validated data.
     m_listbox = new wxListBox(this, wxID_ANY);
-    m_listbox->Append(wxString(_T("Try 'File|Test' to see how validators work.")));
+    m_listbox->Append(wxString(wxT("Try 'File|Test' to see how validators work.")));
 
     wxMenu *file_menu = new wxMenu;
 
@@ -173,7 +173,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString&title, int x, int y, int w, int
 
     // All validators share a common (static) flag that controls
     // whether they beep on error. Here we turn it off:
-    wxValidator::SetBellOnError(m_silent);
+    wxValidator::SuppressBellOnError(m_silent);
     file_menu->Check(VALIDATE_TOGGLE_BELL, !wxValidator::IsSilent());
 
 #if wxUSE_STATUSBAR
@@ -202,26 +202,26 @@ void MyFrame::OnTestDialog(wxCommandEvent& WXUNUSED(event))
         // automatically transferred to the variables we specified
         // when we created the validators.
         m_listbox->Clear();
-        m_listbox->Append(wxString(_T("string: ")) + g_data.m_string);
-        m_listbox->Append(wxString(_T("string #2: ")) + g_data.m_string2);
+        m_listbox->Append(wxString(wxT("string: ")) + g_data.m_string);
+        m_listbox->Append(wxString(wxT("string #2: ")) + g_data.m_string2);
 
         for(unsigned int i = 0; i < g_data.m_listbox_choices.GetCount(); ++i)
         {
             int j = g_data.m_listbox_choices[i];
-            m_listbox->Append(wxString(_T("listbox choice(s): ")) + g_listbox_choices[j]);
+            m_listbox->Append(wxString(wxT("listbox choice(s): ")) + g_listbox_choices[j]);
         }
 
-        wxString checkbox_state(g_data.m_checkbox_state ? _T("checked") : _T("unchecked"));
-        m_listbox->Append(wxString(_T("checkbox: ")) + checkbox_state);
-        m_listbox->Append(wxString(_T("combobox: ")) + g_data.m_combobox_choice);
-        m_listbox->Append(wxString(_T("radiobox: ")) + g_radiobox_choices[g_data.m_radiobox_choice]);
+        wxString checkbox_state(g_data.m_checkbox_state ? wxT("checked") : wxT("unchecked"));
+        m_listbox->Append(wxString(wxT("checkbox: ")) + checkbox_state);
+        m_listbox->Append(wxString(wxT("combobox: ")) + g_data.m_combobox_choice);
+        m_listbox->Append(wxString(wxT("radiobox: ")) + g_radiobox_choices[g_data.m_radiobox_choice]);
     }
 }
 
 void MyFrame::OnToggleBell(wxCommandEvent& event)
 {
     m_silent = !m_silent;
-    wxValidator::SetBellOnError(m_silent);
+    wxValidator::SuppressBellOnError(m_silent);
     event.Skip();
 }