From a851b3ad543ebaebc18589b959c01ccaaf35202f Mon Sep 17 00:00:00 2001 From: Alex Wilson Date: Mon, 31 Oct 2011 14:57:30 -0600 Subject: [PATCH] Add Perform() methods to all the layout-related classes that needed them. --- headers/os/interface/AbstractLayout.h | 2 ++ headers/os/interface/AbstractLayoutItem.h | 2 ++ headers/os/interface/CardLayout.h | 2 ++ headers/os/interface/GridLayout.h | 3 ++- headers/os/interface/GroupLayout.h | 2 ++ headers/os/interface/Layout.h | 2 ++ headers/os/interface/LayoutItem.h | 2 ++ headers/os/interface/SplitView.h | 2 ++ headers/os/interface/TwoDimensionalLayout.h | 2 ++ src/kits/interface/AbstractLayout.cpp | 7 +++++++ src/kits/interface/AbstractLayoutItem.cpp | 8 ++++++++ src/kits/interface/CardLayout.cpp | 8 ++++++++ src/kits/interface/GridLayout.cpp | 8 ++++++++ src/kits/interface/GroupLayout.cpp | 8 ++++++++ src/kits/interface/Layout.cpp | 7 +++++++ src/kits/interface/LayoutItem.cpp | 7 +++++++ src/kits/interface/SplitView.cpp | 8 ++++++++ src/kits/interface/TwoDimensionalLayout.cpp | 8 ++++++++ 18 files changed, 87 insertions(+), 1 deletion(-) diff --git a/headers/os/interface/AbstractLayout.h b/headers/os/interface/AbstractLayout.h index 48b2c97e72..5e16fc6ada 100644 --- a/headers/os/interface/AbstractLayout.h +++ b/headers/os/interface/AbstractLayout.h @@ -39,6 +39,8 @@ public: virtual status_t Archive(BMessage* into, bool deep = true) const; virtual status_t AllUnarchived(const BMessage* from); + virtual status_t Perform(perform_code d, void* arg); + protected: virtual void OwnerChanged(BView* was); virtual void AncestorVisibilityChanged(bool shown); diff --git a/headers/os/interface/AbstractLayoutItem.h b/headers/os/interface/AbstractLayoutItem.h index aef495832c..14211d7ce9 100644 --- a/headers/os/interface/AbstractLayoutItem.h +++ b/headers/os/interface/AbstractLayoutItem.h @@ -33,6 +33,8 @@ public: virtual status_t Archive(BMessage* into, bool deep = true) const; + virtual status_t Perform(perform_code d, void* arg); + private: BSize fMinSize; BSize fMaxSize; diff --git a/headers/os/interface/CardLayout.h b/headers/os/interface/CardLayout.h index 16da764e19..54bdcfea43 100644 --- a/headers/os/interface/CardLayout.h +++ b/headers/os/interface/CardLayout.h @@ -32,6 +32,8 @@ public: virtual status_t AllUnarchived(const BMessage* from); static BArchivable* Instantiate(BMessage* from); + virtual status_t Perform(perform_code d, void* arg); + protected: virtual void LayoutInvalidated(bool children = false); virtual void DoLayout(); diff --git a/headers/os/interface/GridLayout.h b/headers/os/interface/GridLayout.h index f0acbc9e42..629a3b9541 100644 --- a/headers/os/interface/GridLayout.h +++ b/headers/os/interface/GridLayout.h @@ -66,6 +66,8 @@ public: virtual status_t ItemUnarchived(const BMessage* from, BLayoutItem* item, int32 index); + virtual status_t Perform(perform_code d, void* arg); + protected: virtual bool ItemAdded(BLayoutItem* item, int32 atIndex); virtual void ItemRemoved(BLayoutItem* item, int32 fromIndex); @@ -81,7 +83,6 @@ protected: ColumnRowConstraints* constraints); virtual void GetItemDimensions(BLayoutItem* item, Dimensions* dimensions); - private: class DummyLayoutItem; class RowInfoArray; diff --git a/headers/os/interface/GroupLayout.h b/headers/os/interface/GroupLayout.h index 82d61d70b6..a0ade9c7b9 100644 --- a/headers/os/interface/GroupLayout.h +++ b/headers/os/interface/GroupLayout.h @@ -44,6 +44,8 @@ public: virtual status_t ItemUnarchived(const BMessage* from, BLayoutItem* item, int32 index); + virtual status_t Perform(perform_code d, void* arg); + protected: 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 ee95d2ba6b..4f2c9c127e 100644 --- a/headers/os/interface/Layout.h +++ b/headers/os/interface/Layout.h @@ -88,6 +88,8 @@ protected: // To be called when layout data is known to be good void ResetLayoutInvalidation(); + virtual status_t Perform(perform_code d, void* arg); + private: friend class BView; diff --git a/headers/os/interface/LayoutItem.h b/headers/os/interface/LayoutItem.h index 3e5e70f84f..8c8b31f4f7 100644 --- a/headers/os/interface/LayoutItem.h +++ b/headers/os/interface/LayoutItem.h @@ -58,6 +58,8 @@ public: virtual status_t AllArchived(BMessage* into) const; virtual status_t AllUnarchived(const BMessage* from); + virtual status_t Perform(perform_code d, void* arg); + protected: void SetLayout(BLayout* layout); diff --git a/headers/os/interface/SplitView.h b/headers/os/interface/SplitView.h index 2be211f237..57ec61934e 100644 --- a/headers/os/interface/SplitView.h +++ b/headers/os/interface/SplitView.h @@ -71,6 +71,8 @@ public: virtual status_t AllUnarchived(const BMessage* from); static BArchivable* Instantiate(BMessage* from); + virtual status_t Perform(perform_code d, void* arg); + protected: virtual void DrawSplitter(BRect frame, const BRect& updateRect, diff --git a/headers/os/interface/TwoDimensionalLayout.h b/headers/os/interface/TwoDimensionalLayout.h index 6d36fce456..75a0af26f6 100644 --- a/headers/os/interface/TwoDimensionalLayout.h +++ b/headers/os/interface/TwoDimensionalLayout.h @@ -42,6 +42,8 @@ public: virtual status_t AllArchived(BMessage* into) const; virtual status_t AllUnarchived(const BMessage* from); + virtual status_t Perform(perform_code d, void* arg); + protected: struct ColumnRowConstraints { float weight; diff --git a/src/kits/interface/AbstractLayout.cpp b/src/kits/interface/AbstractLayout.cpp index c5be8f908e..24a5b3db57 100644 --- a/src/kits/interface/AbstractLayout.cpp +++ b/src/kits/interface/AbstractLayout.cpp @@ -458,3 +458,10 @@ BAbstractLayout::AncestorVisibilityChanged(bool shown) BLayout::AncestorVisibilityChanged(shown); } + +status_t +BAbstractLayout::Perform(perform_code code, void* _data) +{ + return BLayout::Perform(code, _data); +} + diff --git a/src/kits/interface/AbstractLayoutItem.cpp b/src/kits/interface/AbstractLayoutItem.cpp index b98d5cc7ad..8efa349d6b 100644 --- a/src/kits/interface/AbstractLayoutItem.cpp +++ b/src/kits/interface/AbstractLayoutItem.cpp @@ -152,3 +152,11 @@ BAbstractLayoutItem::Archive(BMessage* into, bool deep) const return archiver.Finish(err); } + + +status_t +BAbstractLayoutItem::Perform(perform_code d, void* arg) +{ + return BLayoutItem::Perform(d, arg); +} + diff --git a/src/kits/interface/CardLayout.cpp b/src/kits/interface/CardLayout.cpp index 106085d1c5..4dd26e5e2c 100644 --- a/src/kits/interface/CardLayout.cpp +++ b/src/kits/interface/CardLayout.cpp @@ -297,3 +297,11 @@ BCardLayout::_ValidateMinMax() fMinMaxValid = true; ResetLayoutInvalidation(); } + + +status_t +BCardLayout::Perform(perform_code d, void* arg) +{ + return BAbstractLayout::Perform(d, arg); +} + diff --git a/src/kits/interface/GridLayout.cpp b/src/kits/interface/GridLayout.cpp index ad0791e9a7..3e7df53ed5 100644 --- a/src/kits/interface/GridLayout.cpp +++ b/src/kits/interface/GridLayout.cpp @@ -787,3 +787,11 @@ BGridLayout::_LayoutDataForItem(BLayoutItem* item) const return NULL; return (ItemLayoutData*)item->LayoutData(); } + + +status_t +BGridLayout::Perform(perform_code d, void* arg) +{ + return BTwoDimensionalLayout::Perform(d, arg); +} + diff --git a/src/kits/interface/GroupLayout.cpp b/src/kits/interface/GroupLayout.cpp index 37cdb1ac29..df63e4c87d 100644 --- a/src/kits/interface/GroupLayout.cpp +++ b/src/kits/interface/GroupLayout.cpp @@ -326,3 +326,11 @@ BGroupLayout::_LayoutDataForItem(BLayoutItem* item) const return NULL; return (ItemLayoutData*)item->LayoutData(); } + + +status_t +BGroupLayout::Perform(perform_code code, void* _data) +{ + return BTwoDimensionalLayout::Perform(code, _data); +} + diff --git a/src/kits/interface/Layout.cpp b/src/kits/interface/Layout.cpp index b2176a0dc9..2ebadefaa8 100644 --- a/src/kits/interface/Layout.cpp +++ b/src/kits/interface/Layout.cpp @@ -618,3 +618,10 @@ BLayout::SetTarget(BView* target) } } + +status_t +BLayout::Perform(perform_code code, void* _data) +{ + return BLayoutItem::Perform(code, _data); +} + diff --git a/src/kits/interface/LayoutItem.cpp b/src/kits/interface/LayoutItem.cpp index 980378fb05..434ec0e35b 100644 --- a/src/kits/interface/LayoutItem.cpp +++ b/src/kits/interface/LayoutItem.cpp @@ -184,6 +184,13 @@ BLayoutItem::SetLayout(BLayout* layout) } +status_t +BLayoutItem::Perform(perform_code code, void* _data) +{ + return BArchivable::Perform(code, _data); +} + + void BLayoutItem::LayoutInvalidated(bool children) { diff --git a/src/kits/interface/SplitView.cpp b/src/kits/interface/SplitView.cpp index 9742eab669..3f3bbbbace 100644 --- a/src/kits/interface/SplitView.cpp +++ b/src/kits/interface/SplitView.cpp @@ -323,3 +323,11 @@ BSplitView::_DrawDefaultSplitter(BView* view, BRect frame, be_control_look->DrawSplitter(view, frame, updateRect, view->ViewColor(), orientation, flags, 0); } + + +status_t +BSplitView::Perform(perform_code d, void* arg) +{ + return BView::Perform(d, arg); +} + diff --git a/src/kits/interface/TwoDimensionalLayout.cpp b/src/kits/interface/TwoDimensionalLayout.cpp index 168e9778e8..55ca8e67db 100644 --- a/src/kits/interface/TwoDimensionalLayout.cpp +++ b/src/kits/interface/TwoDimensionalLayout.cpp @@ -1407,3 +1407,11 @@ BTwoDimensionalLayout::LocalLayouter::LayoutContextLeft(BLayoutContext* context) fHorizontalLayoutContext = NULL; fHorizontalLayoutWidth = -1; } + + +status_t +BTwoDimensionalLayout::Perform(perform_code code, void* _data) +{ + return BAbstractLayout::Perform(code, _data); +} +