Applied patch by Artur Wyszynski:
* Renamed BView::Alignment() to LayoutAlignment() which fixes a ton of warnings and some conflicts with BControls. * Added virtual destructor to BRefFilter in case the GCC version is 3 or newer (can't do it for GCC 2.95.3, since that would break binary compatibility AFAIKT) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24983 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -509,7 +509,7 @@ public:
|
||||
virtual BSize MinSize();
|
||||
virtual BSize MaxSize();
|
||||
virtual BSize PreferredSize();
|
||||
virtual BAlignment Alignment();
|
||||
virtual BAlignment LayoutAlignment();
|
||||
|
||||
void SetExplicitMinSize(BSize size);
|
||||
void SetExplicitMaxSize(BSize size);
|
||||
|
||||
@@ -170,7 +170,7 @@ void
|
||||
BLayoutUtils::AlignInFrame(BView* view, BRect frame)
|
||||
{
|
||||
BSize maxSize = view->MaxSize();
|
||||
BAlignment alignment = view->Alignment();
|
||||
BAlignment alignment = view->LayoutAlignment();
|
||||
|
||||
if (view->HasHeightForWidth()) {
|
||||
// The view has height for width, so we do the horizontal alignment
|
||||
|
||||
@@ -3939,7 +3939,7 @@ BView::PreferredSize()
|
||||
|
||||
|
||||
BAlignment
|
||||
BView::Alignment()
|
||||
BView::LayoutAlignment()
|
||||
{
|
||||
return BLayoutUtils::ComposeAlignment(fLayoutData->fAlignment,
|
||||
(fLayoutData->fLayout ? fLayoutData->fLayout->Alignment()
|
||||
|
||||
@@ -44,7 +44,7 @@ BViewLayoutItem::PreferredSize()
|
||||
BAlignment
|
||||
BViewLayoutItem::Alignment()
|
||||
{
|
||||
return fView->Alignment();
|
||||
return fView->LayoutAlignment();
|
||||
}
|
||||
|
||||
// SetExplicitMinSize
|
||||
|
||||
Reference in New Issue
Block a user