X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5a70d3f578cdd6939616505d5a38c001a5cc7692..82008f15b709fd4544468aec286663be1b24fc69:/include/wx/dfb/dc.h?ds=inline diff --git a/include/wx/dfb/dc.h b/include/wx/dfb/dc.h index 686bbea2a2..d78dc83262 100644 --- a/include/wx/dfb/dc.h +++ b/include/wx/dfb/dc.h @@ -58,7 +58,7 @@ 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; } @@ -117,7 +117,7 @@ public: protected: // 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 +169,8 @@ protected: int fillStyle = wxODDEVEN_RULE); // implementation from now on: +protected: + wxIDirectFBFontPtr GetCurrentFont() const; private: // Unified implementation of DrawIcon, DrawBitmap and Blit: