fixed SetUserScale() calls to use correct scale on Y axis

[wxWidgets.git] / src / common / dcgraph.cpp

diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp
index 6d70a954c7f15f3f1802cc67dc10919de7749f41..96516c4e5234baa3e89cb78affe88ac7c64546c3 100644 (file)
--- a/src/common/dcgraph.cpp
+++ b/src/common/dcgraph.cpp
@@ -31,7 +31,11 @@
 #include "wx/dcclient.h"
 
 #ifdef __WXOSX__
 #include "wx/dcclient.h"
 
 #ifdef __WXOSX__

-    #include "ApplicationServices/ApplicationServices.h"
+#ifdef __WXOSX_IPHONE__
+    #include <CoreGraphics/CoreGraphics.h>
+#else
+    #include <ApplicationServices/ApplicationServices.h>
+#endif

 #endif
 
 //-----------------------------------------------------------------------------
 #endif
 
 //-----------------------------------------------------------------------------


@@ -237,10 +241,10 @@ void wxGCDCImpl::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h
     }
 }
 
     }
 }
 

-void wxGCDCImpl::DoSetClippingRegionAsRegion( const wxRegion &region )
+void wxGCDCImpl::DoSetDeviceClippingRegion( const wxRegion &region )

 {
     // region is in device coordinates
 {
     // region is in device coordinates

-    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoSetClippingRegionAsRegion - invalid DC") );
+    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoSetDeviceClippingRegion - invalid DC") );

 
     if (region.Empty())
     {
 
     if (region.Empty())
     {


@@ -551,21 +555,19 @@ void wxGCDCImpl::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
     {
         wxGraphicsPath path = m_graphicContext->CreatePath();
         path.MoveToPoint( 0, 0 );
     {
         wxGraphicsPath path = m_graphicContext->CreatePath();
         path.MoveToPoint( 0, 0 );

-        path.AddLineToPoint( h / 2.0 * cos(DegToRad(sa)) , h / 2.0 * sin(DegToRad(-sa)) );
-        path.AddLineToPoint( h / 2.0 * cos(DegToRad(ea)) , h / 2.0 * sin(DegToRad(-ea)) );
+        path.AddArc( 0, 0, h/2.0 , DegToRad(-sa) , DegToRad(-ea), sa > ea );

         path.AddLineToPoint( 0, 0 );
         m_graphicContext->FillPath( path );
 
         path = m_graphicContext->CreatePath();
         path.AddArc( 0, 0, h/2.0 , DegToRad(-sa) , DegToRad(-ea), sa > ea );
         path.AddLineToPoint( 0, 0 );
         m_graphicContext->FillPath( path );
 
         path = m_graphicContext->CreatePath();
         path.AddArc( 0, 0, h/2.0 , DegToRad(-sa) , DegToRad(-ea), sa > ea );

-        m_graphicContext->FillPath( path );

         m_graphicContext->StrokePath( path );
     }
     else
     {
         wxGraphicsPath path = m_graphicContext->CreatePath();
         m_graphicContext->StrokePath( path );
     }
     else
     {
         wxGraphicsPath path = m_graphicContext->CreatePath();

-    path.AddArc( 0, 0, h/2.0 , DegToRad(-sa) , DegToRad(-ea), sa > ea );
-    m_graphicContext->DrawPath( path );
+        path.AddArc( 0, 0, h/2.0 , DegToRad(-sa) , DegToRad(-ea), sa > ea );
+        m_graphicContext->DrawPath( path );

     }
 
     m_graphicContext->PopState();
     }
 
     m_graphicContext->PopState();