From a12482a357a2ef5feb50f9ace8e173f9aed680e0 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 23 Sep 2010 21:09:24 +0000 Subject: [PATCH] Allow the renderer to also work with wxMemoryDCs git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/carbon/renderer.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/osx/carbon/renderer.cpp b/src/osx/carbon/renderer.cpp index 38642f8a86..659b070891 100644 --- a/src/osx/carbon/renderer.cpp +++ b/src/osx/carbon/renderer.cpp @@ -24,6 +24,7 @@ #include "wx/bitmap.h" #include "wx/settings.h" #include "wx/dcclient.h" + #include "wx/dcmemory.h" #include "wx/toplevel.h" #endif @@ -37,11 +38,13 @@ #include "wx/mstream.h" #endif // wxHAS_DRAW_TITLE_BAR_BITMAP + // check if we're currently in a paint event inline bool wxInPaintEvent(wxWindow* win, wxDC& dc) { - wxUnusedVar(dc); - return ( win->MacGetCGContextRef() != NULL ); + return win->MacGetCGContextRef() != NULL || + // wxMemoryDC's also have a valid CGContext. + dc.IsKindOf( CLASSINFO(wxMemoryDC) ); } @@ -809,4 +812,4 @@ void wxRendererMac::DrawTitleBarBitmap(wxWindow *win, #endif // wxHAS_DRAW_TITLE_BAR_BITMAP -#endif \ No newline at end of file +#endif -- 2.47.2