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

speed up drawing text window in UTF8 build (something like 40 times faster in debug)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2008-01-08 05:46:49 +00:00
parent 3aac0d765c
commit 1663ec5f74
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
samples/scroll/scroll.cpp
View File

@@ -934,7 +934,9 @@ void MyAutoTimedScrollingWindow::OnDraw(wxDC& dc)
wxBrush selBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT) wxBrush selBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT)
, wxSOLID); , wxSOLID);
dc.SetPen(*wxTRANSPARENT_PEN); dc.SetPen(*wxTRANSPARENT_PEN);
wxString str = sm_testData; const wxString str = sm_testData;
size_t strLength = str.length();
wxString::const_iterator str_i;
// draw the characters // draw the characters
// 1. for each update region // 1. for each update region
@@ -945,6 +947,7 @@ void MyAutoTimedScrollingWindow::OnDraw(wxDC& dc)
for (int chY = updRectInGChars.y for (int chY = updRectInGChars.y
; chY <= updRectInGChars.y + updRectInGChars.height; ++chY) { ; chY <= updRectInGChars.y + updRectInGChars.height; ++chY) {
// 3. for each character in the row // 3. for each character in the row
bool isFirstX = true;
for (int chX = updRectInGChars.x for (int chX = updRectInGChars.x
; chX <= updRectInGChars.x + updRectInGChars.width ; chX <= updRectInGChars.x + updRectInGChars.width
; ++chX) { ; ++chX) {
@@ -966,10 +969,15 @@ void MyAutoTimedScrollingWindow::OnDraw(wxDC& dc)
size_t charIndex = chY * sm_lineLen + chX; size_t charIndex = chY * sm_lineLen + chX;
if (chY < sm_lineCnt && if (chY < sm_lineCnt &&
chX < sm_lineLen && chX < sm_lineLen &&
charIndex < str.Length()) charIndex < strLength)
{ {
dc.DrawText(str.Mid(charIndex,1), if (isFirstX)
charPos.x, charPos.y); {
str_i = str.begin() + charIndex;
isFirstX = false;
}
dc.DrawText(*str_i, charPos.x, charPos.y);
++str_i;
} }
} }
} }