X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a8f6ef519066976e75833343952f7b6dd70dafa0..7948c0c24401c496c04da3c28f1f1f2f282ba327:/src/generic/textdlgg.cpp

diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index 5eadd8e018..4397306f2e 100644
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -92,6 +92,12 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
                                 style & ~wxTextEntryDialogStyle);
     topsizer->Add( m_textctrl, 1, wxEXPAND | wxLEFT|wxRIGHT, 15 );
 
+#if wxUSE_VALIDATORS
+    wxTextValidator validator( wxFILTER_NONE, &m_value );
+    m_textctrl->SetValidator( validator );
+#endif
+  // wxUSE_VALIDATORS
+
 #if wxUSE_STATLINE
     // 3) static line
     topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
@@ -115,9 +121,17 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
 
 void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) )
 {
+#if wxUSE_VALIDATORS
+    if( Validate() && TransferDataFromWindow() ) 
+    {
+        EndModal( wxID_OK );
+    }
+#else
     m_value = m_textctrl->GetValue();
 
     EndModal(wxID_OK);
+#endif
+  // wxUSE_VALIDATORS
 }
 
 void wxTextEntryDialog::SetValue(const wxString& val)
@@ -127,4 +141,19 @@ void wxTextEntryDialog::SetValue(const wxString& val)
     m_textctrl->SetValue(val);
 }
 
+#if wxUSE_VALIDATORS
+void wxTextEntryDialog::SetTextValidator( long style )
+{
+    wxTextValidator validator( style, &m_value );
+    m_textctrl->SetValidator( validator );
+}
+
+void wxTextEntryDialog::SetTextValidator( wxTextValidator& validator )
+{
+    m_textctrl->SetValidator( validator );
+}
+
+#endif
+  // wxUSE_VALIDATORS
+
 #endif // wxUSE_TEXTDLG