Don't include the terminating NUL

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

diff --git a/src/stc/gen_iface.py b/src/stc/gen_iface.py
index 37fc6911cc683dde9677b385c227188ac45d2465..521f34fe849d142e8130d6ce5e0deb8822e0c8fd 100755 (executable)
--- a/src/stc/gen_iface.py
+++ b/src/stc/gen_iface.py
@@ -89,7 +89,7 @@ methodOverrideMap = {
 
                  '''void %s(const wxString& text) {
                     wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-                    SendMsg(%s, buf.length(), (sptr_t)(const char*)buf);''',
+                    SendMsg(%s, buf.length()-1, (sptr_t)(const char*)buf);''',
                  0),
 
     'AddStyledText' : (0,
@@ -104,7 +104,7 @@ methodOverrideMap = {
 
                  '''void %s(const wxString& text) {
                     wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-                    SendMsg(%s, buf.length(), (sptr_t)(const char*)buf);''',
+                    SendMsg(%s, buf.length()-1, (sptr_t)(const char*)buf);''',
                  0),
 
     'GetViewWS' : ( 'GetViewWhiteSpace', 0, 0, 0),
@@ -597,7 +597,7 @@ methodOverrideMap = {
      '''
      int %s(const wxString& text) {
          wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-         return SendMsg(%s, buf.length(), (sptr_t)(const char*)buf);''',
+         return SendMsg(%s, buf.length()-1, (sptr_t)(const char*)buf);''',
      0),
 
     'ReplaceTargetRE' :
@@ -607,7 +607,7 @@ methodOverrideMap = {
      '''
      int %s(const wxString& text) {
          wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-         return SendMsg(%s, buf.length(), (sptr_t)(const char*)buf);''',
+         return SendMsg(%s, buf.length()-1, (sptr_t)(const char*)buf);''',
      0),
 
     'SearchInTarget' :
@@ -617,7 +617,7 @@ methodOverrideMap = {
      '''
      int %s(const wxString& text) {
          wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-         return SendMsg(%s, buf.length(), (sptr_t)(const char*)buf);''',
+         return SendMsg(%s, buf.length()-1, (sptr_t)(const char*)buf);''',
      0),
 
     # not sure what to do about these yet

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index 4eaa62aa14e381b5c5e62e7b07e832b632b58fa1..307321bb835dd6711b40d3bdab147008a335c36b 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -259,7 +259,7 @@ void wxStyledTextCtrl::SetHScrollBar(wxScrollBar* bar)  {
 // Add text to the document at current position.
 void wxStyledTextCtrl::AddText(const wxString& text) {
                     wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-                    SendMsg(2001, buf.length(), (sptr_t)(const char*)buf);
+                    SendMsg(2001, buf.length()-1, (sptr_t)(const char*)buf);
 }
 
 // Add array of cells to document.
@@ -1709,7 +1709,7 @@ int wxStyledTextCtrl::GetTargetEnd() const
 
      int wxStyledTextCtrl::ReplaceTarget(const wxString& text) {
          wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-         return SendMsg(2194, buf.length(), (sptr_t)(const char*)buf);
+         return SendMsg(2194, buf.length()-1, (sptr_t)(const char*)buf);
 }
 
 // Replace the target text with the argument text after \d processing.
@@ -1721,7 +1721,7 @@ int wxStyledTextCtrl::GetTargetEnd() const
 
      int wxStyledTextCtrl::ReplaceTargetRE(const wxString& text) {
          wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-         return SendMsg(2195, buf.length(), (sptr_t)(const char*)buf);
+         return SendMsg(2195, buf.length()-1, (sptr_t)(const char*)buf);
 }
 
 // Search for a counted string in the target and set the target to the found
@@ -1730,7 +1730,7 @@ int wxStyledTextCtrl::GetTargetEnd() const
 
      int wxStyledTextCtrl::SearchInTarget(const wxString& text) {
          wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-         return SendMsg(2197, buf.length(), (sptr_t)(const char*)buf);
+         return SendMsg(2197, buf.length()-1, (sptr_t)(const char*)buf);
 }
 
 // Set the search flags used by SearchInTarget.
@@ -2086,7 +2086,7 @@ bool wxStyledTextCtrl::GetUseVerticalScrollBar() const
 // Append a string to the end of the document without changing the selection.
 void wxStyledTextCtrl::AppendText(const wxString& text) {
                     wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-                    SendMsg(2282, buf.length(), (sptr_t)(const char*)buf);
+                    SendMsg(2282, buf.length()-1, (sptr_t)(const char*)buf);
 }
 
 // Is drawing done in two phases with backgrounds drawn before foregrounds?