X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f2b8291a281cb3a30bb317ab0ba9a883d8fd39ec..c2ca375c5620209d77a88d2d378bdcdedbc82e7e:/include/wx/mac/carbon/dc.h?ds=sidebyside diff --git a/include/wx/mac/carbon/dc.h b/include/wx/mac/carbon/dc.h index 2513c7c989..b0e83d67d2 100644 --- a/include/wx/mac/carbon/dc.h +++ b/include/wx/mac/carbon/dc.h @@ -34,11 +34,10 @@ #endif -extern int wxPageNumber; - - class wxMacPortStateHelper; +#if !wxUSE_GRAPHICS_CONTEXT + class WXDLLEXPORT wxGraphicPath { public : @@ -51,8 +50,13 @@ public : 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; + + // 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 y2, wxCoord r ) = 0 ; + + virtual void AddArc( wxCoord x, wxCoord y, wxCoord r, double startAngle, double endAngle, bool clockwise ) = 0 ; virtual void CloseSubpath() = 0; }; @@ -62,19 +66,42 @@ class WXDLLEXPORT wxGraphicContext public: virtual ~wxGraphicContext() {} + virtual wxGraphicPath * CreatePath() = 0; + + virtual void PushState() = 0 ; + + virtual void PopState() = 0 ; + virtual void Clip( const wxRegion ®ion ) = 0; + virtual void SetPen( const wxPen &pen ) = 0; + + virtual void SetBrush( const wxBrush &brush ) = 0; + + virtual void SetFont( const wxFont &font ) = 0 ; + + virtual void SetTextColor( const wxColour &col ) = 0 ; + virtual void StrokePath( const wxGraphicPath *path ) = 0; virtual void DrawPath( const wxGraphicPath *path, int fillStyle = wxWINDING_RULE ) = 0; virtual void FillPath( const wxGraphicPath *path, const wxColor &fillColor, int fillStyle = wxWINDING_RULE ) = 0; - virtual void SetPen( const wxPen &pen ) = 0; - - virtual void SetBrush( const wxBrush &brush ) = 0; - - virtual wxGraphicPath * CreatePath() = 0; + virtual void DrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, wxCoord w, wxCoord h ) = 0 ; + + virtual void DrawIcon( const wxIcon &icon, wxCoord x, wxCoord y, wxCoord w, wxCoord h ) = 0 ; + + virtual void DrawText( const wxString &str, wxCoord x, wxCoord y, double angle ) = 0 ; + + virtual void GetTextExtent( const wxString &text, wxCoord *width, wxCoord *height, + wxCoord *descent, wxCoord *externalLeading ) const = 0 ; + + virtual void GetPartialTextExtents(const wxString& text, wxArrayInt& widths) const = 0 ; + + virtual void Translate( wxCoord dx , wxCoord dy ) = 0 ; + + virtual void Scale( wxCoord xScale , wxCoord yScale ) = 0 ; }; class WXDLLEXPORT wxDC: public wxDCBase @@ -84,7 +111,7 @@ class WXDLLEXPORT wxDC: public wxDCBase public: wxDC(); - ~wxDC(); + virtual ~wxDC(); // implement base class pure virtuals // ---------------------------------- @@ -131,92 +158,49 @@ public: 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 { - 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 { - 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 { - 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 { - 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 { - 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 { - 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 { - 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 { - 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 { - 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 - wxGraphicContext* GetGraphicContext() { return m_graphicContext; } + wxGraphicsContext* GetGraphicsContext() { return m_graphicContext; } #else WXHRGN MacGetCurrentClipRgn() { return m_macCurrentClipRgn; } static void MacSetupBackgroundForCurrentPort(const wxBrush& background ); @@ -271,6 +255,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 @@ -317,8 +309,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; @@ -342,4 +333,6 @@ public: #endif }; +#endif + #endif // _WX_DC_H_