fixed bug with the caret positioning after SetValue() introduced by the last commit

[wxWidgets.git] / contrib / src / applet / prepecho.cpp

diff --git a/contrib/src/applet/prepecho.cpp b/contrib/src/applet/prepecho.cpp
index 9fc3f9985b1b34710f6dbd0a047c13c9075a45d4..67b38016fea7ab43432c7b6733311099507e8cf4 100644 (file)
--- a/contrib/src/applet/prepecho.cpp
+++ b/contrib/src/applet/prepecho.cpp
@@ -97,7 +97,7 @@ wxString wxEchoPrep::Process(
             cname = tag.Mid(10, n);
 
             // grab the value from the class, put it in tag since the data is no longer needed
-            tag = wxEchoVariable::GetValue(cname, NULL);
+            tag = wxEchoVariable::FindValue(cname, NULL);
             }
         else {
             // Find the parms
@@ -114,9 +114,14 @@ wxString wxEchoPrep::Process(
             cname = tag.Mid(10, n);
 
             // grab the value from the class, put it in tag since the data is no longer needed
-            tag = wxEchoVariable::GetValue(cname, parms.c_str());
-            }
+            tag = wxEchoVariable::FindValue(cname, parms.c_str());
+
 
+            }
+        // remove ampersands and <> chars
+        tag.Replace("&", "&amp;");
+        tag.Replace("<", "&lt;");
+        tag.Replace(">", "&gt;");
 
         output = (output.Mid(0,i) + tag + output.Mid(i));
                }