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

Fixed crash caused by A=B?C:D used for returning wxObject derived type.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2006-10-02 12:11:19 +00:00
parent b3298d1d26
commit ce1f7f02c4
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/univ/stdrend.cpp
View File

@ -167,9 +167,20 @@ void wxStdRenderer::DrawBackground(wxDC& dc,
int WXUNUSED(flags),
wxWindow *window)
{
wxColour colBg = col.Ok() ? col
: window ? m_scheme->GetBackground(window)
: wxSCHEME_COLOUR(m_scheme, CONTROL);
wxColour colBg;
if (col.Ok())
{
colBg = col;
}
else if (window)
{
colBg = m_scheme->GetBackground(window);
}
else
{
colBg = wxSCHEME_COLOUR(m_scheme, CONTROL);
}
DrawSolidRect(dc, colBg, rect);
}