Change GetC to return an int so that it can return wxEOF on error.

[wxWidgets.git] / include / wx / mac / carbon / dc.h

diff --git a/include/wx/mac/carbon/dc.h b/include/wx/mac/carbon/dc.h
index fa0d4861a6ae55f58a32cdc45078f6dfeef23c72..2b40a0daa08c8c4a3f213d387d6bef56b25b7049 100644 (file)
--- a/include/wx/mac/carbon/dc.h
+++ b/include/wx/mac/carbon/dc.h
@@ -36,6 +36,8 @@
 
 class wxMacPortStateHelper;
 
+#if !wxUSE_GRAPHICS_CONTEXT
+
 class WXDLLEXPORT wxGraphicPath
 {
 public :
@@ -52,7 +54,7 @@ public :
     virtual void AddCircle( wxCoord x, wxCoord y, wxCoord r ) = 0;
     
     // draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)
-    virtual void AddArcToPoint( wxCoord x1, wxCoord y1 , wxCoord x2, wxCoord y1, wxCoord r ) = 0 ;
+    virtual void AddArcToPoint( wxCoord x1, wxCoord y1 , wxCoord x2, wxCoord y2, wxCoord r ) = 0 ;
 
     virtual void AddArc( wxCoord x, wxCoord y, wxCoord r, double startAngle, double endAngle, bool clockwise ) = 0 ;
 
@@ -241,7 +243,7 @@ public:
     }
 
 #if wxMAC_USE_CORE_GRAPHICS
-    wxGraphicContext* GetGraphicContext() { return m_graphicContext; }
+    wxGraphicsContext* GetGraphicsContext() { return m_graphicContext; }
 #else
     WXHRGN MacGetCurrentClipRgn() { return m_macCurrentClipRgn; }
     static void MacSetupBackgroundForCurrentPort(const wxBrush& background );
@@ -342,8 +344,7 @@ public:
     WXHDC                           m_macPort;
 
 #if wxMAC_USE_CORE_GRAPHICS
-    wxGraphicContext                *m_graphicContext;
-    wxPoint                         m_macLocalOriginInPort;
+    wxGraphicsContext              *m_graphicContext;
 #else
     void                            MacInstallPen() const;
     void                            MacInstallBrush() const;
@@ -367,4 +368,6 @@ public:
 #endif
 };
 
+#endif
+
 #endif // _WX_DC_H_