fixing warning and compile error against 10.4

[wxWidgets.git] / include / wx / graphics.h

diff --git a/include/wx/graphics.h b/include/wx/graphics.h
index b42c0ad1def8418603d2187522c39fd42c595434..4a2b42c974ab33741f89dcd4e1e2e43f58700a7c 100644 (file)
--- a/include/wx/graphics.h
+++ b/include/wx/graphics.h
@@ -57,8 +57,12 @@ class WXDLLIMPEXP_FWD_CORE wxWindowDC;
 class WXDLLIMPEXP_FWD_CORE wxMemoryDC;
 #if wxUSE_PRINTING_ARCHITECTURE
 class WXDLLIMPEXP_FWD_CORE wxPrinterDC;
 class WXDLLIMPEXP_FWD_CORE wxMemoryDC;
 #if wxUSE_PRINTING_ARCHITECTURE
 class WXDLLIMPEXP_FWD_CORE wxPrinterDC;

+#endif
+#ifdef __WXMSW__
+#if wxUSE_ENH_METAFILE

 class WXDLLIMPEXP_FWD_CORE wxEnhMetaFileDC;
 #endif
 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;


@@ -393,10 +397,12 @@ public:
     static wxGraphicsContext * Create( const wxMemoryDC& dc);
 #if wxUSE_PRINTING_ARCHITECTURE
     static wxGraphicsContext * Create( const wxPrinterDC& dc);
     static wxGraphicsContext * Create( const wxMemoryDC& dc);
 #if wxUSE_PRINTING_ARCHITECTURE
     static wxGraphicsContext * Create( const wxPrinterDC& dc);

+#endif

 #ifdef __WXMSW__
 #ifdef __WXMSW__

+#if wxUSE_ENH_METAFILE

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

-#endif // wxUSE_PRINTING_ARCHITECTURE
+#endif

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


@@ -714,10 +720,12 @@ public:
     virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc) = 0;
 #if wxUSE_PRINTING_ARCHITECTURE
     virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc) = 0;
     virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc) = 0;
 #if wxUSE_PRINTING_ARCHITECTURE
     virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc) = 0;

+#endif

 #ifdef __WXMSW__
 #ifdef __WXMSW__

+#if wxUSE_ENH_METAFILE

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

-#endif // wxUSE_PRINTING_ARCHITECTURE
+#endif

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