else
return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY + m_macLocalOrigin.y ;
}
-#if !wxMAC_USE_CORE_GRAPHICS
+#if wxMAC_USE_CORE_GRAPHICS
+ wxGraphicContext* GetGraphicContext() { return m_graphicContext ; }
+#else
WXHRGN MacGetCurrentClipRgn() { return m_macCurrentClipRgn ; }
static void MacSetupBackgroundForCurrentPort(const wxBrush& background ) ;
#endif
void MacInstallBrush() const ;
#endif
- wxPoint m_macLocalOrigin ;
+ wxPoint m_macLocalOrigin ;
mutable void* m_macATSUIStyle ;
+ WXHDC m_macPort ;
#if wxMAC_USE_CORE_GRAPHICS
// CoreGraphics
wxGraphicContext * m_graphicContext ;
+ wxPoint m_macLocalOriginInPort ;
#else
- WXHDC m_macPort ;
- mutable bool m_macFontInstalled ;
- mutable bool m_macPenInstalled ;
- mutable bool m_macBrushInstalled ;
-
- WXHRGN m_macBoundaryClipRgn ;
- WXHRGN m_macCurrentClipRgn ;
- void MacSetupPort( wxMacPortStateHelper* ph ) const ;
- void MacCleanupPort( wxMacPortStateHelper* ph ) const ;
+ mutable bool m_macFontInstalled ;
+ mutable bool m_macPenInstalled ;
+ mutable bool m_macBrushInstalled ;
+
+ WXHRGN m_macBoundaryClipRgn ;
+ WXHRGN m_macCurrentClipRgn ;
+ void MacSetupPort( wxMacPortStateHelper* ph ) const ;
+ void MacCleanupPort( wxMacPortStateHelper* ph ) const ;
mutable wxMacPortStateHelper* m_macCurrentPortStateHelper ;
mutable bool m_macFormerAliasState ;
mutable short m_macFormerAliasSize ;