tentative fix for BestSize problems (non-native toolbar)

[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..13aa350424a7eb74bd519c82c5777ae9e20582ea 100644 (file)
--- a/include/wx/mac/carbon/dc.h
+++ b/include/wx/mac/carbon/dc.h
@@ -54,6 +54,8 @@ public :
     
     virtual void AddLineToPoint( wxCoord x1 , wxCoord y1 ) = 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 ;
@@ -237,6 +239,9 @@ protected:
     virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
 
     virtual void DoDrawPoint(wxCoord x, wxCoord y);
+#if wxMAC_USE_CORE_GRAPHICS && wxUSE_SPLINES
+    virtual void DoDrawSpline(wxList *points);
+#endif
     virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
 
     virtual void DoDrawArc(wxCoord x1, wxCoord y1,
@@ -309,22 +314,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 ;