Forgot header with OSX prefix

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

diff --git a/src/common/textentrycmn.cpp b/src/common/textentrycmn.cpp
index c6b769601e4256fe2863a0afcb8c347c5b32a15c..b179499381aabc301d04f1350149301da92d740e 100644 (file)
--- a/src/common/textentrycmn.cpp
+++ b/src/common/textentrycmn.cpp
@@ -40,9 +40,11 @@
 wxString wxTextEntryBase::GetRange(long from, long to) const
 {
     wxString sel;
-    if ( from < to )
+    wxString value = GetValue();
+
+    if ( from < to && (long)value.length() >= to )
     {
-        sel = GetValue().substr(from, to - from);
+        sel = value.substr(from, to - from);
     }
 
     return sel;
@@ -60,6 +62,8 @@ void wxTextEntryBase::DoSetValue(const wxString& value, int flags)
 
     SelectAll();
     WriteText(value);
+
+    SetInsertionPoint(0);
 }
 
 void wxTextEntryBase::Replace(long from, long to, const wxString& value)
@@ -69,6 +73,7 @@ void wxTextEntryBase::Replace(long from, long to, const wxString& value)
         Remove(from, to);
     }
 
+    SetInsertionPoint(from);
     WriteText(value);
 }