Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxDC::GetTextExtent() checks that passed in x and y pointers are !NULL

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-07-08 22:27:17 +00:00
parent 097c080b74
commit b7dd52e9ad
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/msw/dc.cpp
View File

@@ -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); GetTextExtentPoint((HDC) m_hDC, (char *)(const char *) string, strlen((char *)(const char *) string), &sizeRect);
GetTextMetrics((HDC) m_hDC, &tm); GetTextMetrics((HDC) m_hDC, &tm);
*x = XDEV2LOGREL(sizeRect.cx); if (x) *x = XDEV2LOGREL(sizeRect.cx);
*y = YDEV2LOGREL(sizeRect.cy); if (y) *y = YDEV2LOGREL(sizeRect.cy);
if (descent) *descent = tm.tmDescent; if (descent) *descent = tm.tmDescent;
if (externalLeading) *externalLeading = tm.tmExternalLeading; if (externalLeading) *externalLeading = tm.tmExternalLeading;
} }
@@ -1365,4 +1365,3 @@ void wxDC::GetTextExtent(const wxString& string, float *x, float *y,
*externalLeading = externalLeading1; *externalLeading = externalLeading1;
} }
#endif #endif