X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..cfeff6f71c716a19a9651b176dce26534c4da216:/src/generic/textdlgg.cpp

diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index 9b6a5b965e..6e0ab1e48d 100644
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "textdlgg.h"
 #endif
 
@@ -31,8 +31,6 @@
 #if wxUSE_TEXTDLG
 
 #ifndef WX_PRECOMP
-    #include <stdio.h>
-
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/button.h"
@@ -94,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 );
@@ -110,6 +114,7 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
 
     Centre( wxBOTH );
 
+    m_textctrl->SetSelection(-1, -1);
     m_textctrl->SetFocus();
 
     wxEndBusyCursor();
@@ -117,9 +122,39 @@ 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)
+{
+    m_value = 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