replacing old core graphics with new graphics context implementation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/dc.h b/include/wx/mac/carbon/dc.h
index d8f285e5bb65d509419ea8eea92c6e6e18bfb76a..c0e60d151d6ff4dab2e7b2f502b45e83a749d4b7 100644 (file)
--- a/include/wx/mac/carbon/dc.h
+++ b/include/wx/mac/carbon/dc.h
@@ -36,6 +36,12 @@
 
 class wxMacPortStateHelper;
 
 
 class wxMacPortStateHelper;
 

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

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


@@ -343,7 +349,6 @@ public:
 
 #if wxMAC_USE_CORE_GRAPHICS
     wxGraphicContext                *m_graphicContext;
 
 #if wxMAC_USE_CORE_GRAPHICS
     wxGraphicContext                *m_graphicContext;

-    wxPoint                         m_macLocalOriginInPort;

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


@@ -367,4 +372,6 @@ public:
 #endif
 };
 
 #endif
 };
 

+#endif
+

 #endif // _WX_DC_H_
 #endif // _WX_DC_H_