X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c59abe0376cf9d488b8ea1ae49fa2858c4057cc5..0cdd04ad993f86710bc5c9d9c8c12ec25a34ac71:/include/wx/dc.h diff --git a/include/wx/dc.h b/include/wx/dc.h index dbe62c4d95..57e23f8aad 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -441,12 +441,26 @@ public: wxFont *theFont = NULL) const { DoGetTextExtent(string, x, y, descent, externalLeading, theFont); } + wxSize GetTextExtent(const wxString& string) const + { + wxCoord w, h; + DoGetTextExtent(string, &w, &h); + return wxSize(w, h); + } + // works for single as well as multi-line strings - virtual void GetMultiLineTextExtent(const wxString& text, + virtual void GetMultiLineTextExtent(const wxString& string, wxCoord *width, wxCoord *height, wxCoord *heightLine = NULL, - wxFont *font = NULL); + wxFont *font = NULL) const; + + wxSize GetMultiLineTextExtent(const wxString& string) const + { + wxCoord w, h; + GetMultiLineTextExtent(string, &w, &h); + return wxSize(w, h); + } // Measure cumulative width of text after each character bool GetPartialTextExtents(const wxString& text, wxArrayInt& widths) const