summaryrefslogtreecommitdiff
path: root/recmenuitem.c
diff options
context:
space:
mode:
Diffstat (limited to 'recmenuitem.c')
-rw-r--r--recmenuitem.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/recmenuitem.c b/recmenuitem.c
index 4531483..5362be5 100644
--- a/recmenuitem.c
+++ b/recmenuitem.c
@@ -557,7 +557,7 @@ void cRecMenuItemSelect::Draw(void) {
void cRecMenuItemSelect::DrawValue(void) {
pixmapVal->Fill(clrTransparent);
std::string textVal = strings[currentVal];
- int iconSize = min(128, height);
+ int iconSize = std::min(128, height);
int textX = width - font->Width(textVal.c_str()) - iconSize;
int textY = (height - font->Height()) / 2;
pixmapVal->DrawText(cPoint(textX, textY), textVal.c_str(), colorText, clrTransparent, font);
@@ -664,7 +664,7 @@ void cRecMenuItemSelectDirectory::Draw(void) {
void cRecMenuItemSelectDirectory::DrawValue(void) {
pixmapVal->Fill(clrTransparent);
- int iconSize = min(128, height);
+ int iconSize = std::min(128, height);
int textX = std::max(width - font->Width(folders[currentVal].c_str()) - iconSize, 10 + font->Width(*text) + 2 * iconSize);
int textY = (height - font->Height()) / 2;
pixmapVal->DrawText(cPoint(textX, textY), folders[currentVal].c_str(), colorText, clrTransparent, font, width - textX - iconSize, font->Height(), taTop | taRight);
@@ -967,7 +967,7 @@ char *cRecMenuItemText::GetSMSKeys(int num) {
if (specialChar)
addition = 1;
Utf8FromArray(startCharUtf8, p, numChars+addition);
- int maxChars = min(numChars+1+addition, 8);
+ int maxChars = std::min(numChars+1+addition, 8);
char *smskey = new char[maxChars];
Utf8Strn0Cpy(smskey, p, maxChars);
return smskey;
@@ -2163,7 +2163,7 @@ void cRecMenuItemDayChooser::SetSizes(void) {
if (charWidth > maxWidth)
maxWidth = charWidth;
}
- daysSize = min(maxWidth + 15, height - 4);
+ daysSize = std::min(maxWidth + 15, height - 4);
daysX = width - 10 - 7 * daysSize;
daysY = (height - daysSize) / 2;
}