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

-#if wxUSE_GRAPHICS_CONTEXT
-
-#include "wx/graphics.h"
-
-#else
+#if !wxUSE_GRAPHICS_CONTEXT

 
 class WXDLLEXPORT wxGraphicPath
 {
 
 class WXDLLEXPORT wxGraphicPath
 {


@@ -247,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 );


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

-    wxGraphicContext                *m_graphicContext;
+    wxGraphicsContext              *m_graphicContext;

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