From: Václav Slavík <vslavik@fastmail.fm>
Date: Sun, 6 May 2012 16:56:38 +0000 (+0000)
Subject: Fix r71367: don't set bgCol twice needlessly.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2a715bcb3cde35746d698ef19cbf52405110b1d6

Fix r71367: don't set bgCol twice needlessly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/msw/combo.cpp b/src/msw/combo.cpp
index f6c705008c..2ef7d8925a 100644
--- a/src/msw/combo.cpp
+++ b/src/msw/combo.cpp
@@ -420,15 +420,12 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
 {
     // TODO: Convert drawing in this function to Windows API Code
 
-    const bool useVistaComboBox = ::wxGetWinVersion() >= wxWinVersion_Vista;
-
     wxSize sz = GetClientSize();
     wxDC* dcPtr = wxAutoBufferedPaintDCFactory(this);
     wxDC& dc = *dcPtr;
 
     const wxRect& rectButton = m_btnArea;
     wxRect rectTextField = m_tcArea;
-    wxColour bgCol = GetBackgroundColour();
 
     // FIXME: Either SetBackgroundColour or GetBackgroundColour
     //        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
     //        background on read-only comboboxes (they are gray, but should be
     //        white).
-    bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+    wxColour bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
 
 #if wxUSE_UXTHEME
     const bool isEnabled = IsThisEnabled();
@@ -465,6 +462,8 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
 #if wxUSE_UXTHEME
     if ( hTheme )
     {
+        const bool useVistaComboBox = ::wxGetWinVersion() >= wxWinVersion_Vista;
+
         RECT rFull;
         wxCopyRectToRECT(borderRect, rFull);