SetTextColour is gone

[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 b3217d919f2219a61df03a8e2ef4a9a220519e37..2b40a0daa08c8c4a3f213d387d6bef56b25b7049 100644 (file)
--- a/include/wx/mac/carbon/dc.h
+++ b/include/wx/mac/carbon/dc.h
@@ -36,6 +36,8 @@
 
 class wxMacPortStateHelper;
 
 
 class wxMacPortStateHelper;
 

+#if !wxUSE_GRAPHICS_CONTEXT
+

 class WXDLLEXPORT wxGraphicPath
 {
 public :
 class WXDLLEXPORT wxGraphicPath
 {
 public :


@@ -48,8 +50,13 @@ public :
     virtual void AddQuadCurveToPoint( wxCoord cx1, wxCoord cy1, wxCoord x1, wxCoord y1 ) = 0;
 
     virtual void AddRectangle( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) = 0;
     virtual void AddQuadCurveToPoint( wxCoord cx1, wxCoord cy1, wxCoord x1, wxCoord y1 ) = 0;
 
     virtual void AddRectangle( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) = 0;

-
+    

     virtual void AddCircle( wxCoord x, wxCoord y, wxCoord r ) = 0;
     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 y2, wxCoord r ) = 0 ;
+
+    virtual void AddArc( wxCoord x, wxCoord y, wxCoord r, double startAngle, double endAngle, bool clockwise ) = 0 ;

 
     virtual void CloseSubpath() = 0;
 };
 
     virtual void CloseSubpath() = 0;
 };


@@ -59,19 +66,42 @@ class WXDLLEXPORT wxGraphicContext
 public:
     virtual ~wxGraphicContext() {}
 
 public:
     virtual ~wxGraphicContext() {}
 

+    virtual wxGraphicPath * CreatePath() = 0;
+        
+    virtual void PushState() = 0 ;
+    
+    virtual void PopState() = 0 ;
+

     virtual void Clip( const wxRegion &region ) = 0;
 
     virtual void Clip( const wxRegion &region ) = 0;
 

+    virtual void SetPen( const wxPen &pen ) = 0;
+
+    virtual void SetBrush( const wxBrush &brush ) = 0;
+    
+    virtual void SetFont( const wxFont &font ) = 0 ;
+    
+    virtual void SetTextColor( const wxColour &col ) = 0 ;
+

     virtual void StrokePath( const wxGraphicPath *path ) = 0;
 
     virtual void DrawPath( const wxGraphicPath *path, int fillStyle = wxWINDING_RULE ) = 0;
 
     virtual void FillPath( const wxGraphicPath *path, const wxColor &fillColor, int fillStyle = wxWINDING_RULE ) = 0;
 
     virtual void StrokePath( const wxGraphicPath *path ) = 0;
 
     virtual void DrawPath( const wxGraphicPath *path, int fillStyle = wxWINDING_RULE ) = 0;
 
     virtual void FillPath( const wxGraphicPath *path, const wxColor &fillColor, int fillStyle = wxWINDING_RULE ) = 0;
 

-    virtual void SetPen( const wxPen &pen ) = 0;
-
-    virtual void SetBrush( const wxBrush &brush ) = 0;
-
-    virtual wxGraphicPath * CreatePath() = 0;
+    virtual void DrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, wxCoord w, wxCoord h ) = 0 ;
+    
+    virtual void DrawIcon( const wxIcon &icon, wxCoord x, wxCoord y, wxCoord w, wxCoord h ) = 0 ;
+    
+    virtual void DrawText( const wxString &str, wxCoord x, wxCoord y, double angle ) = 0 ;
+    
+    virtual void GetTextExtent( const wxString &text, wxCoord *width, wxCoord *height,
+                            wxCoord *descent, wxCoord *externalLeading ) const  = 0 ;
+    
+    virtual void GetPartialTextExtents(const wxString& text, wxArrayInt& widths) const = 0 ;
+    
+    virtual void Translate( wxCoord dx , wxCoord dy ) = 0 ;
+    
+    virtual void Scale( wxCoord xScale , wxCoord yScale ) = 0 ;

 };
 
 class WXDLLEXPORT wxDC: public wxDCBase
 };
 
 class WXDLLEXPORT wxDC: public wxDCBase


@@ -213,7 +243,7 @@ public:
     }
 
 #if wxMAC_USE_CORE_GRAPHICS
     }
 
 #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 );
 #else
     WXHRGN MacGetCurrentClipRgn() { return m_macCurrentClipRgn; }
     static void MacSetupBackgroundForCurrentPort(const wxBrush& background );


@@ -314,8 +344,7 @@ public:
     WXHDC                           m_macPort;
 
 #if wxMAC_USE_CORE_GRAPHICS
     WXHDC                           m_macPort;
 
 #if wxMAC_USE_CORE_GRAPHICS

-    wxGraphicContext                *m_graphicContext;
-    wxPoint                         m_macLocalOriginInPort;
+    wxGraphicsContext              *m_graphicContext;

 #else
     void                            MacInstallPen() const;
     void                            MacInstallBrush() const;
 #else
     void                            MacInstallPen() const;
     void                            MacInstallBrush() const;


@@ -339,4 +368,6 @@ public:
 #endif
 };
 
 #endif
 };
 

+#endif
+

 #endif // _WX_DC_H_
 #endif // _WX_DC_H_