use static_cast<> for wxStaticCast; updated comment in front of wxDynamicCast()

[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 b84d255a1f517e84d0d5dee78dbe65dce1f94fe9..62a3961fa2e9f166be12ad783b72817933271198 100644 (file)
--- a/include/wx/mac/carbon/dc.h
+++ b/include/wx/mac/carbon/dc.h
@@ -309,22 +309,23 @@ protected:
     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 ;