Factor the brush selection out of OnPaint so it can be overridden in

[wxWidgets.git] / src / univ / textctrl.cpp

diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp
index 17ed256745af3b68c26d4d8c5664439a096d0d4d..a799b0954bd1eec4347e8b483fef28fcb310e0ba 100644 (file)
--- a/src/univ/textctrl.cpp
+++ b/src/univ/textctrl.cpp
@@ -778,7 +778,7 @@ wxTextCtrl::~wxTextCtrl()
 // set/get the value
 // ----------------------------------------------------------------------------
 
-void wxTextCtrl::ChangeValue(const wxString& value)
+void wxTextCtrl::DoSetValue(const wxString& value, int flags)
 {
     if ( IsSingleLine() && (value == GetValue()) )
     {
@@ -792,12 +792,9 @@ void wxTextCtrl::ChangeValue(const wxString& value)
     {
         SetInsertionPoint(0);
     }
-}
 
-void wxTextCtrl::SetValue(const wxString& value)
-{
-    ChangeValue(value);
-    SendTextUpdatedEvent();
+    if ( flags & SetValue_SendEvent )
+        SendTextUpdatedEvent();
 }
 
 const wxArrayString& wxTextCtrl::GetLines() const
@@ -4286,9 +4283,6 @@ void wxTextCtrl::CreateCaret()
     {
         // FIXME use renderer
         caret = new wxCaret(this, 1, GetLineHeight());
-#ifndef __WXMSW__
-        wxCaret::SetBlinkTime(0);
-#endif // __WXMSW__
     }
     else
     {