diff --git a/src/stc/gen_iface.py b/src/stc/gen_iface.py
index 55eaa895b1..831cf85fe4 100755
--- a/src/stc/gen_iface.py
+++ b/src/stc/gen_iface.py
@@ -509,11 +509,7 @@ methodOverrideMap = {
      'wxString %s();',
 
      '''wxString %s() {
-         long   start;
-         long   end;
-
-         GetSelection(&start, &end);
-         int   len  = end - start;
+         const int len = SendMsg(SCI_GETSELTEXT, 0, (sptr_t)0);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+2);
diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index b5d71eebbe..20aff095a3 100644
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -1504,11 +1504,7 @@ bool wxStyledTextCtrl::GetModify() const
 
 // Retrieve the selected text.
 wxString wxStyledTextCtrl::GetSelectedText() {
-         long   start;
-         long   end;
-
-         GetSelection(&start, &end);
-         int   len  = end - start;
+         const int len = SendMsg(SCI_GETSELTEXT, 0, (sptr_t)0);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+2);