From 52e06f988d899b47c5d93d07e99aa94c0af8019b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= <superstippi@gmx.de>
Date: Wed, 16 Apr 2008 17:11:40 +0000
Subject: [PATCH] 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
---
 headers/os/interface/View.h           | 2 +-
 src/kits/interface/LayoutUtils.cpp    | 2 +-
 src/kits/interface/View.cpp           | 2 +-
 src/kits/interface/ViewLayoutItem.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/headers/os/interface/View.h b/headers/os/interface/View.h
index 81c7d6ab68..fa9a56a3c5 100644
--- a/headers/os/interface/View.h
+++ b/headers/os/interface/View.h
@@ -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);
diff --git a/src/kits/interface/LayoutUtils.cpp b/src/kits/interface/LayoutUtils.cpp
index 5129b8199f..51b02f4f54 100644
--- a/src/kits/interface/LayoutUtils.cpp
+++ b/src/kits/interface/LayoutUtils.cpp
@@ -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
diff --git a/src/kits/interface/View.cpp b/src/kits/interface/View.cpp
index 886f57283f..5349d768ab 100644
--- a/src/kits/interface/View.cpp
+++ b/src/kits/interface/View.cpp
@@ -3939,7 +3939,7 @@ BView::PreferredSize()
 
 
 BAlignment
-BView::Alignment()
+BView::LayoutAlignment()
 {
 	return BLayoutUtils::ComposeAlignment(fLayoutData->fAlignment,
 		(fLayoutData->fLayout ? fLayoutData->fLayout->Alignment()
diff --git a/src/kits/interface/ViewLayoutItem.cpp b/src/kits/interface/ViewLayoutItem.cpp
index f51fd6af33..47ed990790 100644
--- a/src/kits/interface/ViewLayoutItem.cpp
+++ b/src/kits/interface/ViewLayoutItem.cpp
@@ -44,7 +44,7 @@ BViewLayoutItem::PreferredSize()
 BAlignment
 BViewLayoutItem::Alignment()
 {
-	return fView->Alignment();
+	return fView->LayoutAlignment();
 }
 
 // SetExplicitMinSize