X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d921af5140af576cf7651d4f47d5dc00a83e37f5..632783de61f266fcd6b4d63e924530eb958e1b46:/include/wx/mac/dc.h diff --git a/include/wx/mac/dc.h b/include/wx/mac/dc.h index 6b1b7be2b0..5fc2601e55 100644 --- a/include/wx/mac/dc.h +++ b/include/wx/mac/dc.h @@ -12,7 +12,7 @@ #ifndef _WX_DC_H_ #define _WX_DC_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "dc.h" #endif @@ -86,6 +86,7 @@ class WXDLLEXPORT wxDC: public wxDCBase 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; @@ -236,7 +237,6 @@ protected: GetClippingBox(x, y, width, height); } - virtual void DoGetSize(int *width, int *height) const; virtual void DoGetSizeMM(int* width, int* height) const; virtual void DoDrawLines(int n, wxPoint points[],