Fix a couple of small errors.

[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 fa0d4861a6ae55f58a32cdc45078f6dfeef23c72..161997dd71f9dd9edce39a8469bf31921ece979d 100644 (file)
--- a/include/wx/mac/carbon/dc.h
+++ b/include/wx/mac/carbon/dc.h
@@ -36,6 +36,8 @@
 
 class wxMacPortStateHelper;
 
 
 class wxMacPortStateHelper;
 

+#if !wxUSE_GRAPHICS_CONTEXT
+

 class WXDLLEXPORT wxGraphicPath
 {
 public :
 class WXDLLEXPORT wxGraphicPath
 {
 public :


@@ -52,7 +54,7 @@ public :
     virtual void AddCircle( wxCoord x, wxCoord y, wxCoord r ) = 0;
     
     // draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)
     virtual void AddCircle( wxCoord x, wxCoord y, wxCoord r ) = 0;
     
     // draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)

-    virtual void AddArcToPoint( wxCoord x1, wxCoord y1 , wxCoord x2, wxCoord y1, wxCoord r ) = 0 ;
+    virtual void AddArcToPoint( wxCoord x1, wxCoord y1 , wxCoord x2, wxCoord y2, wxCoord r ) = 0 ;

 
     virtual void AddArc( wxCoord x, wxCoord y, wxCoord r, double startAngle, double endAngle, bool clockwise ) = 0 ;
 
 
     virtual void AddArc( wxCoord x, wxCoord y, wxCoord r, double startAngle, double endAngle, bool clockwise ) = 0 ;
 


@@ -156,92 +158,49 @@ public:
 public:
     wxCoord XDEV2LOG(wxCoord x) const
     {
 public:
     wxCoord XDEV2LOG(wxCoord x) const
     {

-        long new_x = x - m_deviceOriginX;
-        if (new_x > 0)
-            return (wxCoord)((double)new_x / m_scaleX + 0.5) * m_signX + m_logicalOriginX;
-        else
-            return (wxCoord)((double)new_x / m_scaleX - 0.5) * m_signX + m_logicalOriginX;
+        return wxRound((double)(x - m_deviceOriginX) / m_scaleX) * m_signX + m_logicalOriginX;

     }
     }

-

     wxCoord XDEV2LOGREL(wxCoord x) const
     {
     wxCoord XDEV2LOGREL(wxCoord x) const
     {

-        if (x > 0)
-            return (wxCoord)((double)x / m_scaleX + 0.5);
-        else
-            return (wxCoord)((double)x / m_scaleX - 0.5);
+        return wxRound((double)(x) / m_scaleX);

     }
     }

-

     wxCoord YDEV2LOG(wxCoord y) const
     {
     wxCoord YDEV2LOG(wxCoord y) const
     {

-        long new_y = y - m_deviceOriginY;
-        if (new_y > 0)
-            return (wxCoord)((double)new_y / m_scaleY + 0.5) * m_signY + m_logicalOriginY;
-        else
-            return (wxCoord)((double)new_y / m_scaleY - 0.5) * m_signY + m_logicalOriginY;
+        return wxRound((double)(y - m_deviceOriginY) / m_scaleY) * m_signY + m_logicalOriginY;

     }
     }

-

     wxCoord YDEV2LOGREL(wxCoord y) const
     {
     wxCoord YDEV2LOGREL(wxCoord y) const
     {

-        if (y > 0)
-            return (wxCoord)((double)y / m_scaleY + 0.5);
-        else
-            return (wxCoord)((double)y / m_scaleY - 0.5);
+        return wxRound((double)(y) / m_scaleY);

     }
     }

-

     wxCoord XLOG2DEV(wxCoord x) const
     {
     wxCoord XLOG2DEV(wxCoord x) const
     {

-        long new_x = x - m_logicalOriginX;
-        if (new_x > 0)
-            return (wxCoord)((double)new_x * m_scaleX + 0.5) * m_signX + m_deviceOriginX;
-        else
-            return (wxCoord)((double)new_x * m_scaleX - 0.5) * m_signX + m_deviceOriginX;
+        return wxRound((double)(x - m_logicalOriginX) * m_scaleX) * m_signX + m_deviceOriginX;

     }
     }

-

     wxCoord XLOG2DEVREL(wxCoord x) const
     {
     wxCoord XLOG2DEVREL(wxCoord x) const
     {

-        if (x > 0)
-            return (wxCoord)((double)x * m_scaleX + 0.5);
-        else
-            return (wxCoord)((double)x * m_scaleX - 0.5);
+        return wxRound((double)(x) * m_scaleX);

     }
     }

-

     wxCoord YLOG2DEV(wxCoord y) const
     {
     wxCoord YLOG2DEV(wxCoord y) const
     {

-        long new_y = y - m_logicalOriginY;
-        if (new_y > 0)
-            return (wxCoord)((double)new_y * m_scaleY + 0.5) * m_signY + m_deviceOriginY;
-        else
-            return (wxCoord)((double)new_y * m_scaleY - 0.5) * m_signY + m_deviceOriginY;
+        return wxRound((double)(y - m_logicalOriginY) * m_scaleY) * m_signY + m_deviceOriginY;

     }
     }

-

     wxCoord YLOG2DEVREL(wxCoord y) const
     {
     wxCoord YLOG2DEVREL(wxCoord y) const
     {

-        if (y > 0)
-            return (wxCoord)((double)y * m_scaleY + 0.5);
-        else
-            return (wxCoord)((double)y * m_scaleY - 0.5);
+        return wxRound((double)(y) * m_scaleY);

     }
 
     wxCoord XLOG2DEVMAC(wxCoord x) const
     {
     }
 
     wxCoord XLOG2DEVMAC(wxCoord x) const
     {

-        long new_x = x - m_logicalOriginX;
-        if (new_x > 0)
-            return (wxCoord)((double)new_x * m_scaleX + 0.5) * m_signX + m_deviceOriginX + m_macLocalOrigin.x;
-        else
-            return (wxCoord)((double)new_x * m_scaleX - 0.5) * m_signX + m_deviceOriginX + m_macLocalOrigin.x;
+        return wxRound((double)(x - m_logicalOriginX) * m_scaleX) * m_signX + m_deviceOriginX + m_macLocalOrigin.x;

     }
 
     wxCoord YLOG2DEVMAC(wxCoord y) const
     {
     }
 
     wxCoord YLOG2DEVMAC(wxCoord y) const
     {

-        long new_y = y - m_logicalOriginY;
-        if (new_y > 0)
-            return (wxCoord)((double)new_y * m_scaleY + 0.5) * m_signY + m_deviceOriginY + m_macLocalOrigin.y;
-        else
-            return (wxCoord)((double)new_y * m_scaleY - 0.5) * m_signY + m_deviceOriginY + m_macLocalOrigin.y;
+        return wxRound((double)(y - m_logicalOriginY) * m_scaleY) * m_signY + m_deviceOriginY + m_macLocalOrigin.y;

     }
 
 #if wxMAC_USE_CORE_GRAPHICS
     }
 
 #if wxMAC_USE_CORE_GRAPHICS

-    wxGraphicContext* GetGraphicContext() { return m_graphicContext; }
+    wxGraphicsContext* GetGraphicsContext() { return m_graphicContext; }

 #else
     WXHRGN MacGetCurrentClipRgn() { return m_macCurrentClipRgn; }
     static void MacSetupBackgroundForCurrentPort(const wxBrush& background );
 #else
     WXHRGN MacGetCurrentClipRgn() { return m_macCurrentClipRgn; }
     static void MacSetupBackgroundForCurrentPort(const wxBrush& background );


@@ -342,8 +301,7 @@ public:
     WXHDC                           m_macPort;
 
 #if wxMAC_USE_CORE_GRAPHICS
     WXHDC                           m_macPort;
 
 #if wxMAC_USE_CORE_GRAPHICS

-    wxGraphicContext                *m_graphicContext;
-    wxPoint                         m_macLocalOriginInPort;
+    wxGraphicsContext              *m_graphicContext;

 #else
     void                            MacInstallPen() const;
     void                            MacInstallBrush() const;
 #else
     void                            MacInstallPen() const;
     void                            MacInstallBrush() const;


@@ -367,4 +325,6 @@ public:
 #endif
 };
 
 #endif
 };
 

+#endif
+

 #endif // _WX_DC_H_
 #endif // _WX_DC_H_