diff --git a/docs/user/interface/Layout.dox b/docs/user/interface/Layout.dox index a364396627..6a159f09f7 100644 --- a/docs/user/interface/Layout.dox +++ b/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. */ diff --git a/headers/os/interface/CardLayout.h b/headers/os/interface/CardLayout.h index c4fec5d568..1f79a63662 100644 --- a/headers/os/interface/CardLayout.h +++ b/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); diff --git a/headers/os/interface/Layout.h b/headers/os/interface/Layout.h index 913d007ff1..be01c08a57 100644 --- a/headers/os/interface/Layout.h +++ b/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 diff --git a/headers/os/interface/TwoDimensionalLayout.h b/headers/os/interface/TwoDimensionalLayout.h index 7d9141d3d8..2dae1d1436 100644 --- a/headers/os/interface/TwoDimensionalLayout.h +++ b/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, diff --git a/src/kits/interface/CardLayout.cpp b/src/kits/interface/CardLayout.cpp index 309559218f..bcf4ebca05 100644 --- a/src/kits/interface/CardLayout.cpp +++ b/src/kits/interface/CardLayout.cpp @@ -183,7 +183,7 @@ BCardLayout::InvalidateLayout(bool children) void -BCardLayout::DerivedLayoutItems() +BCardLayout::DoLayout() { _ValidateMinMax(); diff --git a/src/kits/interface/Layout.cpp b/src/kits/interface/Layout.cpp index afd0ce703f..58fccb85be 100644 --- a/src/kits/interface/Layout.cpp +++ b/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 diff --git a/src/kits/interface/SplitLayout.cpp b/src/kits/interface/SplitLayout.cpp index 0d73c9b43a..3b61c3c26d 100644 --- a/src/kits/interface/SplitLayout.cpp +++ b/src/kits/interface/SplitLayout.cpp @@ -553,7 +553,7 @@ BSplitLayout::InvalidateLayout(bool children) void -BSplitLayout::DerivedLayoutItems() +BSplitLayout::DoLayout() { _ValidateMinMax(); diff --git a/src/kits/interface/SplitLayout.h b/src/kits/interface/SplitLayout.h index 8005c75124..1337d4a70b 100644 --- a/src/kits/interface/SplitLayout.h +++ b/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; diff --git a/src/kits/interface/TwoDimensionalLayout.cpp b/src/kits/interface/TwoDimensionalLayout.cpp index 994bdf107b..2fa6eb103d 100644 --- a/src/kits/interface/TwoDimensionalLayout.cpp +++ b/src/kits/interface/TwoDimensionalLayout.cpp @@ -465,7 +465,7 @@ BTwoDimensionalLayout::AllUnarchived(const BMessage* from) void -BTwoDimensionalLayout::DerivedLayoutItems() +BTwoDimensionalLayout::DoLayout() { _ValidateMinMax();