X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04ee05f92add0ab92ce08ecb827e3be41336aa06..20db5469a0fb70d2540110acf44f144606d90f4f:/src/generic/renderg.cpp diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp index 16915dc55f..0a8193808b 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 // ---------------------------------------------------------------------------- @@ -98,6 +98,8 @@ public: const wxRect& rect, int flags = 0); + virtual wxSize GetCheckBoxSize(wxWindow *win); + virtual void DrawPushButton(wxWindow *win, wxDC& dc, const wxRect& rect, @@ -618,6 +620,11 @@ wxRendererGeneric::DrawCheckBox(wxWindow *WXUNUSED(win), } } +wxSize wxRendererGeneric::GetCheckBoxSize(wxWindow *WXUNUSED(win)) +{ + return wxSize(16, 16); +} + void wxRendererGeneric::DrawPushButton(wxWindow *win, wxDC& dc, @@ -666,7 +673,7 @@ wxRendererGeneric::DrawItemSelectionRect(wxWindow * WXUNUSED(win), dc.SetBrush(brush); if ((flags & wxCONTROL_CURRENT) && (flags & wxCONTROL_FOCUSED) -#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) +#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON && IsControlActive( (ControlRef)win->GetHandle() ) #endif )