X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fcd209b6a20b41e7ddf9acf837311ac6779ea41f..3c01c5951189e13b8b4a5d7b288b54d4a57a30f8:/samples/validate/validate.cpp

diff --git a/samples/validate/validate.cpp b/samples/validate/validate.cpp
index 5fbf3eed77..f6ff23cb41 100644
--- a/samples/validate/validate.cpp
+++ b/samples/validate/validate.cpp
@@ -248,26 +248,30 @@ MyDialog::MyDialog( wxWindow *parent, const wxString& title,
     m_text = new wxTextCtrl(this, VALIDATE_TEXT, wxEmptyString,
                             wxDefaultPosition, wxDefaultSize, 0,
                             wxTextValidator(wxFILTER_ALPHA, &g_data.m_string));
+    m_text->SetToolTip("uses wxTextValidator with wxFILTER_ALPHA");
     flexgridsizer->Add(m_text, 1, wxGROW);
 
 
     // Now set a wxTextValidator with an explicit list of characters NOT allowed:
-    wxTextValidator textVal(wxFILTER_EXCLUDE_CHAR_LIST, &g_data.m_string2);
+    wxTextValidator textVal(wxFILTER_EMPTY|wxFILTER_EXCLUDE_LIST, &g_data.m_string2);
     textVal.SetCharExcludes("bcwyz");
-    flexgridsizer->Add(new wxTextCtrl(this, VALIDATE_TEXT2, wxEmptyString,
-                        wxDefaultPosition, wxDefaultSize, 0, textVal),
-                       1, wxGROW);
+    wxTextCtrl* txt2 =
+             new wxTextCtrl(this, VALIDATE_TEXT2, wxEmptyString,
+                            wxDefaultPosition, wxDefaultSize, 0, textVal);
+    txt2->SetToolTip("uses wxTextValidator with wxFILTER_EMPTY|wxFILTER_EXCLUDE_LIST (to exclude 'bcwyz')");
+    flexgridsizer->Add(txt2, 1, wxGROW);
 
     flexgridsizer->Add(new wxListBox((wxWindow*)this, VALIDATE_LIST,
-                        wxPoint(10, 30), wxSize(120, wxDefaultCoord),
+                        wxDefaultPosition, wxDefaultSize,
                         3, g_listbox_choices, wxLB_MULTIPLE,
                         wxGenericValidator(&g_data.m_listbox_choices)),
                        1, wxGROW);
 
     m_combobox = new wxComboBox(this, VALIDATE_COMBO, wxEmptyString,
-                                wxPoint(130, 30), wxSize(120, wxDefaultCoord),
+                                wxDefaultPosition, wxDefaultSize,
                                 3, g_combobox_choices, 0L,
                                 MyComboBoxValidator(&g_data.m_combobox_choice));
+    m_combobox->SetToolTip("uses a custom validator (MyComboBoxValidator)");
     flexgridsizer->Add(m_combobox, 1, wxALIGN_CENTER);
 
     // This wxCheckBox* doesn't need to be assigned to any pointer
@@ -275,9 +279,9 @@ MyDialog::MyDialog( wxWindow *parent, const wxString& title,
     // We don't need any such pointer to query its state, which
     // can be gotten directly from g_data.
     flexgridsizer->Add(new wxCheckBox(this, VALIDATE_CHECK, wxT("Sample checkbox"),
-                        wxPoint(130, 10), wxSize(120, wxDefaultCoord), 0,
+                        wxDefaultPosition, wxDefaultSize, 0,
                         wxGenericValidator(&g_data.m_checkbox_state)),
-                       1, wxALIGN_CENTER);
+                       1, wxALIGN_CENTER|wxALL, 15);
 
     flexgridsizer->AddGrowableCol(0);
     flexgridsizer->AddGrowableCol(1);
@@ -301,7 +305,7 @@ MyDialog::MyDialog( wxWindow *parent, const wxString& title,
     mainsizer->Add(flexgridsizer, 1, wxGROW | wxALL, 10);
 
     mainsizer->Add(new wxRadioBox((wxWindow*)this, VALIDATE_RADIO, wxT("Pick a color"),
-                                    wxPoint(10, 100), wxDefaultSize,
+                                    wxDefaultPosition, wxDefaultSize,
                                     3, g_radiobox_choices, 1, wxRA_SPECIFY_ROWS,
                                     wxGenericValidator(&g_data.m_radiobox_choice)),
                    0, wxGROW | wxLEFT|wxBOTTOM|wxRIGHT, 10);