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 392c13044c63d3997e5aaf1d0d5e70d65a73f912..4a2b42c974ab33741f89dcd4e1e2e43f58700a7c 100644 (file)
--- a/include/wx/graphics.h
+++ b/include/wx/graphics.h
@@ -58,6 +58,11 @@ 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
+#endif
 class WXDLLIMPEXP_FWD_CORE wxGraphicsContext;
 class WXDLLIMPEXP_FWD_CORE wxGraphicsPath;
 class WXDLLIMPEXP_FWD_CORE wxGraphicsMatrix;
@@ -309,7 +314,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)
     {
@@ -323,7 +329,7 @@ public:
     float GetPosition() const { return m_pos; }
     void SetPosition(float pos)
     {
-        wxASSERT_MSG( pos >= 0 && pos < 1, "invalid gradient stop position" );
+        wxASSERT_MSG( pos >= 0 && pos <= 1, "invalid gradient stop position" );
 
         m_pos = pos;
     }
@@ -348,8 +354,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,6 +397,11 @@ public:
     static wxGraphicsContext * Create( const wxMemoryDC& dc);
 #if wxUSE_PRINTING_ARCHITECTURE
     static wxGraphicsContext * Create( const wxPrinterDC& dc);
+#endif
+#ifdef __WXMSW__
+#if wxUSE_ENH_METAFILE
+    static wxGraphicsContext * Create( const wxEnhMetaFileDC& dc);
+#endif
 #endif
 
     static wxGraphicsContext* CreateFromNative( void * context );
@@ -709,6 +720,11 @@ public:
     virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc) = 0;
 #if wxUSE_PRINTING_ARCHITECTURE
     virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc) = 0;
+#endif
+#ifdef __WXMSW__
+#if wxUSE_ENH_METAFILE
+    virtual wxGraphicsContext * CreateContext( const wxEnhMetaFileDC& dc) = 0;
+#endif
 #endif
 
     virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ) = 0;