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

Make wxGTK wxTextCtrl::WriteText() less inefficient

Browse Source 
Use wxScopedCharBuffer as we only need the buffer in the current scope.
This avoids a buffer copy done by wxCharBuffer which could be a
significant pessimization for large buffers.

Also don't call strlen() unnecessarily, we already know the buffer
length, so just use it.
This commit is contained in:
Vadim Zeitlin
2017-08-24 17:28:00 +02:00
parent 1c946a469a
commit 42e9f0cf58
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/textctrl.cpp
View File

@@ -1056,7 +1056,7 @@ void wxTextCtrl::WriteText( const wxString &text )
} }
#if wxUSE_UNICODE #if wxUSE_UNICODE
const wxCharBuffer buffer(text.utf8_str()); const wxScopedCharBuffer buffer(text.utf8_str());
#else #else
// check if we have a specific style for the current position // check if we have a specific style for the current position
wxFontEncoding enc = wxFONTENCODING_SYSTEM; wxFontEncoding enc = wxFONTENCODING_SYSTEM;
@@ -1069,7 +1069,7 @@ void wxTextCtrl::WriteText( const wxString &text )
if ( enc == wxFONTENCODING_SYSTEM ) if ( enc == wxFONTENCODING_SYSTEM )
enc = GetTextEncoding(); enc = GetTextEncoding();
const wxCharBuffer buffer(wxGTK_CONV_ENC(text, enc)); const wxScopedCharBuffer buffer(wxGTK_CONV_ENC(text, enc));
if ( !buffer ) if ( !buffer )
{ {
// we must log an error here as losing the text like this can be a // we must log an error here as losing the text like this can be a
@@ -1088,7 +1088,7 @@ void wxTextCtrl::WriteText( const wxString &text )
gtk_text_buffer_get_iter_at_mark( m_buffer, &iter, gtk_text_buffer_get_iter_at_mark( m_buffer, &iter,
gtk_text_buffer_get_insert (m_buffer) ); gtk_text_buffer_get_insert (m_buffer) );
gtk_text_buffer_insert( m_buffer, &iter, buffer, strlen(buffer) ); gtk_text_buffer_insert( m_buffer, &iter, buffer, buffer.length() );
// Scroll to cursor, but only if scrollbar thumb is at the very bottom // Scroll to cursor, but only if scrollbar thumb is at the very bottom
// won't work when frozen, text view is not using m_buffer then // won't work when frozen, text view is not using m_buffer then