X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3784bf308fe29d37b723a9601517fb97559ba39c..e5dcae09e6c207688b41c8b744764d32b7b39a46:/include/wx/graphics.h diff --git a/include/wx/graphics.h b/include/wx/graphics.h index f2edd54ca3..b42c0ad1de 100644 --- a/include/wx/graphics.h +++ b/include/wx/graphics.h @@ -57,6 +57,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindowDC; class WXDLLIMPEXP_FWD_CORE wxMemoryDC; #if wxUSE_PRINTING_ARCHITECTURE class WXDLLIMPEXP_FWD_CORE wxPrinterDC; +class WXDLLIMPEXP_FWD_CORE wxEnhMetaFileDC; #endif class WXDLLIMPEXP_FWD_CORE wxGraphicsContext; class WXDLLIMPEXP_FWD_CORE wxGraphicsPath; @@ -309,7 +310,8 @@ extern WXDLLIMPEXP_DATA_CORE(wxGraphicsPath) wxNullGraphicsPath; class wxGraphicsGradientStop { public: - wxGraphicsGradientStop(wxColour col, float pos) + wxGraphicsGradientStop(wxColour col = wxTransparentColour, + float pos = 0.) : m_col(col), m_pos(pos) { @@ -348,8 +350,8 @@ public: { // we can't use Add() here as it relies on having start/end stops as // first/last array elements so do it manually - m_stops.push_back(wxGraphicsGradientStop(startCol, 0.)); - m_stops.push_back(wxGraphicsGradientStop(endCol, 1.)); + m_stops.push_back(wxGraphicsGradientStop(startCol, 0.f)); + m_stops.push_back(wxGraphicsGradientStop(endCol, 1.f)); } // default copy ctor, assignment operator and dtor are ok for this class @@ -391,7 +393,10 @@ public: static wxGraphicsContext * Create( const wxMemoryDC& dc); #if wxUSE_PRINTING_ARCHITECTURE static wxGraphicsContext * Create( const wxPrinterDC& dc); +#ifdef __WXMSW__ + static wxGraphicsContext * Create( const wxEnhMetaFileDC& dc); #endif +#endif // wxUSE_PRINTING_ARCHITECTURE static wxGraphicsContext* CreateFromNative( void * context ); @@ -709,7 +714,10 @@ public: virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc) = 0; #if wxUSE_PRINTING_ARCHITECTURE virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc) = 0; +#ifdef __WXMSW__ + virtual wxGraphicsContext * CreateContext( const wxEnhMetaFileDC& dc) = 0; #endif +#endif // wxUSE_PRINTING_ARCHITECTURE virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ) = 0;