Fixed single-line text control breakage (sorry). Now only

skips the refresh when the new and old values are the same.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/x11/textctrl.cpp b/src/x11/textctrl.cpp
index 50329f67fe389cd0b9ccd63d9041fd3ffc9133b6..7bf22a1c67da3e389f736c88a20205457839ca16 100644 (file)
--- a/src/x11/textctrl.cpp
+++ b/src/x11/textctrl.cpp
@@ -275,12 +275,8 @@ void wxTextCtrl::SetValue(const wxString& value)
 {
     m_modified = FALSE;
 
-    if ((GetWindowStyle() & wxTE_MULTILINE) == 0)
-    {
-        if (value == GetValue())
-            return;
-    }
-    
+    wxString oldValue = GetValue();
+
     m_cursorX = 0;
     m_cursorY = 0;
     ClearSelection();
@@ -330,6 +326,13 @@ void wxTextCtrl::SetValue(const wxString& value)
             }
         }
     }
+
+    // Don't need to refresh if the value hasn't changed
+    if ((GetWindowStyle() & wxTE_MULTILINE) == 0)
+    {
+        if (value == oldValue)
+            return;
+    }
     
     MyAdjustScrollbars();