AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

No changes, just avoid unnecessary heap allocation in wxHtmlWindow.

Browse Source 
Create the temporary wxClientDC on the stack, not the heap, there is no need
for the latter.

See #16501.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2014-08-29 11:56:27 +00:00
parent a84902e665
commit 88e808c9ac
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/html/htmlwin.cpp
View File

@ -480,12 +480,12 @@ bool wxHtmlWindow::DoSetPage(const wxString& source)
}
// ...and run the parser on it:
wxClientDC *dc = new wxClientDC(this);
dc->SetMapMode(wxMM_TEXT);
wxClientDC dc(this);
dc.SetMapMode(wxMM_TEXT);
SetBackgroundColour(wxColour(0xFF, 0xFF, 0xFF));
SetBackgroundImage(wxNullBitmap);
m_Parser->SetDC(dc);
m_Parser->SetDC(&dc);
// notice that it's important to set m_Cell to NULL here before calling
// Parse() below, even if it will be overwritten by its return value as
@ -494,7 +494,7 @@ bool wxHtmlWindow::DoSetPage(const wxString& source)
wxDELETE(m_Cell);
m_Cell = (wxHtmlContainerCell*) m_Parser->Parse(newsrc);
delete dc;
m_Cell->SetIndent(m_Borders, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS);
m_Cell->SetAlignHor(wxHTML_ALIGN_CENTER);
CreateLayout();