Add wxDataViewCtrl::ExpandAncestors() and call it from both EnsureVisible() and Select()

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

diff --git a/src/msw/combo.cpp b/src/msw/combo.cpp
index 04e430c428e2c2e4d45aa161c7bd77aa18228ef8..d27c1594d90c8f7e264ac3eba92617331bbadb33 100644 (file)
--- a/src/msw/combo.cpp
+++ b/src/msw/combo.cpp
@@ -41,6 +41,7 @@
 #if wxUSE_UXTHEME
 #include "wx/msw/uxtheme.h"
 #endif
 #if wxUSE_UXTHEME
 #include "wx/msw/uxtheme.h"
 #endif

+#include "wx/msw/dc.h"

 
 // Change to #if 1 to include tmschema.h for easier testing of theme
 // parameters.
 
 // Change to #if 1 to include tmschema.h for easier testing of theme
 // parameters.


@@ -308,7 +309,7 @@ static void wxMSWDrawFocusRect( wxDC& dc, const wxRect& rect )
     //   it employs wxCAP_BUTT hack to have line of width 1.
     dc.SetLogicalFunction(wxINVERT);
 
     //   it employs wxCAP_BUTT hack to have line of width 1.
     dc.SetLogicalFunction(wxINVERT);
 

-    wxPen pen(*wxBLACK,1,wxDOT);
+    wxPen pen(*wxBLACK, 1, wxPENSTYLE_DOT);

     pen.SetCap(wxCAP_BUTT);
     dc.SetPen(pen);
     dc.SetBrush(*wxTRANSPARENT_BRUSH);
     pen.SetCap(wxCAP_BUTT);
     dc.SetPen(pen);
     dc.SetBrush(*wxTRANSPARENT_BRUSH);


@@ -479,7 +480,8 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
 #if wxUSE_UXTHEME
     const bool isEnabled = IsEnabled();
 
 #if wxUSE_UXTHEME
     const bool isEnabled = IsEnabled();
 

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

     HWND hWnd = GetHwndOf(this);
 
     wxUxThemeEngine* theme = NULL;
     HWND hWnd = GetHwndOf(this);
 
     wxUxThemeEngine* theme = NULL;