Add FBC padding to all (I think..) of the visible Layout related classes.

headers/os/interface/AbstractLayout.h

@@ -46,11 +46,23 @@ protected:
 	virtual	void				AncestorVisibilityChanged(bool shown);
 
 private:
+	virtual	void				_ReservedAbstractLayout1();
+	virtual	void				_ReservedAbstractLayout2();
+	virtual	void				_ReservedAbstractLayout3();
+	virtual	void				_ReservedAbstractLayout4();
+	virtual	void				_ReservedAbstractLayout5();
+	virtual	void				_ReservedAbstractLayout6();
+	virtual	void				_ReservedAbstractLayout7();
+	virtual	void				_ReservedAbstractLayout8();
+	virtual	void				_ReservedAbstractLayout9();
+	virtual	void				_ReservedAbstractLayout10();
+
 			struct	Proxy;
 			struct	ViewProxy;
 			struct	DataProxy;
 
 			Proxy*				fExplicitData;
+			uint32				_reserved[4];
 };
 
 #endif	//	_ABSTRACT_LAYOUT_ITEM_H

headers/os/interface/AbstractLayoutItem.h

@@ -36,10 +36,23 @@ public:
 	virtual	status_t			Perform(perform_code d, void* arg);
 
 private:
+	virtual	void				_ReservedAbstractLayoutItem1();
+	virtual	void				_ReservedAbstractLayoutItem2();
+	virtual	void				_ReservedAbstractLayoutItem3();
+	virtual	void				_ReservedAbstractLayoutItem4();
+	virtual	void				_ReservedAbstractLayoutItem5();
+	virtual	void				_ReservedAbstractLayoutItem6();
+	virtual	void				_ReservedAbstractLayoutItem7();
+	virtual	void				_ReservedAbstractLayoutItem8();
+	virtual	void				_ReservedAbstractLayoutItem9();
+	virtual	void				_ReservedAbstractLayoutItem10();
+
 			BSize				fMinSize;
 			BSize				fMaxSize;
 			BSize				fPreferredSize;
 			BAlignment			fAlignment;
+
+			uint32				_reserved[5];
 };
 
 #endif	//	_ABSTRACT_LAYOUT_ITEM_H

headers/os/interface/CardLayout.h

@@ -41,13 +41,28 @@ protected:
 	virtual	void				ItemRemoved(BLayoutItem* item, int32 fromIndex);
 
 private:
+
+			void				_ValidateMinMax();
+
+	// FBC padding
+	virtual	void				_ReservedCardLayout1();
+	virtual	void				_ReservedCardLayout2();
+	virtual	void				_ReservedCardLayout3();
+	virtual	void				_ReservedCardLayout4();
+	virtual	void				_ReservedCardLayout5();
+	virtual	void				_ReservedCardLayout6();
+	virtual	void				_ReservedCardLayout7();
+	virtual	void				_ReservedCardLayout8();
+	virtual	void				_ReservedCardLayout9();
+	virtual	void				_ReservedCardLayout10();
+
 			BSize				fMin;
 			BSize				fMax;
 			BSize				fPreferred;
 			BLayoutItem*		fVisibleItem;
 			bool				fMinMaxValid;
 
-			void				_ValidateMinMax();
+			uint32				_reserved[5];
 };
 
 #endif	// _CARD_LAYOUT_H

headers/os/interface/GridLayout.h

@@ -98,6 +98,19 @@ private:
 			ItemLayoutData*		_LayoutDataForItem(BLayoutItem* item) const;
 
 private:
+
+	// FBC padding
+	virtual	void				_ReservedGridLayout1();
+	virtual	void				_ReservedGridLayout2();
+	virtual	void				_ReservedGridLayout3();
+	virtual	void				_ReservedGridLayout4();
+	virtual	void				_ReservedGridLayout5();
+	virtual	void				_ReservedGridLayout6();
+	virtual	void				_ReservedGridLayout7();
+	virtual	void				_ReservedGridLayout8();
+	virtual	void				_ReservedGridLayout9();
+	virtual	void				_ReservedGridLayout10();
+
 			BLayoutItem***		fGrid;
 			int32				fColumnCount;
 			int32				fRowCount;
@@ -107,6 +120,8 @@ private:
 
 			int32				fMultiColumnItems;
 			int32				fMultiRowItems;
+
+			uint32				_reserved[5];
 };
 
 

headers/os/interface/GroupLayout.h

@@ -62,12 +62,27 @@ protected:
 									Dimensions* dimensions);
 
 private:
+
+	// FBC padding
+	virtual	void				_ReservedGroupLayout1();
+	virtual	void				_ReservedGroupLayout2();
+	virtual	void				_ReservedGroupLayout3();
+	virtual	void				_ReservedGroupLayout4();
+	virtual	void				_ReservedGroupLayout5();
+	virtual	void				_ReservedGroupLayout6();
+	virtual	void				_ReservedGroupLayout7();
+	virtual	void				_ReservedGroupLayout8();
+	virtual	void				_ReservedGroupLayout9();
+	virtual	void				_ReservedGroupLayout10();
+
 			struct ItemLayoutData;
 
 			ItemLayoutData*		_LayoutDataForItem(BLayoutItem* item) const;
 
 			orientation			fOrientation;
 			BList				fVisibleItems;
