Fix the build
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37110 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -18,7 +18,7 @@
|
||||
#include <TextControl.h>
|
||||
#include <View.h>
|
||||
#include <List.h>
|
||||
#include <algobase.h>
|
||||
#include <algorithm>
|
||||
#include <assert.h>
|
||||
#include <stdio.h>
|
||||
|
||||
@@ -250,8 +250,8 @@ void ViewLayoutFactory::ResizeAroundChildren(BView& view, BPoint margin)
|
||||
BView* childView = view.ChildAt(i);
|
||||
if (childView) {
|
||||
BRect r = childView->Frame();
|
||||
fMax_x = max(fMax_x, r.right);
|
||||
fMax_y = max(fMax_y, r.bottom);
|
||||
fMax_x = std::max(fMax_x, r.right);
|
||||
fMax_y = std::max(fMax_y, r.bottom);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
#ifndef _ViewLayoutFactory_h
|
||||
#define _ViewLayoutFactory_h
|
||||
|
||||
#include <InterfaceKit.h>
|
||||
#include <SupportDefs.h>
|
||||
|
||||
typedef enum { CORNER_TOPLEFT, CORNER_BOTTOMLEFT,
|
||||
@@ -76,4 +77,4 @@ public:
|
||||
void ResizeAroundChildren(BView& view, BPoint margin);
|
||||
};
|
||||
|
||||
#endif /* _ViewLayoutFactory_h */
|
||||
#endif /* _ViewLayoutFactory_h */
|
||||
|
||||
Reference in New Issue
Block a user