better guarding when no printing architecture exists (patch from Joel Low)

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

diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h
index 0c2dec47711bf24bd820826d1a0d5447c8714d05..3e9614f239193e346b8563f997e8238b98b4eda8 100644 (file)
--- a/include/wx/dcgraph.h
+++ b/include/wx/dcgraph.h
@@ -26,7 +26,9 @@ class WXDLLIMPEXP_CORE wxGCDC: public wxDC
 public:
     wxGCDC( const wxWindowDC& dc );
     wxGCDC( const wxMemoryDC& dc );
 public:
     wxGCDC( const wxWindowDC& dc );
     wxGCDC( const wxMemoryDC& dc );

+#if wxUSE_PRINTING_ARCHITECTURE

     wxGCDC( const wxPrinterDC& dc );
     wxGCDC( const wxPrinterDC& dc );

+#endif

     wxGCDC();
     virtual ~wxGCDC();
  
     wxGCDC();
     virtual ~wxGCDC();
  


@@ -43,7 +45,9 @@ class WXDLLIMPEXP_CORE wxGCDCImpl: public wxDCImpl
 public:
     wxGCDCImpl( wxDC *owner, const wxWindowDC& dc );
     wxGCDCImpl( wxDC *owner, const wxMemoryDC& dc );
 public:
     wxGCDCImpl( wxDC *owner, const wxWindowDC& dc );
     wxGCDCImpl( wxDC *owner, const wxMemoryDC& dc );

+#if wxUSE_PRINTING_ARCHITECTURE

     wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc );
     wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc );

+#endif

     wxGCDCImpl( wxDC *owner );
     
     virtual ~wxGCDCImpl();
     wxGCDCImpl( wxDC *owner );
     
     virtual ~wxGCDCImpl();

diff --git a/include/wx/graphics.h b/include/wx/graphics.h
index 4ab38f42c73af841044082c84c975386a0087d4e..2669061598ffda67c640a48e91af26479261c326 100644 (file)
--- a/include/wx/graphics.h
+++ b/include/wx/graphics.h
@@ -21,7 +21,9 @@
 
 class WXDLLIMPEXP_FWD_CORE wxWindowDC;
 class WXDLLIMPEXP_FWD_CORE wxMemoryDC;
 
 class WXDLLIMPEXP_FWD_CORE wxWindowDC;
 class WXDLLIMPEXP_FWD_CORE wxMemoryDC;

+#if wxUSE_PRINTING_ARCHITECTURE

 class WXDLLIMPEXP_FWD_CORE wxPrinterDC;
 class WXDLLIMPEXP_FWD_CORE wxPrinterDC;

+#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;


@@ -278,7 +280,9 @@ public:
     
     static wxGraphicsContext* Create( const wxWindowDC& dc) ;
     static wxGraphicsContext * Create( const wxMemoryDC& dc) ;
     
     static wxGraphicsContext* Create( const wxWindowDC& dc) ;
     static wxGraphicsContext * Create( const wxMemoryDC& dc) ;

+#if wxUSE_PRINTING_ARCHITECTURE

     static wxGraphicsContext * Create( const wxPrinterDC& dc) ;
     static wxGraphicsContext * Create( const wxPrinterDC& dc) ;

+#endif

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


@@ -545,8 +549,10 @@ public :
 
     virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc) = 0 ;
     virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc) = 0 ;
 
     virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc) = 0 ;
     virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc) = 0 ;

+#if wxUSE_PRINTING_ARCHITECTURE

     virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc) = 0 ;
     virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc) = 0 ;

-    
+#endif
+

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