X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e34fb6eae3ceedb4016f90455d2cf4f62a66c4b8..fba05595e6cca40763f8ead119c7ad61cb01e0e4:/include/wx/mac/carbon/dc.h

diff --git a/include/wx/mac/carbon/dc.h b/include/wx/mac/carbon/dc.h
index d8f285e5bb..8f1831c0d2 100644
--- a/include/wx/mac/carbon/dc.h
+++ b/include/wx/mac/carbon/dc.h
@@ -36,6 +36,8 @@
 
 class wxMacPortStateHelper;
 
+#if !wxUSE_GRAPHICS_CONTEXT
+
 class WXDLLEXPORT wxGraphicPath
 {
 public :
@@ -139,109 +141,26 @@ public:
     virtual int GetDepth() const;
     virtual wxSize GetPPI() const;
 
-    virtual void SetMapMode(int mode);
-    virtual void SetUserScale(double x, double y);
-
-    virtual void SetLogicalScale(double x, double y);
-    virtual void SetLogicalOrigin(wxCoord x, wxCoord y);
-    virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
-    virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
     virtual void SetLogicalFunction(int function);
 
     virtual void SetTextForeground(const wxColour& colour);
     virtual void SetTextBackground(const wxColour& colour);
 
-    virtual void ComputeScaleAndOrigin();
-
 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;
-    }
-
-    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);
-    }
-
-    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;
-    }
-
-    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);
-    }
-
-    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;
-    }
-
-    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);
-    }
-
-    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;
-    }
-
-    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);
-    }
-
-    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;
-    }
-
-    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;
-    }
+    wxCoord XDEV2LOG(wxCoord x) const       { return DeviceToLogicalX( x ); }
+    wxCoord XDEV2LOGREL(wxCoord x) const    { return DeviceToLogicalXRel( x ); }
+    wxCoord YDEV2LOG(wxCoord y) const       { return DeviceToLogicalY( y ); }
+    wxCoord YDEV2LOGREL(wxCoord y) const    { return DeviceToLogicalYRel( y ); }
+    wxCoord XLOG2DEV(wxCoord x) const       { return LogicalToDeviceX( x ); }
+    wxCoord XLOG2DEVREL(wxCoord x) const    { return LogicalToDeviceXRel( x ); }
+    wxCoord YLOG2DEV(wxCoord y) const       { return LogicalToDeviceY( y ); }
+    wxCoord YLOG2DEVREL(wxCoord y) const    { return LogicalToDeviceYRel( y ); }
+    // probably no longer needed
+    wxCoord XLOG2DEVMAC(wxCoord x) const    { return LogicalToDeviceX( x ); }
+    wxCoord YLOG2DEVMAC(wxCoord y) const    { return LogicalToDeviceY( y ); }
 
 #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 );
@@ -252,7 +171,7 @@ protected:
         wxCoord *x, wxCoord *y,
         wxCoord *descent = NULL,
         wxCoord *externalLeading = NULL,
-        wxFont *theFont = NULL) const;
+        const wxFont *theFont = NULL) const;
 
     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
 
@@ -296,6 +215,14 @@ protected:
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,
                         int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
 
+    virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest,
+                               wxCoord dstWidth, wxCoord dstHeight,
+                               wxDC *source,
+                               wxCoord xsrc, wxCoord ysrc,
+                               wxCoord srcWidth, wxCoord srcHeight,
+                               int rop = wxCOPY, bool useMask = false,
+                               wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
+
     // this is gnarly - we can't even call this function DoSetClippingRegion()
     // because of virtual function hiding
 
@@ -342,8 +269,7 @@ public:
     WXHDC                           m_macPort;
 
 #if wxMAC_USE_CORE_GRAPHICS
-    wxGraphicContext                *m_graphicContext;
-    wxPoint                         m_macLocalOriginInPort;
+    wxGraphicsContext              *m_graphicContext;
 #else
     void                            MacInstallPen() const;
     void                            MacInstallBrush() const;
@@ -367,4 +293,6 @@ public:
 #endif
 };
 
+#endif
+
 #endif // _WX_DC_H_