NetworkSetup: Use std max vs max_c

This commit is contained in:
Alexander von Gluck IV 2013-04-07 11:16:24 -05:00
parent 17c9912b90
commit 7cb974614f

View File

@ -37,7 +37,6 @@
#include <Resources.h>
#include <String.h>
#include <SeparatorItem.h>
#include <SupportDefs.h>
#include <Window.h>
#include <AutoDeleter.h>
@ -105,7 +104,7 @@ InterfaceListItem::DrawItem(BView* owner, BRect /*bounds*/, bool complete)
BRect bounds = list->ItemFrame(list->IndexOf(this));
rgb_color highColor = list->HighColor();
//rgb_color highColor = list->HighColor();
rgb_color lowColor = list->LowColor();
if (IsSelected() || complete) {
@ -225,7 +224,7 @@ InterfaceListItem::Update(BView* owner, const BFont* font)
fSecondlineOffset = fFirstlineOffset + lineHeight;
fThirdlineOffset = fFirstlineOffset + (lineHeight * 2);
SetHeight(max_c(3 * lineHeight + 4, fIcon->Bounds().Height() + 8));
SetHeight(std::max(3 * lineHeight + 4, fIcon->Bounds().Height() + 8));
// either to the text height or icon height, whichever is taller
}