Fix, or at least make less common, deadlock in the thread sample.

[wxWidgets.git] / src / common / textentrycmn.cpp

diff --git a/src/common/textentrycmn.cpp b/src/common/textentrycmn.cpp
index 54b738a9babb5460fce6cc98e3dd55aacc13b96a..2ca2077467d17cc4bb96343d85e58d465f3496a2 100644 (file)
--- a/src/common/textentrycmn.cpp
+++ b/src/common/textentrycmn.cpp
@@ -224,21 +224,22 @@ void wxTextEntryBase::AppendText(const wxString& text)
 
 void wxTextEntryBase::DoSetValue(const wxString& value, int flags)
 {
 
 void wxTextEntryBase::DoSetValue(const wxString& value, int flags)
 {

-    if ( value != GetValue() )
+    if ( value != DoGetValue() )

     {
         EventsSuppressor noeventsIf(this, !(flags & SetValue_SendEvent));
 
         SelectAll();
         WriteText(value);
     {
         EventsSuppressor noeventsIf(this, !(flags & SetValue_SendEvent));
 
         SelectAll();
         WriteText(value);

+
+        SetInsertionPoint(0);

     }
     else // Same value, no need to do anything.
     {
         // Except that we still need to generate the event for consistency with
         // the normal case when the text does change.
     }
     else // Same value, no need to do anything.
     {
         // Except that we still need to generate the event for consistency with
         // the normal case when the text does change.

-        SendTextUpdatedEvent(GetEditableWindow());
+        if ( flags & SetValue_SendEvent )
+            SendTextUpdatedEvent(GetEditableWindow());

     }
     }

-
-    SetInsertionPoint(0);

 }
 
 void wxTextEntryBase::Replace(long from, long to, const wxString& value)
 }
 
 void wxTextEntryBase::Replace(long from, long to, const wxString& value)