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

Use wxMax instead of std::max.

Browse Source 
Use wxMax for the sake of uniformity and maintainability - it is used everywhere else in the code base.
This commit is contained in:
Artur Wieczorek
2016-03-24 22:18:03 +01:00
parent 9c83dd8d3e
commit 8e1c85109c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/graphicsd2d.cpp
View File

@@ -2789,7 +2789,7 @@ public:
if (height != NULL) *height = textMetrics.height; if (height != NULL) *height = textMetrics.height;
if (descent != NULL) *descent = fontMetrics.descent * ratio; if (descent != NULL) *descent = fontMetrics.descent * ratio;
if (externalLeading != NULL) *externalLeading = std::max(0.0f, (fontMetrics.ascent + fontMetrics.descent) * ratio - textMetrics.height); if (externalLeading != NULL) *externalLeading = wxMax(0.0f, (fontMetrics.ascent + fontMetrics.descent) * ratio - textMetrics.height);
} }
}; };
@@ -3299,7 +3299,7 @@ bool wxD2DContext::ShouldOffset() const
if (!m_pen.IsNull()) if (!m_pen.IsNull())
{ {
penWidth = wxGetD2DPenData(m_pen)->GetWidth(); penWidth = wxGetD2DPenData(m_pen)->GetWidth();
penWidth = std::max(penWidth, 1); penWidth = wxMax(penWidth, 1);
} }
return (penWidth % 2) == 1; return (penWidth % 2) == 1;