X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad973712cd2db741bddcc0463726a5c6059c7b31..e8b86d2538a5d5c2f39f2061f57e1b90423f7423:/include/wx/dc.h diff --git a/include/wx/dc.h b/include/wx/dc.h index ab02c5c78b..43e7c585bf 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -609,54 +609,14 @@ public: #if WXWIN_COMPATIBILITY_2_8 // for compatibility with the old code when wxCoord was long everywhere - void GetTextExtent(const wxString& string, + wxDEPRECATED( void GetTextExtent(const wxString& string, long *x, long *y, long *descent = NULL, long *externalLeading = NULL, - const wxFont *theFont = NULL) const - { - wxCoord x2, y2, descent2, externalLeading2; - DoGetTextExtent(string, &x2, &y2, - &descent2, &externalLeading2, - theFont); - if ( x ) - *x = x2; - if ( y ) - *y = y2; - if ( descent ) - *descent = descent2; - if ( externalLeading ) - *externalLeading = externalLeading2; - } - - void GetLogicalOrigin(long *x, long *y) const - { - wxCoord x2, y2; - DoGetLogicalOrigin(&x2, &y2); - if ( x ) - *x = x2; - if ( y ) - *y = y2; - } - - void GetDeviceOrigin(long *x, long *y) const - { - wxCoord x2, y2; - DoGetDeviceOrigin(&x2, &y2); - if ( x ) - *x = x2; - if ( y ) - *y = y2; - } - void GetClippingBox(long *x, long *y, long *w, long *h) const - { - wxCoord xx,yy,ww,hh; - DoGetClippingBox(&xx, &yy, &ww, &hh); - if (x) *x = xx; - if (y) *y = yy; - if (w) *w = ww; - if (h) *h = hh; - } + const wxFont *theFont = NULL) const ); + wxDEPRECATED( void GetLogicalOrigin(long *x, long *y) const ); + wxDEPRECATED( void GetDeviceOrigin(long *x, long *y) const ); + wxDEPRECATED( void GetClippingBox(long *x, long *y, long *w, long *h) const ); #endif // WXWIN_COMPATIBILITY_2_8 // RTL related functions