Applied better/Win98-proof method of getting edit window

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

diff --git a/samples/validate/validate.cpp b/samples/validate/validate.cpp
index 5fbf3eed77231a9176d418c3a1ab49fbf0cd5321..4840a7d6a3acc1fb55b5059a9339c88946dc9c66 100644 (file)
--- 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);
 
     // 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;
 
 
     wxMenu *file_menu = new wxMenu;
 


@@ -202,19 +202,19 @@ void MyFrame::OnTestDialog(wxCommandEvent& WXUNUSED(event))
         // automatically transferred to the variables we specified
         // when we created the validators.
         m_listbox->Clear();
         // 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];
 
         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]);

     }
 }
 
     }
 }
 


@@ -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 = 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:
     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");
     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,
 
     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,
                         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));
                                 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
     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"),
     // 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)),
                         wxGenericValidator(&g_data.m_checkbox_state)),

-                       1, wxALIGN_CENTER);
+                       1, wxALIGN_CENTER|wxALL, 15);

 
     flexgridsizer->AddGrowableCol(0);
     flexgridsizer->AddGrowableCol(1);
 
     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"),
     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);
                                     3, g_radiobox_choices, 1, wxRA_SPECIFY_ROWS,
                                     wxGenericValidator(&g_data.m_radiobox_choice)),
                    0, wxGROW | wxLEFT|wxBOTTOM|wxRIGHT, 10);