From 220d37c864a8b55617169153653d069bbb8a29c1 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 31 Jul 2008 05:57:56 +0000 Subject: [PATCH] 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 --- include/wx/dcgraph.h | 4 ++++ include/wx/graphics.h | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h index 0c2dec4771..3e9614f239 100644 --- 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 ); +#if wxUSE_PRINTING_ARCHITECTURE wxGCDC( const wxPrinterDC& dc ); +#endif 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 ); +#if wxUSE_PRINTING_ARCHITECTURE wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc ); +#endif wxGCDCImpl( wxDC *owner ); virtual ~wxGCDCImpl(); diff --git a/include/wx/graphics.h b/include/wx/graphics.h index 4ab38f42c7..2669061598 100644 --- a/include/wx/graphics.h +++ b/include/wx/graphics.h @@ -21,7 +21,9 @@ class WXDLLIMPEXP_FWD_CORE wxWindowDC; class WXDLLIMPEXP_FWD_CORE wxMemoryDC; +#if wxUSE_PRINTING_ARCHITECTURE class WXDLLIMPEXP_FWD_CORE wxPrinterDC; +#endif 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) ; +#if wxUSE_PRINTING_ARCHITECTURE static wxGraphicsContext * Create( const wxPrinterDC& dc) ; +#endif static wxGraphicsContext* CreateFromNative( void * context ) ; @@ -545,8 +549,10 @@ public : 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 ; - +#endif + virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ) = 0; virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ) = 0; -- 2.45.2