No changes, just simplify the code using wx2stc() a little.
Assign wx2stc() return value to a suitably const variable instead of using ugly casts to get rid of constness. Also use wxCharBuffer/char* explicitly inside explicit wxUSE_UNICODE checks, using wxWX2MBbuf here doesn't gain us anything and just confuses the reader of this code. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -258,7 +258,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);
|
||||
const wxWX2MBbuf buf = wx2stc(text);
|
||||
SendMsg(2001, wx2stclen(text, buf), (sptr_t)(const char*)buf);
|
||||
}
|
||||
|
||||
@@ -1410,7 +1410,7 @@ int wxStyledTextCtrl::FindText(int minPos, int maxPos,
|
||||
TextToFind ft;
|
||||
ft.chrg.cpMin = minPos;
|
||||
ft.chrg.cpMax = maxPos;
|
||||
wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
|
||||
const wxWX2MBbuf buf = wx2stc(text);
|
||||
ft.lpstrText = (char*)(const char*)buf;
|
||||
|
||||
return SendMsg(2150, flags, (sptr_t)&ft);
|
||||
@@ -1708,7 +1708,7 @@ int wxStyledTextCtrl::GetTargetEnd() const
|
||||
// Returns the length of the replacement text.
|
||||
|
||||
int wxStyledTextCtrl::ReplaceTarget(const wxString& text) {
|
||||
wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
|
||||
const wxWX2MBbuf buf = wx2stc(text);
|
||||
return SendMsg(2194, wx2stclen(text, buf), (sptr_t)(const char*)buf);
|
||||
}
|
||||
|
||||
@@ -1720,7 +1720,7 @@ int wxStyledTextCtrl::GetTargetEnd() const
|
||||
// caused by processing the \d patterns.
|
||||
|
||||
int wxStyledTextCtrl::ReplaceTargetRE(const wxString& text) {
|
||||
wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
|
||||
const wxWX2MBbuf buf = wx2stc(text);
|
||||
return SendMsg(2195, wx2stclen(text, buf), (sptr_t)(const char*)buf);
|
||||
}
|
||||
|
||||
@@ -1729,7 +1729,7 @@ int wxStyledTextCtrl::GetTargetEnd() const
|
||||
// Returns length of range or -1 for failure in which case target is not moved.
|
||||
|
||||
int wxStyledTextCtrl::SearchInTarget(const wxString& text) {
|
||||
wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
|
||||
const wxWX2MBbuf buf = wx2stc(text);
|
||||
return SendMsg(2197, wx2stclen(text, buf), (sptr_t)(const char*)buf);
|
||||
}
|
||||
|
||||
@@ -2085,7 +2085,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);
|
||||
const wxWX2MBbuf buf = wx2stc(text);
|
||||
SendMsg(2282, wx2stclen(text, buf), (sptr_t)(const char*)buf);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user