X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0eaa1d68c29cd273971be9d60008045e470c2d46..a83e14751f3b4bb86da3ac2edea09c7f78f3ca3e:/include/wx/mac/dc.h?ds=sidebyside diff --git a/include/wx/mac/dc.h b/include/wx/mac/dc.h index 9bdbaaf9f1..cfc9958cf8 100644 --- a/include/wx/mac/dc.h +++ b/include/wx/mac/dc.h @@ -21,7 +21,6 @@ #include "wx/icon.h" #include "wx/font.h" #include "wx/gdicmn.h" -#include "wx/mac/aga.h" //----------------------------------------------------------------------------- // constants @@ -44,19 +43,11 @@ extern int wxPageNumber; +class wxMacPortStateHelper ; //----------------------------------------------------------------------------- // wxDC //----------------------------------------------------------------------------- -class WXDLLEXPORT wxMacPortSetter -{ -public : - wxMacPortSetter( wxDC* dc ) ; - ~wxMacPortSetter() ; -private : - AGAPortHelper m_ph ; -} ; - class WXDLLEXPORT wxDC: public wxDCBase { DECLARE_DYNAMIC_CLASS(wxDC) @@ -72,7 +63,7 @@ class WXDLLEXPORT wxDC: public wxDCBase virtual void Clear(); - virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return TRUE; }; + virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return TRUE; } virtual void EndDoc(void) {}; virtual void StartPage(void) {}; @@ -118,7 +109,7 @@ class WXDLLEXPORT wxDC: public wxDCBase wxCoord XDEV2LOG(wxCoord x) const { - long new_x = x - m_deviceOriginX; + long new_x = x - m_deviceOriginX ; if (new_x > 0) return (wxCoord)((double)(new_x) / m_scaleX + 0.5) * m_signX + m_logicalOriginX; else @@ -133,7 +124,7 @@ class WXDLLEXPORT wxDC: public wxDCBase } wxCoord YDEV2LOG(wxCoord y) const { - long new_y = y - m_deviceOriginY; + long new_y = y - m_deviceOriginY ; if (new_y > 0) return (wxCoord)((double)(new_y) / m_scaleY + 0.5) * m_signY + m_logicalOriginY; else @@ -150,9 +141,9 @@ class WXDLLEXPORT wxDC: public wxDCBase { long new_x = x - m_logicalOriginX; if (new_x > 0) - return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX; + 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 (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX ; } wxCoord XLOG2DEVREL(wxCoord x) const { @@ -163,11 +154,11 @@ class WXDLLEXPORT wxDC: public wxDCBase } wxCoord YLOG2DEV(wxCoord y) const { - long new_y = y - m_logicalOriginY; + long new_y = y - m_logicalOriginY ; if (new_y > 0) - return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY; + 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 (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY ; } wxCoord YLOG2DEVREL(wxCoord y) const { @@ -176,7 +167,25 @@ class WXDLLEXPORT wxDC: public wxDCBase 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 ; + } + WXHRGN MacGetCurrentClipRgn() { return m_macCurrentClipRgn ; } + static void MacSetupBackgroundForCurrentPort(const wxBrush& background ) ; // protected: @@ -213,7 +222,7 @@ protected: virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, - int rop = wxCOPY, bool useMask = FALSE); + int rop = wxCOPY, bool useMask = FALSE, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1); // this is gnarly - we can't even call this function DoSetClippingRegion() // because of virtual function hiding @@ -235,23 +244,24 @@ protected: wxCoord xoffset, wxCoord yoffset, int fillStyle = wxODDEVEN_RULE); - - -// - - public: -//begin wxmac + protected: + //begin wxmac + // Variables used for scaling double m_mm_to_pix_x,m_mm_to_pix_y; - bool m_needComputeScaleX,m_needComputeScaleY; // not yet used - long m_internalDeviceOriginX,m_internalDeviceOriginY; // If un-scrolled is non-zero or - // d.o. changes with scrolling. - // Set using SetInternalDeviceOrigin(). + // not yet used + bool m_needComputeScaleX,m_needComputeScaleY; + // If un-scrolled is non-zero or d.o. changes with scrolling. + // Set using SetInternalDeviceOrigin(). + long m_internalDeviceOriginX,m_internalDeviceOriginY; + // To be set by external classes such as wxScrolledWindow + // using SetDeviceOrigin() + long m_externalDeviceOriginX,m_externalDeviceOriginY; + + // Begin implementation for Mac + public: - long m_externalDeviceOriginX,m_externalDeviceOriginY; // To be set by external classes - // such as wxScrolledWindow - // using SetDeviceOrigin() - GrafPtr m_macPort ; - GWorldPtr m_macMask ; + WXHDC m_macPort ; + WXHBITMAP m_macMask ; // in order to preserve the const inheritance of the virtual functions, we have to // use mutable variables starting from CWPro 5 @@ -264,9 +274,18 @@ protected: mutable bool m_macPenInstalled ; mutable bool m_macBrushInstalled ; - Rect m_macClipRect ; - Point m_macLocalOrigin ; - void MacSetupPort( AGAPortHelper* ph ) const ; + WXHRGN m_macBoundaryClipRgn ; + WXHRGN m_macCurrentClipRgn ; + wxPoint m_macLocalOrigin ; + void MacSetupPort( wxMacPortStateHelper* ph ) const ; + void MacCleanupPort( wxMacPortStateHelper* ph ) const ; + mutable void* m_macATSUIStyle ; + mutable wxMacPortStateHelper* m_macCurrentPortStateHelper ; + mutable bool m_macFormerAliasState ; + mutable short m_macFormerAliasSize ; + mutable bool m_macAliasWasEnabled ; + mutable void* m_macForegroundPixMap ; + mutable void* m_macBackgroundPixMap ; }; #endif