From 356e0725d845c326f21fd62442c22dcf6f344b8f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 2 Feb 2019 21:23:35 +0100 Subject: [PATCH] Move wxGraphicsRenderer::CreateContextFromUnknownDC() around No real changes, just move this method to the implementation section of its class. --- src/common/graphcmn.cpp | 46 ++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/common/graphcmn.cpp b/src/common/graphcmn.cpp index a602720327..e558a254f3 100644 --- a/src/common/graphcmn.cpp +++ b/src/common/graphcmn.cpp @@ -992,29 +992,6 @@ wxGraphicsContext* wxGraphicsContext::CreateFromUnknownDC(const wxDC& dc) return wxGraphicsRenderer::GetDefaultRenderer()->CreateContextFromUnknownDC(dc); } -wxGraphicsContext* wxGraphicsRenderer::CreateContextFromUnknownDC(const wxDC& dc) -{ - if ( const wxWindowDC *windc = wxDynamicCast(&dc, wxWindowDC) ) - return CreateContext(*windc); - - if ( const wxMemoryDC *memdc = wxDynamicCast(&dc, wxMemoryDC) ) - return CreateContext(*memdc); - -#if wxUSE_PRINTING_ARCHITECTURE - if ( const wxPrinterDC *printdc = wxDynamicCast(&dc, wxPrinterDC) ) - return CreateContext(*printdc); -#endif - -#ifdef __WXMSW__ -#if wxUSE_ENH_METAFILE - if ( const wxEnhMetaFileDC *mfdc = wxDynamicCast(&dc, wxEnhMetaFileDC) ) - return CreateContext(*mfdc); -#endif -#endif - - return NULL; -} - wxGraphicsContext* wxGraphicsContext::CreateFromNative( void * context ) { return wxGraphicsRenderer::GetDefaultRenderer()->CreateContextFromNativeContext(context); @@ -1055,4 +1032,27 @@ wxGraphicsContext* wxGraphicsContext::Create() wxIMPLEMENT_ABSTRACT_CLASS(wxGraphicsRenderer, wxObject); +wxGraphicsContext* wxGraphicsRenderer::CreateContextFromUnknownDC(const wxDC& dc) +{ + if ( const wxWindowDC *windc = wxDynamicCast(&dc, wxWindowDC) ) + return CreateContext(*windc); + + if ( const wxMemoryDC *memdc = wxDynamicCast(&dc, wxMemoryDC) ) + return CreateContext(*memdc); + +#if wxUSE_PRINTING_ARCHITECTURE + if ( const wxPrinterDC *printdc = wxDynamicCast(&dc, wxPrinterDC) ) + return CreateContext(*printdc); +#endif + +#ifdef __WXMSW__ +#if wxUSE_ENH_METAFILE + if ( const wxEnhMetaFileDC *mfdc = wxDynamicCast(&dc, wxEnhMetaFileDC) ) + return CreateContext(*mfdc); +#endif +#endif + + return NULL; +} + #endif // wxUSE_GRAPHICS_CONTEXT