X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5a70d3f578cdd6939616505d5a38c001a5cc7692..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/dfb/dc.h diff --git a/include/wx/dfb/dc.h b/include/wx/dfb/dc.h index 686bbea2a2..b96599052e 100644 --- a/include/wx/dfb/dc.h +++ b/include/wx/dfb/dc.h @@ -50,6 +50,8 @@ public: virtual void SetPalette(const wxPalette& palette); #endif + virtual void SetLogicalFunction(int function); + virtual void DestroyClippingRegion(); virtual wxCoord GetCharHeight() const; @@ -58,66 +60,30 @@ public: wxCoord *x, wxCoord *y, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, - wxFont *theFont = NULL) const; + const wxFont *theFont = NULL) const; virtual bool CanDrawBitmap() const { return true; } virtual bool CanGetTextExtent() const { return true; } 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); - - // implementation from now on - // -------------------------- - - virtual void ComputeScaleAndOrigin(); - - wxCoord XDEV2LOG(wxCoord x) const - { - return wxRound((double)(x - m_deviceOriginX) / m_scaleX) * m_signX + m_logicalOriginX; - } - wxCoord XDEV2LOGREL(wxCoord x) const - { - return wxRound((double)(x) / m_scaleX); - } - wxCoord YDEV2LOG(wxCoord y) const - { - return wxRound((double)(y - m_deviceOriginY) / m_scaleY) * m_signY + m_logicalOriginY; - } - wxCoord YDEV2LOGREL(wxCoord y) const - { - return wxRound((double)(y) / m_scaleY); - } - wxCoord XLOG2DEV(wxCoord x) const - { - return wxRound((double)(x - m_logicalOriginX) * m_scaleX) * m_signX + m_deviceOriginX; - } - wxCoord XLOG2DEVREL(wxCoord x) const - { - return wxRound((double)(x) * m_scaleX); - } - wxCoord YLOG2DEV(wxCoord y) const - { - return wxRound((double)(y - m_logicalOriginY) * m_scaleY) * m_signY + m_deviceOriginY; - } - wxCoord YLOG2DEVREL(wxCoord y) const - { - return wxRound((double)(y) * m_scaleY); - } - // Returns the surface (and increases its ref count) wxIDirectFBSurfacePtr GetDirectFBSurface() const { return m_surface; } protected: + // implementation + 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); } + // initializes the DC from a surface, must be called if default ctor // was used - void Init(const wxIDirectFBSurfacePtr& surface); + void DFBInit(const wxIDirectFBSurfacePtr& surface); virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style = wxFLOOD_SURFACE); @@ -169,6 +135,8 @@ protected: int fillStyle = wxODDEVEN_RULE); // implementation from now on: +protected: + wxIDirectFBFontPtr GetCurrentFont() const; private: // Unified implementation of DrawIcon, DrawBitmap and Blit: @@ -188,7 +156,7 @@ protected: double m_mm_to_pix_x, m_mm_to_pix_y; - friend class WXDLLIMPEXP_CORE wxOverlayImpl; // for Init + friend class WXDLLIMPEXP_FWD_CORE wxOverlayImpl; // for Init DECLARE_DYNAMIC_CLASS(wxDC) };