Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't include the terminating NUL

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2012-02-10 18:30:13 +00:00
parent 8d9eee8320
commit 9425a21c33
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/stc/gen_iface.py
View File

@@ -89,7 +89,7 @@ methodOverrideMap = {
'''void %s(const wxString& text) { '''void %s(const wxString& text) {
wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(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), 0),
'AddStyledText' : (0, 'AddStyledText' : (0,
@@ -104,7 +104,7 @@ methodOverrideMap = {
'''void %s(const wxString& text) { '''void %s(const wxString& text) {
wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(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), 0),
'GetViewWS' : ( 'GetViewWhiteSpace', 0, 0, 0), 'GetViewWS' : ( 'GetViewWhiteSpace', 0, 0, 0),
@@ -597,7 +597,7 @@ methodOverrideMap = {
''' '''
int %s(const wxString& text) { int %s(const wxString& text) {
wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(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), 0),
'ReplaceTargetRE' : 'ReplaceTargetRE' :
@@ -607,7 +607,7 @@ methodOverrideMap = {
''' '''
int %s(const wxString& text) { int %s(const wxString& text) {
wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(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), 0),
'SearchInTarget' : 'SearchInTarget' :
@@ -617,7 +617,7 @@ methodOverrideMap = {
''' '''
int %s(const wxString& text) { int %s(const wxString& text) {
wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(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), 0),
# not sure what to do about these yet # not sure what to do about these yet

10
src/stc/stc.cpp
View File

@@ -259,7 +259,7 @@ void wxStyledTextCtrl::SetHScrollBar(wxScrollBar* bar) {
// Add text to the document at current position. // Add text to the document at current position.
void wxStyledTextCtrl::AddText(const wxString& text) { void wxStyledTextCtrl::AddText(const wxString& text) {
wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(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. // Add array of cells to document.
@@ -1709,7 +1709,7 @@ int wxStyledTextCtrl::GetTargetEnd() const
int wxStyledTextCtrl::ReplaceTarget(const wxString& text) { int wxStyledTextCtrl::ReplaceTarget(const wxString& text) {
wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(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. // 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) { int wxStyledTextCtrl::ReplaceTargetRE(const wxString& text) {
wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(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 // 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) { int wxStyledTextCtrl::SearchInTarget(const wxString& text) {
wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(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. // 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. // Append a string to the end of the document without changing the selection.
void wxStyledTextCtrl::AppendText(const wxString& text) { void wxStyledTextCtrl::AppendText(const wxString& text) {
wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(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? // Is drawing done in two phases with backgrounds drawn before foregrounds?