+
+			uint32				_reserved[5];
 };
 
 #endif	// _GROUP_LAYOUT_H

headers/os/interface/Layout.h

@@ -91,6 +91,19 @@ protected:
 	virtual status_t			Perform(perform_code d, void* arg);
 
 private:
+
+	// FBC padding
+	virtual	void				_ReservedLayout1();
+	virtual	void				_ReservedLayout2();
+	virtual	void				_ReservedLayout3();
+	virtual	void				_ReservedLayout4();
+	virtual	void				_ReservedLayout5();
+	virtual	void				_ReservedLayout6();
+	virtual	void				_ReservedLayout7();
+	virtual	void				_ReservedLayout8();
+	virtual	void				_ReservedLayout9();
+	virtual	void				_ReservedLayout10();
+
 			friend class BView;
 
 			void				SetOwner(BView* owner);
@@ -107,6 +120,8 @@ private:
 			BView*				fTarget;
 			BList				fItems;
 			BList				fNestedLayouts;
+
+			uint32				_reserved[10];
 };
 
 

headers/os/interface/LayoutContext.h

@@ -16,6 +16,15 @@ public:
 	virtual						~BLayoutContextListener();
 
 	virtual	void				LayoutContextLeft(BLayoutContext* context) = 0;
+
+private:
+	virtual	void				_ReservedLayoutContextListener1();
+	virtual	void				_ReservedLayoutContextListener2();
+	virtual	void				_ReservedLayoutContextListener3();
+	virtual	void				_ReservedLayoutContextListener4();
+	virtual	void				_ReservedLayoutContextListener5();
+
+			uint32				_reserved[3];
 };
 
 
@@ -30,6 +39,7 @@ public:
 
 private:
 			BList				fListeners;
+			uint32				_reserved[5];
 };
 
 #endif	//	_LAYOUT_CONTEXT_H

headers/os/interface/LayoutItem.h

@@ -72,10 +72,23 @@ protected:
 	virtual void				AncestorVisibilityChanged(bool shown);
 
 private:
+	virtual	void				_ReservedLayoutItem1();
+	virtual	void				_ReservedLayoutItem2();
+	virtual	void				_ReservedLayoutItem3();
+	virtual	void				_ReservedLayoutItem4();
+	virtual	void				_ReservedLayoutItem5();
+	virtual	void				_ReservedLayoutItem6();
+	virtual	void				_ReservedLayoutItem7();
+	virtual	void				_ReservedLayoutItem8();
+	virtual	void				_ReservedLayoutItem9();
+	virtual	void				_ReservedLayoutItem10();
+
 			friend class BLayout;
 
 			BLayout*			fLayout;
 			void*				fLayoutData;
+
+			uint32				_reserved[5];
 };
 
 

headers/os/interface/SplitView.h

@@ -80,6 +80,19 @@ protected:
 									bool pressed);
 
 private:
+
+	// FBC padding
+	virtual	void				_ReservedSplitView1();
+	virtual	void				_ReservedSplitView2();
+	virtual	void				_ReservedSplitView3();
+	virtual	void				_ReservedSplitView4();
+	virtual	void				_ReservedSplitView5();
+	virtual	void				_ReservedSplitView6();
+	virtual	void				_ReservedSplitView7();
+	virtual	void				_ReservedSplitView8();
+	virtual	void				_ReservedSplitView9();
+	virtual	void				_ReservedSplitView10();
+
 	static	void				_DrawDefaultSplitter(BView* view, BRect frame,
 									const BRect& updateRect,
 									enum orientation orientation,
@@ -87,6 +100,7 @@ private:
 
 private:
 			BSplitLayout*		fSplitLayout;
+			uint32				_reserved[3];
 };
 
 

headers/os/interface/TwoDimensionalLayout.h

@@ -97,7 +97,22 @@ protected:
 			float				fVSpacing;
 
 private:
+
+	// FBC padding
+	virtual	void				_ReservedTwoDimensionalLayout1();
+	virtual	void				_ReservedTwoDimensionalLayout2();
+	virtual	void				_ReservedTwoDimensionalLayout3();
+	virtual	void				_ReservedTwoDimensionalLayout4();
+	virtual	void				_ReservedTwoDimensionalLayout5();
+	virtual	void				_ReservedTwoDimensionalLayout6();
+	virtual	void				_ReservedTwoDimensionalLayout7();
+	virtual	void				_ReservedTwoDimensionalLayout8();
+	virtual	void				_ReservedTwoDimensionalLayout9();
+	virtual	void				_ReservedTwoDimensionalLayout10();
+
 			LocalLayouter*		fLocalLayouter;
+
+			uint32				_reserved[5];
 };
 
 #endif // _TWO_DIMENSIONAL_LAYOUT_H