added wxDC::Set/GetLayoutDirection() and implemented it for wxMSW (patch from Tim...

[wxWidgets.git] / src / mac / carbon / graphics.cpp

diff --git a/src/mac/carbon/graphics.cpp b/src/mac/carbon/graphics.cpp
index d71dfae32b7103dc5b23075b9a25e3becdba7cf5..63a716c19b03d8cd44c77cbe5c8251c73f9a3f16 100755 (executable)
--- a/src/mac/carbon/graphics.cpp
+++ b/src/mac/carbon/graphics.cpp
@@ -13,7 +13,7 @@
 
 #include "wx/graphics.h"
 
 
 #include "wx/graphics.h"
 

-#if wxMAC_USE_CORE_GRAPHICS
+#if wxUSE_GRAPHICS_CONTEXT && wxMAC_USE_CORE_GRAPHICS

 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"


@@ -138,7 +138,8 @@ void wxMacCoreGraphicsPath::AddCircle( wxDouble x, wxDouble y , wxDouble r )
 // adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle
 void wxMacCoreGraphicsPath::AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise )
 {
 // adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle
 void wxMacCoreGraphicsPath::AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise )
 {

-    CGPathAddArc( m_path, NULL , x, y, r, startAngle, endAngle, clockwise); 
+    // inverse direction as we the 'normal' state is a y axis pointing down, ie mirrored to the standard core graphics setup
+    CGPathAddArc( m_path, NULL , x, y, r, startAngle, endAngle, !clockwise); 

 }
 
 void wxMacCoreGraphicsPath::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r )
 }
 
 void wxMacCoreGraphicsPath::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r )


@@ -935,7 +936,7 @@ void wxMacCoreGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDoub
     DrawText(str, x, y, 0.0);
 }
 
     DrawText(str, x, y, 0.0);
 }
 

-void wxMacCoreGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, double angle ) 
+void wxMacCoreGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle ) 

 {
     OSStatus status = noErr;
     ATSUTextLayout atsuLayout;
 {
     OSStatus status = noErr;
     ATSUTextLayout atsuLayout;