X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cae618d1d3745c7ec5306d475120c0fefb8861e9..82bf63a08ca2c5e2d500557550449cad219991c9:/src/generic/renderg.cpp diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp index 68c9b3d538..5ad90db583 100644 --- a/src/generic/renderg.cpp +++ b/src/generic/renderg.cpp @@ -38,7 +38,7 @@ #include "wx/dcmirror.h" #ifdef __WXMAC__ - #include "wx/mac/private.h" + #include "wx/osx/private.h" #endif // ---------------------------------------------------------------------------- @@ -333,7 +333,7 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win, dc.SetFont(font); dc.SetTextForeground(clr); - dc.SetBackgroundMode(wxTRANSPARENT); + dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); int tw, th, td, x, y; dc.GetTextExtent( label, &tw, &th, &td); @@ -666,7 +666,7 @@ wxRendererGeneric::DrawItemSelectionRect(wxWindow * WXUNUSED(win), dc.SetBrush(brush); if ((flags & wxCONTROL_CURRENT) && (flags & wxCONTROL_FOCUSED) -#ifdef __WXMAC__ +#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && IsControlActive( (ControlRef)win->GetHandle() ) #endif )