bracketing msw enhanced metafile usage

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/graphics.h b/include/wx/graphics.h
index af132850287a33f472eaa5499129cd9cd46b2820..4a2b42c974ab33741f89dcd4e1e2e43f58700a7c 100644 (file)
--- a/include/wx/graphics.h
+++ b/include/wx/graphics.h
@@ -58,9 +58,11 @@ class WXDLLIMPEXP_FWD_CORE wxMemoryDC;
 #if wxUSE_PRINTING_ARCHITECTURE
 class WXDLLIMPEXP_FWD_CORE wxPrinterDC;
 #endif
 #if wxUSE_PRINTING_ARCHITECTURE
 class WXDLLIMPEXP_FWD_CORE wxPrinterDC;
 #endif

+#ifdef __WXMSW__

 #if wxUSE_ENH_METAFILE
 class WXDLLIMPEXP_FWD_CORE wxEnhMetaFileDC;
 #endif
 #if wxUSE_ENH_METAFILE
 class WXDLLIMPEXP_FWD_CORE wxEnhMetaFileDC;
 #endif

+#endif

 class WXDLLIMPEXP_FWD_CORE wxGraphicsContext;
 class WXDLLIMPEXP_FWD_CORE wxGraphicsPath;
 class WXDLLIMPEXP_FWD_CORE wxGraphicsMatrix;
 class WXDLLIMPEXP_FWD_CORE wxGraphicsContext;
 class WXDLLIMPEXP_FWD_CORE wxGraphicsPath;
 class WXDLLIMPEXP_FWD_CORE wxGraphicsMatrix;


@@ -396,8 +398,10 @@ public:
 #if wxUSE_PRINTING_ARCHITECTURE
     static wxGraphicsContext * Create( const wxPrinterDC& dc);
 #endif
 #if wxUSE_PRINTING_ARCHITECTURE
     static wxGraphicsContext * Create( const wxPrinterDC& dc);
 #endif

+#ifdef __WXMSW__

 #if wxUSE_ENH_METAFILE
     static wxGraphicsContext * Create( const wxEnhMetaFileDC& dc);
 #if wxUSE_ENH_METAFILE
     static wxGraphicsContext * Create( const wxEnhMetaFileDC& dc);

+#endif

 #endif
 
     static wxGraphicsContext* CreateFromNative( void * context );
 #endif
 
     static wxGraphicsContext* CreateFromNative( void * context );


@@ -717,8 +721,10 @@ public:
 #if wxUSE_PRINTING_ARCHITECTURE
     virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc) = 0;
 #endif
 #if wxUSE_PRINTING_ARCHITECTURE
     virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc) = 0;
 #endif

+#ifdef __WXMSW__

 #if wxUSE_ENH_METAFILE
     virtual wxGraphicsContext * CreateContext( const wxEnhMetaFileDC& dc) = 0;
 #if wxUSE_ENH_METAFILE
     virtual wxGraphicsContext * CreateContext( const wxEnhMetaFileDC& dc) = 0;

+#endif

 #endif
 
     virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ) = 0;
 #endif
 
     virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ) = 0;

diff --git a/src/common/graphcmn.cpp b/src/common/graphcmn.cpp
index 99a42c8a958c84e6ff14e25cff6ce0e261eabbee..5bc8a8824a60d945926ccaccb44428545ebd9dc1 100644 (file)
--- a/src/common/graphcmn.cpp
+++ b/src/common/graphcmn.cpp
@@ -872,12 +872,14 @@ wxGraphicsBitmap wxGraphicsContext::CreateSubBitmap( const wxGraphicsBitmap &bmp
 }
 #endif
 
 }
 #endif
 

+#ifdef __WXMSW__

 #if wxUSE_ENH_METAFILE
 /* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxEnhMetaFileDC& dc)
 {
     return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc);
 }
 #endif
 #if wxUSE_ENH_METAFILE
 /* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxEnhMetaFileDC& dc)
 {
     return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc);
 }
 #endif

+#endif

 
 wxGraphicsContext* wxGraphicsContext::CreateFromNative( void * context )
 {
 
 wxGraphicsContext* wxGraphicsContext::CreateFromNative( void * context )
 {