X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22f3361e1cf25c52a2da8fdfc5cb081809e18fb9..46d492a879f7fec474c0847dd0637593453746eb:/include/wx/msw/dc.h diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h index ac1f0a3989..280fba8333 100644 --- a/include/wx/msw/dc.h +++ b/include/wx/msw/dc.h @@ -12,7 +12,7 @@ #ifndef _WX_DC_H_ #define _WX_DC_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "dc.h" #endif @@ -80,6 +80,7 @@ public: wxCoord *descent = NULL, wxCoord *externalLeading = NULL, wxFont *theFont = NULL) const; + virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const; virtual bool CanDrawBitmap() const; virtual bool CanGetTextExtent() const; @@ -190,6 +191,9 @@ protected: virtual void DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle = wxODDEVEN_RULE); + virtual void DoDrawPolyPolygon(int n, int count[], wxPoint points[], + wxCoord xoffset, wxCoord yoffset, + int fillStyle = wxODDEVEN_RULE); #if wxUSE_PALETTE @@ -254,6 +258,9 @@ class WXDLLEXPORT wxDCTemp : public wxDC public: wxDCTemp(WXHDC hdc) { SetHDC(hdc); } virtual ~wxDCTemp() { SetHDC((WXHDC)NULL); } + +private: + DECLARE_NO_COPY_CLASS(wxDCTemp) }; #endif