From 7cb974614f0e6b997d9fb61d1088475614b5c2e1 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Sun, 7 Apr 2013 11:16:24 -0500 Subject: [PATCH] NetworkSetup: Use std max vs max_c --- .../kits/net/preflet/InterfacesAddOn/InterfacesListView.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesListView.cpp b/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesListView.cpp index 6f38243193..e530e1e567 100644 --- a/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesListView.cpp +++ b/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesListView.cpp @@ -37,7 +37,6 @@ #include #include #include -#include #include #include @@ -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 }