X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6a6c0a8bdadc52e87e6d1e315d1bf6f192880bd0..c99a3a1d94cafb4e6f24321773eb06fa7b9275f1:/src/msw/dc.cpp diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index ccafc05202..a9536f2fcc 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -914,8 +914,8 @@ void wxDC::GetTextExtent(const wxString& string, long *x, long *y, GetTextExtentPoint((HDC) m_hDC, (char *)(const char *) string, strlen((char *)(const char *) string), &sizeRect); GetTextMetrics((HDC) m_hDC, &tm); - *x = XDEV2LOGREL(sizeRect.cx); - *y = YDEV2LOGREL(sizeRect.cy); + if (x) *x = XDEV2LOGREL(sizeRect.cx); + if (y) *y = YDEV2LOGREL(sizeRect.cy); if (descent) *descent = tm.tmDescent; if (externalLeading) *externalLeading = tm.tmExternalLeading; } @@ -1365,4 +1365,3 @@ void wxDC::GetTextExtent(const wxString& string, float *x, float *y, *externalLeading = externalLeading1; } #endif -