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

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-07-31 05:57:56 +00:00
parent 87c7fc6733
commit 220d37c864
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/dcgraph.h
View File

@@ -26,7 +26,9 @@ class WXDLLIMPEXP_CORE wxGCDC: public wxDC
public: public:
wxGCDC( const wxWindowDC& dc ); wxGCDC( const wxWindowDC& dc );
wxGCDC( const wxMemoryDC& dc ); wxGCDC( const wxMemoryDC& dc );
#if wxUSE_PRINTING_ARCHITECTURE
wxGCDC( const wxPrinterDC& dc ); wxGCDC( const wxPrinterDC& dc );
#endif
wxGCDC(); wxGCDC();
virtual ~wxGCDC(); virtual ~wxGCDC();
@@ -43,7 +45,9 @@ class WXDLLIMPEXP_CORE wxGCDCImpl: public wxDCImpl
public: public:
wxGCDCImpl( wxDC *owner, const wxWindowDC& dc ); wxGCDCImpl( wxDC *owner, const wxWindowDC& dc );
wxGCDCImpl( wxDC *owner, const wxMemoryDC& 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 ); wxGCDCImpl( wxDC *owner );
virtual ~wxGCDCImpl(); virtual ~wxGCDCImpl();

8
include/wx/graphics.h
View File

@@ -21,7 +21,9 @@
class WXDLLIMPEXP_FWD_CORE wxWindowDC; class WXDLLIMPEXP_FWD_CORE wxWindowDC;
class WXDLLIMPEXP_FWD_CORE wxMemoryDC; 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 wxGraphicsContext;
class WXDLLIMPEXP_FWD_CORE wxGraphicsPath; class WXDLLIMPEXP_FWD_CORE wxGraphicsPath;
class WXDLLIMPEXP_FWD_CORE wxGraphicsMatrix; class WXDLLIMPEXP_FWD_CORE wxGraphicsMatrix;
@@ -278,7 +280,9 @@ public:
static wxGraphicsContext* Create( const wxWindowDC& dc) ; static wxGraphicsContext* Create( const wxWindowDC& dc) ;
static wxGraphicsContext * Create( const wxMemoryDC& 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 wxWindowDC& dc) = 0 ;
virtual wxGraphicsContext * CreateContext( const wxMemoryDC& 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 * CreateContextFromNativeContext( void * context ) = 0;
virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ) = 0; virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ) = 0;