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

Fix r71367: don't set bgCol twice needlessly.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2012-05-06 16:56:38 +00:00
parent b7f37d6d86
commit 2a715bcb3c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/msw/combo.cpp
View File

@ -420,15 +420,12 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
{ {
// TODO: Convert drawing in this function to Windows API Code // TODO: Convert drawing in this function to Windows API Code
const bool useVistaComboBox = ::wxGetWinVersion() >= wxWinVersion_Vista;
wxSize sz = GetClientSize(); wxSize sz = GetClientSize();
wxDC* dcPtr = wxAutoBufferedPaintDCFactory(this); wxDC* dcPtr = wxAutoBufferedPaintDCFactory(this);
wxDC& dc = *dcPtr; wxDC& dc = *dcPtr;
const wxRect& rectButton = m_btnArea; const wxRect& rectButton = m_btnArea;
wxRect rectTextField = m_tcArea; wxRect rectTextField = m_tcArea;
wxColour bgCol = GetBackgroundColour();
// FIXME: Either SetBackgroundColour or GetBackgroundColour // FIXME: Either SetBackgroundColour or GetBackgroundColour
// doesn't work under Vista, so here's a temporary // doesn't work under Vista, so here's a temporary
@ -436,7 +433,7 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
// In the theme-less rendering code below, this fixes incorrect // In the theme-less rendering code below, this fixes incorrect
// background on read-only comboboxes (they are gray, but should be // background on read-only comboboxes (they are gray, but should be
// white). // white).
bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); wxColour bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
#if wxUSE_UXTHEME #if wxUSE_UXTHEME
const bool isEnabled = IsThisEnabled(); const bool isEnabled = IsThisEnabled();
@ -465,6 +462,8 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
#if wxUSE_UXTHEME #if wxUSE_UXTHEME
if ( hTheme ) if ( hTheme )
{ {
const bool useVistaComboBox = ::wxGetWinVersion() >= wxWinVersion_Vista;
RECT rFull; RECT rFull;
wxCopyRectToRECT(borderRect, rFull); wxCopyRectToRECT(borderRect, rFull);