Rename BLayout::DerivedLayoutItems() to DoLayout(), which is consistent with BView::DoLayout(). Also adjusted child classes and documentation.

docs/user/interface/Layout.dox

@@ -337,7 +337,7 @@ topLayout->AddItem(nestedLayoutWithView);
 /*!
 	\fn void BLayout::LayoutItems(bool force = false)
 	\brief If there is no layout currently ongoing, and \a force is \c false,
-		creates a new BLayoutContext and calls the DerivedLayoutItems() method
+		creates a new BLayoutContext and calls the DoLayout() method
 		of this BLayout and any BLayout s nested in this BLayout.
 	
 	If method also guarantees that the owner view of this layout (as returned
@@ -514,7 +514,7 @@ topLayout->AddItem(nestedLayoutWithView);
 
 
 /*!
-	\fn void BLayout::DerivedLayoutItems() = 0
+	\fn void BLayout::DoLayout() = 0
 	\brief Implemented by derived classes to position and resize the items in
 		this layout.
 */

headers/os/interface/CardLayout.h

@@ -35,7 +35,7 @@ public:
 	static	BArchivable*		Instantiate(BMessage* from);
 
 protected:
-	virtual	void				DerivedLayoutItems();
+	virtual	void				DoLayout();
 	virtual	bool				ItemAdded(BLayoutItem* item, int32 atIndex);
 	virtual	void				ItemRemoved(BLayoutItem* item, int32 fromIndex);
 

headers/os/interface/Layout.h

@@ -73,7 +73,7 @@ protected:
 	// BLayout hook methods
 	virtual	bool				ItemAdded(BLayoutItem* item, int32 atIndex);
 	virtual	void				ItemRemoved(BLayoutItem* item, int32 fromIndex);
-	virtual	void				DerivedLayoutItems() = 0;
+	virtual	void				DoLayout() = 0;
 	virtual	void				OwnerChanged(BView* was);
 
 	// BLayoutItem hook methods

headers/os/interface/TwoDimensionalLayout.h

@@ -58,7 +58,7 @@ protected:
 				int32	height;
 			};
 
-	virtual	void				DerivedLayoutItems();
+	virtual	void				DoLayout();
 
 			BSize				AddInsets(BSize size);
 			void				AddInsets(float* minHeight, float* maxHeight,

src/kits/interface/CardLayout.cpp

@@ -183,7 +183,7 @@ BCardLayout::InvalidateLayout(bool children)
 
 
 void
-BCardLayout::DerivedLayoutItems()
+BCardLayout::DoLayout()
 {
 	_ValidateMinMax();
 

src/kits/interface/Layout.cpp

@@ -400,7 +400,7 @@ BLayout::_LayoutWithinContext(bool force, BLayoutContext* context)
 		fOwner->_Layout(force, context);
 	} else {
 		fState |= B_LAYOUT_IN_PROGRESS;
-		DerivedLayoutItems();
+		DoLayout();
 		// we must ensure that all items are laid out, layouts with a view will
 		// have their layout process triggered by their view, but nested
 		// view-less layouts must have their layout triggered here (if it hasn't

src/kits/interface/SplitLayout.cpp

@@ -553,7 +553,7 @@ BSplitLayout::InvalidateLayout(bool children)
 
 
 void
-BSplitLayout::DerivedLayoutItems()
+BSplitLayout::DoLayout()
 {
 	_ValidateMinMax();
 

src/kits/interface/SplitLayout.h

@@ -77,7 +77,7 @@ public:
 
 	virtual	void				InvalidateLayout(bool children = false);
 
-	virtual	void				DerivedLayoutItems();
+	virtual	void				DoLayout();
 
 	// interface for BSplitView
 			BRect				SplitterItemFrame(int32 index) const;

src/kits/interface/TwoDimensionalLayout.cpp

@@ -465,7 +465,7 @@ BTwoDimensionalLayout::AllUnarchived(const BMessage* from)
 
 
 void
-BTwoDimensionalLayout::DerivedLayoutItems()
+BTwoDimensionalLayout::DoLayout()
 {
 	_ValidateMinMax();