Add test for absence of events from wxSpinCtrlDouble ctor.

[wxWidgets.git] / src / generic / textdlgg.cpp

diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index c2990265e3b83b8aca7fc1117abd9d98e6eece26..f3d697fafccf087b3a2d29c32b74ed39932e9768 100644 (file)
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -75,7 +74,7 @@ bool wxTextEntryDialog::Create(wxWindow *parent,
     if ( !wxDialog::Create(GetParentForModalDialog(parent, style),
                            wxID_ANY, caption,
                            pos, wxDefaultSize,
     if ( !wxDialog::Create(GetParentForModalDialog(parent, style),
                            wxID_ANY, caption,
                            pos, wxDefaultSize,

-                           wxDEFAULT_DIALOG_STYLE) )
+                           wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) )

     {
         return false;
     }
     {
         return false;
     }


@@ -105,11 +104,6 @@ bool wxTextEntryDialog::Create(wxWindow *parent,
                     Expand().
                     TripleBorder(wxLEFT | wxRIGHT));
 
                     Expand().
                     TripleBorder(wxLEFT | wxRIGHT));
 

-#if wxUSE_VALIDATORS
-    wxTextValidator validator( wxFILTER_NONE, &m_value );
-    m_textctrl->SetValidator( validator );
-#endif // wxUSE_VALIDATORS
-

     // 3) buttons if any
     wxSizer *buttonSizer = CreateSeparatedButtonSizer(style & (wxOK | wxCANCEL));
     if ( buttonSizer )
     // 3) buttons if any
     wxSizer *buttonSizer = CreateSeparatedButtonSizer(style & (wxOK | wxCANCEL));
     if ( buttonSizer )


@@ -134,19 +128,31 @@ bool wxTextEntryDialog::Create(wxWindow *parent,
     return true;
 }
 
     return true;
 }
 

+bool wxTextEntryDialog::TransferDataToWindow()
+{
+    m_textctrl->SetValue(m_value);
+
+    return wxDialog::TransferDataToWindow();
+}
+
+bool wxTextEntryDialog::TransferDataFromWindow()
+{
+    m_value = m_textctrl->GetValue();
+
+    return wxDialog::TransferDataFromWindow();
+}
+

 void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) )
 {
 void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) )
 {

-#if wxUSE_VALIDATORS
-    if( Validate() && TransferDataFromWindow() )
+    if ( Validate() && TransferDataFromWindow() )

     {
         EndModal( wxID_OK );
     }
     {
         EndModal( wxID_OK );
     }

-#else
-    m_value = m_textctrl->GetValue();
+}

 
 

-    EndModal(wxID_OK);
-#endif
-  // wxUSE_VALIDATORS
+void wxTextEntryDialog::SetMaxLength(unsigned long len)
+{
+    m_textctrl->SetMaxLength(len);

 }
 
 void wxTextEntryDialog::SetValue(const wxString& val)
 }
 
 void wxTextEntryDialog::SetValue(const wxString& val)


@@ -167,8 +173,7 @@ void wxTextEntryDialog::SetTextValidator( long style )
 
 void wxTextEntryDialog::SetTextValidator( wxTextValidatorStyle style )
 {
 
 void wxTextEntryDialog::SetTextValidator( wxTextValidatorStyle style )
 {

-    wxTextValidator validator( style, &m_value );
-    m_textctrl->SetValidator( validator );
+    SetTextValidator(wxTextValidator(style));

 }
 
 void wxTextEntryDialog::SetTextValidator( const wxTextValidator& validator )
 }
 
 void wxTextEntryDialog::SetTextValidator( const wxTextValidator& validator )


@@ -176,8 +181,7 @@ void wxTextEntryDialog::SetTextValidator( const wxTextValidator& validator )
     m_textctrl->SetValidator( validator );
 }
 
     m_textctrl->SetValidator( validator );
 }
 

-#endif
-  // wxUSE_VALIDATORS
+#endif // wxUSE_VALIDATORS

 
 // ----------------------------------------------------------------------------
 // wxPasswordEntryDialog
 
 // ----------------------------------------------------------------------------
 // wxPasswordEntryDialog