From 17499672a049515fff0e536ab70f50d0d55833f1 Mon Sep 17 00:00:00 2001
From: Alex Wilson <yourpalal2@gmail.com>
Date: Sat, 22 Oct 2011 14:54:43 -0600
Subject: [PATCH] Bring BALMLayout in line with changes to BLayout.

---
 headers/libs/alm/ALMLayout.h | 7 ++++---
 src/libs/alm/ALMLayout.cpp   | 5 ++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/headers/libs/alm/ALMLayout.h b/headers/libs/alm/ALMLayout.h
index 5ddba62823..7279ca1ef2 100644
--- a/headers/libs/alm/ALMLayout.h
+++ b/headers/libs/alm/ALMLayout.h
@@ -122,11 +122,12 @@ public:
 	virtual	BSize				BasePreferredSize();
 	virtual	BAlignment			BaseAlignment();
 
-	virtual	void				InvalidateLayout(bool children = false);
-
+protected:
 	virtual	bool				ItemAdded(BLayoutItem* item, int32 atIndex);
 	virtual	void				ItemRemoved(BLayoutItem* item, int32 fromIndex);
-	virtual	void				DerivedLayoutItems();
+
+	virtual	void				LayoutInvalidated(bool children);
+	virtual	void				DoLayout();
 
 private:
 			/*! Add a view without initialize the Area. */
diff --git a/src/libs/alm/ALMLayout.cpp b/src/libs/alm/ALMLayout.cpp
index ebb47b8e1d..865b638795 100644
--- a/src/libs/alm/ALMLayout.cpp
+++ b/src/libs/alm/ALMLayout.cpp
@@ -718,9 +718,8 @@ BALMLayout::BaseAlignment()
  * Resets minimum/maximum/preferred size.
  */
 void
-BALMLayout::InvalidateLayout(bool children)
+BALMLayout::LayoutInvalidated(bool children)
 {
-	BLayout::InvalidateLayout(children);
 	fMinSize = kUnsetSize;
 	fMaxSize = kUnsetSize;
 	fPreferredSize = kUnsetSize;
@@ -751,7 +750,7 @@ BALMLayout::ItemRemoved(BLayoutItem* item, int32 fromIndex)
  * If no layout specification is given, a specification is reverse engineered automatically.
  */
 void
-BALMLayout::DerivedLayoutItems()
+BALMLayout::DoLayout()
 {
 	_UpdateAreaConstraints();