missing commit

[wxWidgets.git] / src / msw / combo.cpp

diff --git a/src/msw/combo.cpp b/src/msw/combo.cpp
index 12db6bf584c1a4db9f6353af51cc388621aac069..2ef7d8925a4df77ecac03c0d629f194a933c0ca4 100644 (file)
--- a/src/msw/combo.cpp
+++ b/src/msw/combo.cpp
@@ -294,7 +294,7 @@ wxComboCtrl::PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const
     if ( !(flags & wxCONTROL_ISSUBMENU) )
     {
         // Drawing control
     if ( !(flags & wxCONTROL_ISSUBMENU) )
     {
         // Drawing control

-        isEnabled = IsEnabled();
+        isEnabled = IsThisEnabled();

         doDrawFocusRect = ShouldDrawFocus();
 
 #if wxUSE_UXTHEME
         doDrawFocusRect = ShouldDrawFocus();
 
 #if wxUSE_UXTHEME


@@ -426,10 +426,17 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
 
     const wxRect& rectButton = m_btnArea;
     wxRect rectTextField = m_tcArea;
 
     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
+    //        workaround.
+    //        In the theme-less rendering code below, this fixes incorrect
+    //        background on read-only comboboxes (they are gray, but should be
+    //        white).
+    wxColour bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);

 
 #if wxUSE_UXTHEME
 
 #if wxUSE_UXTHEME

-    const bool isEnabled = IsEnabled();
+    const bool isEnabled = IsThisEnabled();

 
     wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
     HDC hDc = GetHdcOf(*impl);
 
     wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
     HDC hDc = GetHdcOf(*impl);


@@ -502,11 +509,6 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
 
         if ( useVistaComboBox )
         {
 
         if ( useVistaComboBox )
         {

-            // FIXME: Either SetBackgroundColour or GetBackgroundColour
-            //        doesn't work under Vista, so here's a temporary
-            //        workaround.
-            bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
-

             // Draw the entire control as a single button?
             if ( !isNonStdButton )
             {
             // Draw the entire control as a single button?
             if ( !isNonStdButton )
             {