X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b06df5a35645b578e64c11138e20fa3cb4b9913..049e9de730f0399eb4c0ea13456d8ddff5b7100a:/include/wx/dfb/dc.h diff --git a/include/wx/dfb/dc.h b/include/wx/dfb/dc.h index daf39357d8..92abb84e39 100644 --- a/include/wx/dfb/dc.h +++ b/include/wx/dfb/dc.h @@ -13,7 +13,7 @@ #include "wx/defs.h" #include "wx/region.h" -#include "wx/dfb/ifacehelpers.h" +#include "wx/dfb/dfbptr.h" wxDFB_DECLARE_INTERFACE(IDirectFBSurface); @@ -27,7 +27,7 @@ public: wxDC(); // Ctor. - wxDC(const IDirectFBSurfacePtr& surface); + wxDC(const wxIDirectFBSurfacePtr& surface); public: // implement base class pure virtuals @@ -140,12 +140,12 @@ public: } // Returns the surface (and increases its ref count) - IDirectFBSurfacePtr GetDirectFBSurface() const { return m_surface; } + wxIDirectFBSurfacePtr GetDirectFBSurface() const { return m_surface; } protected: // initializes the DC from a surface, must be called if default ctor // was used - void Init(const IDirectFBSurfacePtr& surface); + void Init(const wxIDirectFBSurfacePtr& surface); virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style = wxFLOOD_SURFACE); @@ -203,15 +203,21 @@ private: void DoDrawSubBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, wxCoord w, wxCoord h, wxCoord destx, wxCoord desty, int rop, bool useMask); + bool DoBlitFromSurface(const wxIDirectFBSurfacePtr& src, + wxCoord srcx, wxCoord srcy, + wxCoord w, wxCoord h, + wxCoord dstx, wxCoord dsty); // selects colour into surface's state void SelectColour(const wxColour& clr); protected: - IDirectFBSurfacePtr m_surface; + wxIDirectFBSurfacePtr m_surface; double m_mm_to_pix_x, m_mm_to_pix_y; + friend class WXDLLIMPEXP_CORE wxOverlayImpl; // for Init + DECLARE_DYNAMIC_CLASS(wxDC) };