Show full screen windows with WS_POPUP style in wxMSW.

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

diff --git a/src/msw/combo.cpp b/src/msw/combo.cpp
index f6c705008c6ac9865f785623081f3d0c5f451439..3f9b3accbebac5806bb12a0c9c3dd6947c15025a 100644 (file)
--- a/src/msw/combo.cpp
+++ b/src/msw/combo.cpp
@@ -4,7 +4,6 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006

-// RCS-ID:      $Id$

 // Copyright:   (c) 2005 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2005 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -420,15 +419,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();
     wxDC* dcPtr = wxAutoBufferedPaintDCFactory(this);
     wxDC& dc = *dcPtr;
 
     const wxRect& rectButton = m_btnArea;
     wxRect rectTextField = m_tcArea;
     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
 
     // FIXME: Either SetBackgroundColour or GetBackgroundColour
     //        doesn't work under Vista, so here's a temporary


@@ -436,7 +432,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).
     //        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();
 
 #if wxUSE_UXTHEME
     const bool isEnabled = IsThisEnabled();


@@ -465,6 +461,8 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
 #if wxUSE_UXTHEME
     if ( hTheme )
     {
 #if wxUSE_UXTHEME
     if ( hTheme )
     {

+        const bool useVistaComboBox = ::wxGetWinVersion() >= wxWinVersion_Vista;
+

         RECT rFull;
         wxCopyRectToRECT(borderRect, rFull);
 
         RECT rFull;
         wxCopyRectToRECT(borderRect, rFull);