Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bracketing msw enhanced metafile usage

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-01-01 11:10:35 +00:00
parent cb98e78b1e
commit 29188693b3
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/graphics.h
View File

@@ -58,9 +58,11 @@ class WXDLLIMPEXP_FWD_CORE wxMemoryDC;
#if wxUSE_PRINTING_ARCHITECTURE #if wxUSE_PRINTING_ARCHITECTURE
class WXDLLIMPEXP_FWD_CORE wxPrinterDC; class WXDLLIMPEXP_FWD_CORE wxPrinterDC;
#endif #endif
#ifdef __WXMSW__
#if wxUSE_ENH_METAFILE #if wxUSE_ENH_METAFILE
class WXDLLIMPEXP_FWD_CORE wxEnhMetaFileDC; class WXDLLIMPEXP_FWD_CORE wxEnhMetaFileDC;
#endif #endif
#endif
class WXDLLIMPEXP_FWD_CORE wxGraphicsContext; class WXDLLIMPEXP_FWD_CORE wxGraphicsContext;
class WXDLLIMPEXP_FWD_CORE wxGraphicsPath; class WXDLLIMPEXP_FWD_CORE wxGraphicsPath;
class WXDLLIMPEXP_FWD_CORE wxGraphicsMatrix; class WXDLLIMPEXP_FWD_CORE wxGraphicsMatrix;
@@ -396,8 +398,10 @@ public:
#if wxUSE_PRINTING_ARCHITECTURE #if wxUSE_PRINTING_ARCHITECTURE
static wxGraphicsContext * Create( const wxPrinterDC& dc); static wxGraphicsContext * Create( const wxPrinterDC& dc);
#endif #endif
#ifdef __WXMSW__
#if wxUSE_ENH_METAFILE #if wxUSE_ENH_METAFILE
static wxGraphicsContext * Create( const wxEnhMetaFileDC& dc); static wxGraphicsContext * Create( const wxEnhMetaFileDC& dc);
#endif
#endif #endif
static wxGraphicsContext* CreateFromNative( void * context ); static wxGraphicsContext* CreateFromNative( void * context );
@@ -717,8 +721,10 @@ public:
#if wxUSE_PRINTING_ARCHITECTURE #if wxUSE_PRINTING_ARCHITECTURE
virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc) = 0; virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc) = 0;
#endif #endif
#ifdef __WXMSW__
#if wxUSE_ENH_METAFILE #if wxUSE_ENH_METAFILE
virtual wxGraphicsContext * CreateContext( const wxEnhMetaFileDC& dc) = 0; virtual wxGraphicsContext * CreateContext( const wxEnhMetaFileDC& dc) = 0;
#endif
#endif #endif
virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ) = 0; virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ) = 0;

2
src/common/graphcmn.cpp
View File

@@ -872,12 +872,14 @@ wxGraphicsBitmap wxGraphicsContext::CreateSubBitmap( const wxGraphicsBitmap &bmp
} }
#endif #endif
#ifdef __WXMSW__
#if wxUSE_ENH_METAFILE #if wxUSE_ENH_METAFILE
/* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxEnhMetaFileDC& dc) /* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxEnhMetaFileDC& dc)
{ {
return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc); return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc);
} }
#endif #endif
#endif
wxGraphicsContext* wxGraphicsContext::CreateFromNative( void * context ) wxGraphicsContext* wxGraphicsContext::CreateFromNative( void * context )
{ {