X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b44ffc0e77a8db603b3aba597e4c4df2e2e518f..2c66581eaae92045864aa8d0ab80fc27f8725e52:/include/wx/dc.h?ds=sidebyside

diff --git a/include/wx/dc.h b/include/wx/dc.h
index e500f1f49a..560d969061 100644
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -42,11 +42,6 @@ class WXDLLIMPEXP_FWD_CORE wxMemoryDC;
 class WXDLLIMPEXP_FWD_CORE wxPrinterDC;
 class WXDLLIMPEXP_FWD_CORE wxPrintData;
 
-
-#if wxUSE_GRAPHICS_CONTEXT
-class WXDLLIMPEXP_FWD_CORE wxGraphicsContext;
-#endif
-
 //-----------------------------------------------------------------------------
 // wxDrawObject helper class
 //-----------------------------------------------------------------------------
@@ -187,14 +182,11 @@ public:
     virtual bool CanDrawBitmap() const = 0;
     virtual bool CanGetTextExtent() const = 0;
 
-    // get graphics context from 
-
-#if wxUSE_GRAPHICS_CONTEXT
-    virtual wxGraphicsContext* CreateGraphicsContext()
+    // get Cairo context
+    virtual void* GetCairoContext() const
     {
         return NULL;
     }
-#endif
 
     // query dimension, colour deps, resolution
 
@@ -477,8 +469,12 @@ public:
 
 
 #if wxUSE_SPLINES
-    virtual void DoDrawSpline(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord x3, wxCoord y3);
-    virtual void DoDrawSpline(int n, wxPoint points[]);
+    void DrawSpline(wxCoord x1, wxCoord y1,
+                            wxCoord x2, wxCoord y2,
+                            wxCoord x3, wxCoord y3);
+    void DrawSpline(int n, wxPoint points[]);
+    void DrawSpline(const wxPointList *points) { DoDrawSpline(points); }
+
     virtual void DoDrawSpline(const wxPointList *points);
 #endif
 
@@ -634,11 +630,6 @@ public:
     bool IsOk() const
         { return m_pimpl && m_pimpl->IsOk(); }
 
-#if wxUSE_GRAPHICS_CONTEXT
-    wxGraphicsContext* CreateGraphicsContext()
-        { return m_pimpl->CreateGraphicsContext(); }
-#endif
-
     // query capabilities
 
     bool CanDrawBitmap() const
@@ -1090,11 +1081,11 @@ public:
     void DrawSpline(wxCoord x1, wxCoord y1,
                     wxCoord x2, wxCoord y2,
                     wxCoord x3, wxCoord y3)
-        { m_pimpl->DoDrawSpline(x1,y1,x2,y2,x3,y3); }
+        { m_pimpl->DrawSpline(x1,y1,x2,y2,x3,y3); }
     void DrawSpline(int n, wxPoint points[])
-        { m_pimpl->DoDrawSpline(n,points); }
+        { m_pimpl->DrawSpline(n,points); }
     void DrawSpline(const wxPointList *points)
-        { m_pimpl->DoDrawSpline(points); }
+        { m_pimpl->DrawSpline(points); }
 #endif // wxUSE_SPLINES